Changes to 'refs/tags/osad-5.10.28-1'
by Jan Pazdziora
Tag 'osad-5.10.28-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-12-02 12:09 +0000
Tagging package [osad] version [5.10.28-1] in directory [client/tools/osad/].
Changes since spacewalk-schema-1.6.35-1:
Jan Pazdziora (2):
Using password_in for parameter name to avoid confusion.
Automatic commit of package [osad] release [5.10.28-1].
---
client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/osa_dispatcher.py | 6 +++---
rel-eng/packages/osad | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
---
11 years, 10 months
2 commits - client/tools rel-eng/packages
by Jan Pazdziora
client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/osa_dispatcher.py | 6 +++---
rel-eng/packages/osad | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 96840e641caa7005af038beedd63d635b2fb2899
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 2 13:09:45 2011 +0100
Automatic commit of package [osad] release [5.10.28-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index ff4bb06..20eb43c 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,7 +16,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.27
+Version: 5.10.28
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -275,6 +275,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Fri Dec 02 2011 Jan Pazdziora 5.10.28-1
+- Using password_in for parameter name to avoid confusion.
+
* Mon Nov 28 2011 Miroslav Suchý 5.10.27-1
- specify missing param password (mc(a)suse.de)
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index c438d8f..11cb47b 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.27-1 client/tools/osad/
+5.10.28-1 client/tools/osad/
commit 116b246bac4b525e12f7d755e7d82a327ac4d516
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 2 13:08:06 2011 +0100
Using password_in for parameter name to avoid confusion.
Addressing
File "/usr/lib/python2.4/site-packages/spacewalk/server/rhnSQL/driver_postgresql.py", line 283, in _execute_
self._real_cursor.execute(self.sql, params)
SQLStatementPrepareError: (\'syntax error at or near "$1" at character 78
QUERY: insert into rhnPushDispatcher (id, jabber_id, last_checkin, hostname, port, $1 ) values (sequence_nextval(\\\'rhn_pushdispatch_id_seq\\\'), $2 , current_timestamp, $3 , $4 , $1 )
CONTEXT: SQL statement in PL/PgSQL function "rhn_asdf_03139246e715360fa7b1c85c7b9978d72cedccd8" near line 15
\', 0, "create function rhn_asdf_03139246e715360fa7b1c85c7b9978d72cedccd8 (hostname_in varchar,port_in numeric,jabber_id_in varchar,password varchar) returns void as $x03139246e715360fa7b1c85c7b9978d72cedccd8$
declare
i numeric;
begin
update rhnPushDispatcher
set last_checkin = current_timestamp,
hostname = hostname_in,
port = port_in
where jabber_id = jabber_id_in
returning id into i;
if i is null then
-- Have to insert the row
insert into rhnPushDispatcher
(id, jabber_id, last_checkin, hostname, port, password)
values (sequence_nextval(\'rhn_pushdispatch_id_seq\'), jabber_id_in, current_timestamp,
hostname_in, port_in, password);
end if;
end;
$x03139246e715360fa7b1c85c7b9978d72cedccd8$ language plpgsql")
')
diff --git a/client/tools/osad/src/osa_dispatcher.py b/client/tools/osad/src/osa_dispatcher.py
index 967c77b..21f20d7 100644
--- a/client/tools/osad/src/osa_dispatcher.py
+++ b/client/tools/osad/src/osa_dispatcher.py
@@ -264,14 +264,14 @@ class Runner(jabber_lib.Runner):
insert into rhnPushDispatcher
(id, jabber_id, last_checkin, hostname, port, password)
values (sequence_nextval('rhn_pushdispatch_id_seq'), :jabber_id_in, current_timestamp,
- :hostname_in, :port_in, :password);
+ :hostname_in, :port_in, :password_in);
end if;
end;
""")
def _register_dispatcher(self, jabber_id, hostname, port):
- h = rhnSQL.prepare(self._query_register_dispatcher, params = ( 'hostname_in varchar', 'port_in numeric', 'jabber_id_in varchar', 'password varchar' ))
- h.execute(jabber_id_in=jabber_id, hostname_in=hostname, port_in=port, password=self._password)
+ h = rhnSQL.prepare(self._query_register_dispatcher, params = ( 'hostname_in varchar', 'port_in numeric', 'jabber_id_in varchar', 'password_in varchar' ))
+ h.execute(jabber_id_in=jabber_id, hostname_in=hostname, port_in=port, password_in=self._password)
rhnSQL.commit()
_query_get_client_jids = rhnSQL.Statement("""
11 years, 10 months
Changes to 'refs/tags/spacewalk-schema-1.6.35-1'
by Milan Zazrivec
Tag 'spacewalk-schema-1.6.35-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2011-12-02 09:20 +0000
Tagging package [spacewalk-schema] version [1.6.35-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.6.34-1:
Milan Zazrivec (2):
schema sanity check: use newer Digest::SHA module
Automatic commit of package [spacewalk-schema] release [1.6.35-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/schema-source-sanity-check.pl | 4 ++--
schema/spacewalk/spacewalk-schema.spec | 7 +++++--
3 files changed, 8 insertions(+), 5 deletions(-)
---
11 years, 10 months
2 commits - rel-eng/packages schema/spacewalk
by Milan Zazrivec
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/schema-source-sanity-check.pl | 4 ++--
schema/spacewalk/spacewalk-schema.spec | 7 +++++--
3 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 6d65a12e300cc0230994b573a9fda0aef92f0024
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 2 10:20:52 2011 +0100
Automatic commit of package [spacewalk-schema] release [1.6.35-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index f4816d8..dae545a 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.6.34-1 schema/spacewalk/
+1.6.35-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 5301ca2..78ca3fa 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.6.34
+Version: 1.6.35
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Dec 02 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.35-1
+- schema sanity check: use newer Digest::SHA module
+
* Fri Dec 02 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.34-1
- spacewalk-sql: use exec to launch psql in direct mode
- schema upgrade: run spacewalk-sql in direct mode
commit 385f2c6afc7f62b07531650da00712bb04c2ebbf
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 2 10:20:20 2011 +0100
schema sanity check: use newer Digest::SHA module
diff --git a/schema/spacewalk/schema-source-sanity-check.pl b/schema/spacewalk/schema-source-sanity-check.pl
index c293837..d6d9acc 100644
--- a/schema/spacewalk/schema-source-sanity-check.pl
+++ b/schema/spacewalk/schema-source-sanity-check.pl
@@ -5,7 +5,7 @@ use warnings FATAL => 'all';
use File::Find ();
use Getopt::Long ();
-use Digest::SHA1 ();
+use Digest::SHA ();
my %files;
my $show_ignored = 0;
@@ -96,7 +96,7 @@ for my $c (sort keys %{ $files{postgres} }) {
$error = 1;
next;
};
- my $sha1 = new Digest::SHA1;
+ my $sha1 = new Digest::SHA(1);
$sha1->addfile(\*FILE);
my $sha1_hex = $sha1->hexdigest();
close FILE;
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 187b259..5301ca2 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -11,7 +11,7 @@ Url: http://fedorahosted.org/spacewalk/
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: perl(Digest::SHA1)
+BuildRequires: perl(Digest::SHA)
BuildRequires: python
Obsoletes: rhn-satellite-schema <= 5.1.0
11 years, 10 months
Changes to 'refs/tags/spacewalk-schema-1.6.34-1'
by Milan Zazrivec
Tag 'spacewalk-schema-1.6.34-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2011-12-02 09:07 +0000
Tagging package [spacewalk-schema] version [1.6.34-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.6.33-1:
Milan Zazrivec (4):
pgsql schema upgrade: don't create the schema again
run spacewalk-sql in direct mode
spacewalk-sql: use exec to launch psql in direct mode
Automatic commit of package [spacewalk-schema] release [1.6.34-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema-upgrade | 2 +-
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
schema/spacewalk/spacewalk-sql | 6 +++++-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql | 6 ------
5 files changed, 13 insertions(+), 10 deletions(-)
---
11 years, 10 months
4 commits - rel-eng/packages schema/spacewalk
by Milan Zazrivec
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema-upgrade | 2 +-
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
schema/spacewalk/spacewalk-sql | 6 +++++-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql | 6 ------
5 files changed, 13 insertions(+), 10 deletions(-)
New commits:
commit 2de520855c31f7beec8207d0e09e83b66c726c4d
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 2 10:07:04 2011 +0100
Automatic commit of package [spacewalk-schema] release [1.6.34-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 49493a4..f4816d8 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.6.33-1 schema/spacewalk/
+1.6.34-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 999a12f..187b259 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.6.33
+Version: 1.6.34
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Dec 02 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.34-1
+- spacewalk-sql: use exec to launch psql in direct mode
+- schema upgrade: run spacewalk-sql in direct mode
+- pgsql schema upgrade fix
+
* Thu Dec 01 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.33-1
- update oracle equivalent sha1 sums
commit 5fb6ef643de3e9a0f4cfda06d7897a151d688e28
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 2 10:04:49 2011 +0100
spacewalk-sql: use exec to launch psql in direct mode
This fix is to have stdout and stderr output from psql appropriately aligned.
diff --git a/schema/spacewalk/spacewalk-sql b/schema/spacewalk/spacewalk-sql
index 4bba04c..0c5b169 100755
--- a/schema/spacewalk/spacewalk-sql
+++ b/schema/spacewalk/spacewalk-sql
@@ -90,7 +90,11 @@ EOF
if ($filename eq '-') {
$wfh = '<&STDIN';
}
- $pid = IPC::Open3::open3($wfh, $rfh, '>&STDERR', @command) or return 2;
+ if ($select_direct) {
+ exec(@command) or die "young\n";
+ } else {
+ $pid = IPC::Open3::open3($wfh, $rfh, '>&STDERR', @command) or return 2;
+ }
close $wfh;
} else {
die "The config file [$config_file] specifies unknown db_backend [$options{db_backend}] \n";
commit 60737fa11a4bac0bdc1f18ce0187c3d6b48a2cd0
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 2 10:03:08 2011 +0100
run spacewalk-sql in direct mode
diff --git a/schema/spacewalk/spacewalk-schema-upgrade b/schema/spacewalk/spacewalk-schema-upgrade
index a2c1ddd..40a9c3e 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -243,7 +243,7 @@ system("/sbin/restorecon $logfile 2>&1 > /dev/null");
print "Executing spacewalk-sql, the log is in [$logfile].\n";
my $pid = IPC::Open3::open3(my $wfh, '>&LOG', '>&LOG',
- 'spacewalk-sql', '--select-mode', "$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql") or die "Error running spacewalk-sql: $!\n";
+ 'spacewalk-sql', '--select-mode-direct', "$SCHEMA_UPGRADE_LOGDIR/$stamp-script.sql") or die "Error running spacewalk-sql: $!\n";
close $wfh;
waitpid $pid, 0;
commit 1a2b4b09eefeabbf30e5247dbebeac9ec44b149d
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 2 10:01:03 2011 +0100
pgsql schema upgrade: don't create the schema again
This is to avoid schema upgrade errors:
ERROR: schema "rhn_server" already exists
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql
index f15b5c9..56dcf24 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/121-rhn_server-get_ip_address.sql.postgresql
@@ -12,12 +12,6 @@
-- Red Hat trademarks are not licensed under GPLv2. No permission is
-- granted to use or replicate Red Hat trademarks that are incorporated
-- in this software or its documentation.
---
---
---
---
-
-create schema rhn_server;
--update pg_setting
update pg_settings set setting = 'rhn_server,' || setting where name = 'search_path';
11 years, 10 months
Changes to 'refs/tags/spacewalk-schema-1.6.33-1'
by Milan Zazrivec
Tag 'spacewalk-schema-1.6.33-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2011-12-01 09:48 +0000
Tagging package [spacewalk-schema] version [1.6.33-1] in directory [schema/spacewalk/].
Changes since spacewalk-search-1.6.6-1:
Milan Zazrivec (3):
fix TB during re-provisioning with static nic
update oracle equivalent sha1sum
Automatic commit of package [spacewalk-schema] release [1.6.33-1].
Miroslav Suchý (1):
743259 - take hostname of client instead of server
Simon Lukasik (1):
758697 - PG syntax for trust_overview
---
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 7 +++--
client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 12 ++++++++--
java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml | 2 -
rel-eng/packages/spacewalk-schema | 2 -
schema/spacewalk/spacewalk-schema.spec | 5 +++-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/105-alter_rhnServerNetInterface.sql.postgresql | 2 -
6 files changed, 21 insertions(+), 9 deletions(-)
---
11 years, 10 months
rel-eng/packages schema/spacewalk
by Milan Zazrivec
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 0943b73a97350162e20c1b1256e5279d967efe37
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Dec 1 10:48:11 2011 +0100
Automatic commit of package [spacewalk-schema] release [1.6.33-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 52c9f63..49493a4 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.6.32-1 schema/spacewalk/
+1.6.33-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 51b7d3b..999a12f 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.6.32
+Version: 1.6.33
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu Dec 01 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.33-1
+- update oracle equivalent sha1 sums
+
* Wed Nov 30 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.32-1
- pgsql: schema upgrade fixes
11 years, 10 months
schema/spacewalk
by Milan Zazrivec
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/105-alter_rhnServerNetInterface.sql.postgresql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d3f3f58eb6c72f904747e3c2dc8360592bcc5715
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Dec 1 10:46:50 2011 +0100
update oracle equivalent sha1sum
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/105-alter_rhnServerNetInterface.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/105-alter_rhnServerNetInterface.sql.postgresql
index c2b448d..02a4bf0 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/105-alter_rhnServerNetInterface.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/105-alter_rhnServerNetInterface.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 f5872e029cf1b053c88bd876afc8f253461772ac
+-- oracle equivalent source sha1 c24be10b35b70f16e763cdff7eced317f2119751
alter table rhnServerNetInterface add id numeric;
11 years, 10 months
java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 17cf0aa87ebc5d2b783846e70dcc36e224f565ba
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Dec 1 08:31:16 2011 +0100
758697 - PG syntax for trust_overview
Addressing:
com.redhat.rhn.common.db.datasource.CachedStatement - Error while processing
cached statement sql: SELECT org.id,
org.name,
(SELECT count(*)
FROM rhnTrustedOrgs tr
WHERE tr.org_trust_id = org.id AND
tr.org_id = ?) trusted
FROM web_customer org
WHERE org.id != ?
com.redhat.rhn.common.db.WrappedSQLException: ERROR: syntax error at or near
trusted
at com.redhat.rhn.common.translation.SqlExceptionTranslator.postgreSqlException(SqlExceptionTranslator.java:56
at com.redhat.rhn.common.translation.SqlExceptionTranslator.sqlException(SqlExceptionTranslator.java:45)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
index 92ed6fb..eee5e4b 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml
@@ -69,7 +69,7 @@ SELECT org.id,
(SELECT count(*)
FROM rhnTrustedOrgs tr
WHERE tr.org_trust_id = org.id AND
- tr.org_id = :org_id) trusted
+ tr.org_id = :org_id) as trusted
FROM web_customer org
WHERE org.id != :org_id
</query>
11 years, 10 months