Changes to 'refs/tags/spacewalk-java-1.8.181-1'
by Michael Mraka
Tag 'spacewalk-java-1.8.181-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-12-10 13:42 +0000
Tagging package [spacewalk-java] version [1.8.181-1] in directory [java/].
Changes since spacewalk-schema-1.8.89-1:
Johannes Renner (1):
Use braces for accessing composite types in PG
Michael Mraka (1):
Automatic commit of package [spacewalk-java] release [1.8.181-1].
Tomas Lestach (1):
839960 - fix system.listLatestUpgradablePackages API to list upgradable packages from server channels only
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 14 +++++-----
java/spacewalk-java.spec | 7 ++++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 15 insertions(+), 8 deletions(-)
---
11 years, 5 months
Branch 'SPACEWALK-1.8' - 3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 14 +++++-----
java/spacewalk-java.spec | 7 ++++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 15 insertions(+), 8 deletions(-)
New commits:
commit f4de6a79e3dd7bed825056117863545c9c3a3442
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 10 14:42:25 2012 +0100
Automatic commit of package [spacewalk-java] release [1.8.181-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 899dbd5..0637d36 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.180
+Version: 1.8.181
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Dec 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.181-1
+- 839960 - fix system.listLatestUpgradablePackages API to list upgradable
+ packages from server channels only
+- Use braces for accessing composite types in PG
+
* Mon Nov 05 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.180-1
- replace remaining DTD paths to www.hibernate.org/dtd with 3.2 default
hibernate.sourceforge.net
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 4f5334f..43ec6ca 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.180-1 java/
+1.8.181-1 java/
commit 78fc0687052d1b53cfb5e8868e161dd777ddc12d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Oct 31 15:05:27 2012 +0100
839960 - fix system.listLatestUpgradablePackages API to list upgradable packages from server channels only
(cherry picked from commit 1168f61a9d16b42b533a21513c8538529862e745)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index d3a48c0..a71dfcf 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -867,6 +867,8 @@ ORDER BY UPPER(PN.name)
GROUP BY p.name_id) u
JOIN rhnPackageEvr e ON e.evr = u.max_evr
JOIN rhnPackage p ON p.name_id = u.name_id AND p.evr_id = e.id
+ JOIN rhnChannelPackage cp ON cp.package_id = p.id
+ JOIN rhnServerChannel sc ON sc.channel_id = cp.channel_id AND sc.server_id = :sid
JOIN rhnPackageArch a ON a.id = p.package_arch_id
) up,
rhnPackageUpgradeArchCompat puac
commit da43a32d242e23aceca1f37fdf3ac0ebbfe18e7b
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 31 12:18:02 2012 +0100
Use braces for accessing composite types in PG
(cherry picked from commit 594781171402e28f85cdcb9fe7e838e35288a505)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 5b48954..d3a48c0 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -838,14 +838,14 @@ ORDER BY UPPER(PN.name)
<mode name="system_upgradable_package_list_no_errata_info">
<query params="sid">
SELECT n.name,
- NVL(sp.evr.epoch, ' ') as from_epoch,
- NVL(sp.evr.version, ' ') as from_version,
- NVL(sp.evr.release, ' ') as from_release,
+ NVL((sp.evr).epoch, ' ') as from_epoch,
+ NVL((sp.evr).version, ' ') as from_version,
+ NVL((sp.evr).release, ' ') as from_release,
spa.label as from_arch,
spa.label as arch,
- NVL(up.evr.epoch, ' ') as to_epoch,
- NVL(up.evr.version, ' ') as to_version,
- NVL(up.evr.release, ' ') as to_release,
+ NVL((up.evr).epoch, ' ') as to_epoch,
+ NVL((up.evr).version, ' ') as to_version,
+ NVL((up.evr).release, ' ') as to_release,
up.arch_label as to_arch,
up.id as to_package_id
FROM
11 years, 5 months
Changes to 'refs/tags/rhnmd-5.3.14-1'
by Michael Mraka
Tag 'rhnmd-5.3.14-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-12-10 13:31 +0000
Tagging package [rhnmd] version [5.3.14-1] in directory [monitoring/rhnmd/].
Changes since osad-5.11.14-1:
Michael Mraka (3):
fixed service description
added missing pid file
Automatic commit of package [rhnmd] release [5.3.14-1].
---
monitoring/rhnmd/rhnmd.service | 3 ++-
monitoring/rhnmd/rhnmd.spec | 6 +++++-
rel-eng/packages/rhnmd | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
11 years, 5 months
3 commits - monitoring/rhnmd rel-eng/packages
by Michael Mraka
monitoring/rhnmd/rhnmd.service | 3 ++-
monitoring/rhnmd/rhnmd.spec | 6 +++++-
rel-eng/packages/rhnmd | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 18c51415624a5f429a3c32ea5e0844337d109a8a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 10 14:31:55 2012 +0100
Automatic commit of package [rhnmd] release [5.3.14-1].
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index dcc3be0..ed08e41 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -8,7 +8,7 @@ Summary: Red Hat Network Monitoring Daemon
Name: rhnmd
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.3.13
+Version: 5.3.14
Release: 1%{?dist}
License: GPLv2
BuildArch: noarch
@@ -182,6 +182,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Mon Dec 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.3.14-1
+- added missing pid file
+- fixed service description
+
* Mon Dec 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.3.13-1
- use rhnmd.service on Fedora
diff --git a/rel-eng/packages/rhnmd b/rel-eng/packages/rhnmd
index 018b726..884a5ef 100644
--- a/rel-eng/packages/rhnmd
+++ b/rel-eng/packages/rhnmd
@@ -1 +1 @@
-5.3.13-1 monitoring/rhnmd/
+5.3.14-1 monitoring/rhnmd/
commit 9c2cf299d36c73b68ce2b03d76bdab3c80bd5c6a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 10 14:22:26 2012 +0100
added missing pid file
diff --git a/monitoring/rhnmd/rhnmd.service b/monitoring/rhnmd/rhnmd.service
index 0c8532a8..dc5ec97 100644
--- a/monitoring/rhnmd/rhnmd.service
+++ b/monitoring/rhnmd/rhnmd.service
@@ -4,6 +4,7 @@ After=syslog.target network.target auditd.service
[Service]
User=nocpulse
+PIDFile=/var/run/rhnmd.pid
ExecStartPre=/var/lib/nocpulse/sbin/rhnmd_create_key.sh
ExecStart=/usr/sbin/rhnmd -D -f /etc/nocpulse/rhnmd_config
ExecReload=/bin/kill -HUP $MAINPID
commit 94c30cbcc4b2854ecfbd07096aa73b0d45d1f38e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 10 14:21:32 2012 +0100
fixed service description
diff --git a/monitoring/rhnmd/rhnmd.service b/monitoring/rhnmd/rhnmd.service
index 4f1dadb..0c8532a8 100644
--- a/monitoring/rhnmd/rhnmd.service
+++ b/monitoring/rhnmd/rhnmd.service
@@ -1,5 +1,5 @@
[Unit]
-Description=rhnmd server daemon
+Description=Red Hat Network Monitoring daemon
After=syslog.target network.target auditd.service
[Service]
11 years, 5 months
Changes to 'refs/tags/osad-5.11.14-1'
by Jan Pazdziora
Tag 'osad-5.11.14-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-10 11:43 +0000
Tagging package [osad] version [5.11.14-1] in directory [client/tools/osad/].
Changes since rhnmd-5.3.13-1:
Jan Pazdziora (1):
Automatic commit of package [osad] release [5.11.14-1].
Marcelo Moreira de Mello (1):
836984 - fixes the permissions on /var/log/osad log file
---
client/tools/osad/osad.spec | 10 +++++++++-
client/tools/osad/src/rhn_log.py | 7 +++----
rel-eng/packages/osad | 2 +-
3 files changed, 13 insertions(+), 6 deletions(-)
---
11 years, 5 months
client/tools rel-eng/packages
by Jan Pazdziora
client/tools/osad/osad.spec | 5 ++++-
rel-eng/packages/osad | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 5aadeed3132320451bcdd34f1ca2345de2ce721c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 10 12:43:20 2012 +0100
Automatic commit of package [osad] release [5.11.14-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index b954b59..c5f204a 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.11.13
+Version: 5.11.14
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -350,6 +350,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Mon Dec 10 2012 Jan Pazdziora 5.11.14-1
+- 836984 - fixes the permissions on /var/log/osad log file
+
* Thu Nov 22 2012 Jan Pazdziora 5.11.13-1
- always commit the update
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index 13283d5..fa0b4f3 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.13-1 client/tools/osad/
+5.11.14-1 client/tools/osad/
11 years, 5 months
client/tools
by Jan Pazdziora
client/tools/osad/osad.spec | 5 +++++
client/tools/osad/src/rhn_log.py | 7 +++----
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 16199307a35484e0af5dd152b0ffc228df176e8a
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Fri Dec 7 16:24:44 2012 -0200
836984 - fixes the permissions on /var/log/osad log file
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 57014b7..b954b59 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -202,6 +202,11 @@ rm -rf $RPM_BUILD_ROOT
if [ -f %{_sysconfdir}/init.d/osad ]; then
/sbin/chkconfig --add osad
fi
+
+# Fix the /var/log/osad permission BZ 836984
+if [ -f %{_var}/log/osad ]; then
+ /bin/chmod 600 %{_var}/log/osad
+fi
%endif
%preun
diff --git a/client/tools/osad/src/rhn_log.py b/client/tools/osad/src/rhn_log.py
index 7b23501..3607c1a 100644
--- a/client/tools/osad/src/rhn_log.py
+++ b/client/tools/osad/src/rhn_log.py
@@ -39,10 +39,9 @@ class Logger:
if not Logger.logfile is None:
try:
- file = open( Logger.logfile, 'a' )
- os.chmod(Logger.logfile, 0600)
- file.write( outstring )
- file.close()
+ fd = os.open(Logger.logfile, os.O_APPEND | os.O_RDWR | os.O_CREAT, 0600)
+ os.write(fd, outstring)
+ os.close(fd)
except IOError:
raise
11 years, 5 months
Changes to 'refs/tags/rhnmd-5.3.13-1'
by Michael Mraka
Tag 'rhnmd-5.3.13-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-12-10 11:01 +0000
Tagging package [rhnmd] version [5.3.13-1] in directory [monitoring/rhnmd/].
Changes since spacewalk-backend-1.9.13-1:
Michael Mraka (2):
use rhnmd.service on Fedora
Automatic commit of package [rhnmd] release [5.3.13-1].
---
monitoring/rhnmd/rhnmd.spec | 39 +++++++++++++++++++++++++++++++++++----
rel-eng/packages/rhnmd | 2 +-
2 files changed, 36 insertions(+), 5 deletions(-)
---
11 years, 5 months
2 commits - monitoring/rhnmd rel-eng/packages
by Michael Mraka
monitoring/rhnmd/rhnmd.spec | 39 +++++++++++++++++++++++++++++++++++----
rel-eng/packages/rhnmd | 2 +-
2 files changed, 36 insertions(+), 5 deletions(-)
New commits:
commit 2fd3e3a336266b9bbd4e68b6750826451cc3b57a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 10 12:01:03 2012 +0100
Automatic commit of package [rhnmd] release [5.3.13-1].
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 8fb3855..dcc3be0 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -8,7 +8,7 @@ Summary: Red Hat Network Monitoring Daemon
Name: rhnmd
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.3.12
+Version: 5.3.13
Release: 1%{?dist}
License: GPLv2
BuildArch: noarch
@@ -182,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Mon Dec 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.3.13-1
+- use rhnmd.service on Fedora
+
* Sun Nov 11 2012 Michael Calmer <mc(a)suse.de> 5.3.12-1
- create rhnmd.service for systemd
- no use of /var/lock/subsys/ anymore
diff --git a/rel-eng/packages/rhnmd b/rel-eng/packages/rhnmd
index b773ee9..018b726 100644
--- a/rel-eng/packages/rhnmd
+++ b/rel-eng/packages/rhnmd
@@ -1 +1 @@
-5.3.12-1 monitoring/rhnmd/
+5.3.13-1 monitoring/rhnmd/
commit c2bd154fde8911462576ce3dbe890f5b830d4248
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 10 11:55:23 2012 +0100
use rhnmd.service on Fedora
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index b49865e..8fb3855 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -20,6 +20,21 @@ Requires: openssh
BuildRequires: sysconfig
%else
Requires: openssh-server
+%if 0%{?fedora}
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(post): systemd-sysv
+Requires(preun): systemd-sysv
+Requires(post): systemd-units
+Requires(preun): systemd-units
+BuildRequires: systemd-units
+%else
+Requires(post): chkconfig
+Requires(preun): chkconfig
+# This is for /sbin/service
+Requires(preun): initscripts
+Requires(postun): initscripts
+%endif
%endif
%if 0%{?suse_version} >= 1210
BuildRequires: systemd
@@ -64,9 +79,14 @@ mkdir -p $RPM_BUILD_ROOT%{_initddir}
install -pm 0755 rhnmd.init.SUSE $RPM_BUILD_ROOT%{_initddir}/rhnmd
%endif
%else
+%if 0%{?fedora}
+mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
+install -m 0644 rhnmd.service $RPM_BUILD_ROOT/%{_unitdir}/
+%else
mkdir -p $RPM_BUILD_ROOT%{_initddir}
install -pm 0755 rhnmd-init $RPM_BUILD_ROOT%{_initddir}/rhnmd
%endif
+%endif
install -pm 0755 rhnmd_create_key.sh $RPM_BUILD_ROOT%{_var}/lib/%{np_name}/sbin/
install -pm 0644 rhnmd_config $RPM_BUILD_ROOT%{_sysconfdir}/%{np_name}/rhnmd_config
install -pm 0600 authorized_keys $RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ssh/authorized_keys
@@ -108,7 +128,9 @@ fi
%if 0%{?suse_version} >= 1210
%service_add_post rhnmd.service
%else
-/sbin/chkconfig --add rhnmd
+if [ -f /etc/init.d/rhnmd ]; then
+ /sbin/chkconfig --add rhnmd
+fi
/usr/sbin/semanage fcontext -a -t sshd_key_t '/var/lib/nocpulse/\.ssh/nocpulse-identity' || :
%if 0%{?rhel} && "%rhel" < "6"
/usr/sbin/semanage fcontext -a -t sshd_key_t '/var/lib/nocpulse/\.ssh/authorized_keys' || :
@@ -123,8 +145,14 @@ fi
%service_del_preun rhnmd.service
%else
if [ $1 = 0 ]; then
+ %if 0%{?fedora}
+ /bin/systemctl stop rhnmd.service >/dev/null 2>&1
+ %else
/sbin/service rhnmd stop > /dev/null 2>&1
- /sbin/chkconfig --del rhnmd
+ %endif
+ if [ -f /etc/init.d/rhnmd ]; then
+ /sbin/chkconfig --del rhnmd
+ fi
fi
%endif
@@ -146,7 +174,7 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/lib/%{np_name}/sbin/*
%{_usr}/sbin/rhnmd
%config(noreplace) %{_sysconfdir}/%{np_name}/rhnmd_config
-%if 0%{?suse_version} >= 1210
+%if 0%{?fedora} || 0%{?suse_version} >= 1210
%{_unitdir}/rhnmd.service
%else
%{_initddir}/rhnmd
11 years, 5 months
Changes to 'refs/tags/spacewalk-backend-1.9.13-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.9.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-10 09:48 +0000
Tagging package [spacewalk-backend] version [1.9.13-1] in directory [backend/].
Changes since spacewalk-backend-1.9.12-1:
Jan Pazdziora (2):
885170 - fixing syntax.
Automatic commit of package [spacewalk-backend] release [1.9.13-1].
---
backend/common/rhnException.py | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
11 years, 5 months