Changes to 'refs/tags/rhnsd-5.0.5-1'
by mcalmer
Tag 'rhnsd-5.0.5-1' created by Michael Calmer <mc(a)suse.de> at 2012-11-11 13:32 +0000
Tagging package [rhnsd] version [5.0.5-1] in directory [client/rhel/rhnsd/].
Changes since spacewalk-config-1.9.1-1:
Michael Calmer (14):
BuildRequire docbook-style-xsl only on redhat
no use of /var/lock/subsys/ anymore
no use of /var/lock/subsys/ anymore
no use of /var/lock/subsys/ anymore
no use of /var/lock/subsys/ anymore
package solaris converter
no hal for openSUSE >= 11.4
check if /etc/sysconfig/network is a file
check if system id has changed
do not start rhnsd in runlevel 2 which has no network
use systemd on openSUSE >= 12.1
osad: use systemd for openSUSE >= 12.1
create rhnmd.service for systemd
Automatic commit of package [rhnsd] release [5.0.5-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 4
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 2
client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py | 9 +
client/rhel/rhnsd/rhnsd.init.SUSE | 16 +-
client/rhel/rhnsd/rhnsd.spec | 36 +++++-
client/tools/osad/osad.spec | 59 ++++++++--
client/tools/osad/prog.init.SUSE | 12 +-
client/tools/rhn-virtualization/scripts/rhn-virtualization-host.SUSE | 17 +-
client/tools/rhnpush/rhnpush.spec | 2
monitoring/rhnmd/rhnmd.init.SUSE | 26 ++--
monitoring/rhnmd/rhnmd.service | 12 ++
monitoring/rhnmd/rhnmd.spec | 37 ++++++
monitoring/rhnmd/rhnmd_create_key.sh | 10 +
rel-eng/packages/rhnsd | 2
spacewalk/pylint/spacewalk-pylint.spec | 2
15 files changed, 192 insertions(+), 54 deletions(-)
---
11 years, 6 months
Changes to 'refs/tags/osad-5.11.11-1'
by mcalmer
Tag 'osad-5.11.11-1' created by Michael Calmer <mc(a)suse.de> at 2012-11-11 13:37 +0000
Tagging package [osad] version [5.11.11-1] in directory [client/tools/osad/].
Changes since spacewalk-config-1.9.1-1:
Michael Calmer (15):
BuildRequire docbook-style-xsl only on redhat
no use of /var/lock/subsys/ anymore
no use of /var/lock/subsys/ anymore
no use of /var/lock/subsys/ anymore
no use of /var/lock/subsys/ anymore
package solaris converter
no hal for openSUSE >= 11.4
check if /etc/sysconfig/network is a file
check if system id has changed
do not start rhnsd in runlevel 2 which has no network
use systemd on openSUSE >= 12.1
osad: use systemd for openSUSE >= 12.1
create rhnmd.service for systemd
Automatic commit of package [rhnsd] release [5.0.5-1].
Automatic commit of package [osad] release [5.11.11-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 4
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 2
client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py | 9 +
client/rhel/rhnsd/rhnsd.init.SUSE | 16 +-
client/rhel/rhnsd/rhnsd.spec | 36 ++++-
client/tools/osad/osad.spec | 65 ++++++++--
client/tools/osad/prog.init.SUSE | 12 -
client/tools/rhn-virtualization/scripts/rhn-virtualization-host.SUSE | 17 +-
client/tools/rhnpush/rhnpush.spec | 2
monitoring/rhnmd/rhnmd.init.SUSE | 26 ++--
monitoring/rhnmd/rhnmd.service | 12 +
monitoring/rhnmd/rhnmd.spec | 37 +++++
monitoring/rhnmd/rhnmd_create_key.sh | 10 +
rel-eng/packages/osad | 2
rel-eng/packages/rhnsd | 2
spacewalk/pylint/spacewalk-pylint.spec | 2
16 files changed, 198 insertions(+), 56 deletions(-)
---
11 years, 6 months
client/tools rel-eng/packages
by mcalmer
client/tools/osad/osad.spec | 6 +++++-
rel-eng/packages/osad | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit a59650367d89719c756566b61fa559c20b6c98a7
Author: Michael Calmer <mc(a)suse.de>
Date: Sun Nov 11 14:37:28 2012 +0100
Automatic commit of package [osad] release [5.11.11-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index beb2f90..5499786 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.10
+Version: 5.11.11
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -345,6 +345,10 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Sun Nov 11 2012 Michael Calmer <mc(a)suse.de> 5.11.11-1
+- osad: use systemd for openSUSE >= 12.1
+- no use of /var/lock/subsys/ anymore
+
* Tue Oct 30 2012 Jan Pazdziora 5.11.10-1
- Update the copyright year.
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index f13a14b..d30d923 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.10-1 client/tools/osad/
+5.11.11-1 client/tools/osad/
11 years, 6 months
client/rhel rel-eng/packages
by mcalmer
client/rhel/rhnsd/rhnsd.spec | 7 ++++++-
rel-eng/packages/rhnsd | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit cd4f61f78f9b2be05e8052c631a7dedd332e767b
Author: Michael Calmer <mc(a)suse.de>
Date: Sun Nov 11 14:32:31 2012 +0100
Automatic commit of package [rhnsd] release [5.0.5-1].
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec
index 83511bc..1c532a0 100644
--- a/client/rhel/rhnsd/rhnsd.spec
+++ b/client/rhel/rhnsd/rhnsd.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhnsd
-Version: 5.0.4
+Version: 5.0.5
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -119,6 +119,11 @@ rm -fr $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Sun Nov 11 2012 Michael Calmer <mc(a)suse.de> 5.0.5-1
+- use systemd on openSUSE >= 12.1
+- do not start rhnsd in runlevel 2 which has no network
+- no use of /var/lock/subsys/ anymore
+
* Tue Oct 30 2012 Jan Pazdziora 5.0.4-1
- Update .po and .pot files for rhnsd.
- New translations from Transifex for rhnsd.
diff --git a/rel-eng/packages/rhnsd b/rel-eng/packages/rhnsd
index 4be24f6..981865c 100644
--- a/rel-eng/packages/rhnsd
+++ b/rel-eng/packages/rhnsd
@@ -1 +1 @@
-5.0.4-1 client/rhel/rhnsd/
+5.0.5-1 client/rhel/rhnsd/
11 years, 6 months
13 commits - client/rhel client/tools monitoring/rhnmd spacewalk/pylint
by mcalmer
client/rhel/rhn-client-tools/rhn-client-tools.spec | 4
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 2
client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py | 9 +
client/rhel/rhnsd/rhnsd.init.SUSE | 16 +-
client/rhel/rhnsd/rhnsd.spec | 29 ++++
client/tools/osad/osad.spec | 59 ++++++++--
client/tools/osad/prog.init.SUSE | 12 +-
client/tools/rhn-virtualization/scripts/rhn-virtualization-host.SUSE | 17 +-
client/tools/rhnpush/rhnpush.spec | 2
monitoring/rhnmd/rhnmd.init.SUSE | 26 ++--
monitoring/rhnmd/rhnmd.service | 12 ++
monitoring/rhnmd/rhnmd.spec | 37 ++++++
monitoring/rhnmd/rhnmd_create_key.sh | 10 +
spacewalk/pylint/spacewalk-pylint.spec | 2
14 files changed, 185 insertions(+), 52 deletions(-)
New commits:
commit fcf139d884b9d801af748702ceee658f433f52c8
Author: Michael Calmer <mc(a)suse.de>
Date: Wed Oct 31 15:01:26 2012 +0100
create rhnmd.service for systemd
diff --git a/monitoring/rhnmd/rhnmd.service b/monitoring/rhnmd/rhnmd.service
new file mode 100644
index 0000000..4f1dadb
--- /dev/null
+++ b/monitoring/rhnmd/rhnmd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=rhnmd server daemon
+After=syslog.target network.target auditd.service
+
+[Service]
+User=nocpulse
+ExecStartPre=/var/lib/nocpulse/sbin/rhnmd_create_key.sh
+ExecStart=/usr/sbin/rhnmd -D -f /etc/nocpulse/rhnmd_config
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 3028179..fd87bdd 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -21,6 +21,10 @@ BuildRequires: sysconfig
%else
Requires: openssh-server
%endif
+%if 0%{?suse_version} >= 1210
+BuildRequires: systemd
+%{?systemd_requires}
+%endif
BuildRequires: pam-devel
Obsoletes: rhnmd.i386 < 5.3.0-5
Obsoletes: rhnmd.x86_64 < 5.3.0-5
@@ -44,17 +48,26 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_usr}/sbin
mkdir -p $RPM_BUILD_ROOT%{_usr}/lib
-mkdir -p $RPM_BUILD_ROOT%{_initddir}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{np_name}
mkdir -p $RPM_BUILD_ROOT%{_var}/lib/%{np_name}/.ssh
+mkdir -p $RPM_BUILD_ROOT%{_var}/lib/%{np_name}/sbin
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
mkdir -p $RPM_BUILD_ROOT%{_libdir}
ln -sf sshd $RPM_BUILD_ROOT%{_usr}/sbin/rhnmd
+
%if 0%{?suse_version}
+%if 0%{?suse_version} >= 1210
+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.SUSE $RPM_BUILD_ROOT%{_initddir}/rhnmd
+%endif
%else
+mkdir -p $RPM_BUILD_ROOT%{_initddir}
install -pm 0755 rhnmd-init $RPM_BUILD_ROOT%{_initddir}/rhnmd
%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
install -pm 0644 rhnmd-pam_config $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/rhnmd
@@ -80,6 +93,9 @@ if getent passwd %{np_name} >/dev/null && [ -d /home/nocpulse ]; then
rm -rf %{_var}/lib/nocpulse/bin
rm -rf %{_var}/lib/nocpulse/var
fi
+%if 0%{?suse_version} >= 1210
+%service_add_pre rhnmd.service
+%endif
%post
# keygen is done in init script. Doing this in %post is bad for using this rpm in appliances.
@@ -89,6 +105,9 @@ then
/sbin/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{np_name}
fi
%endif
+%if 0%{?suse_version} >= 1210
+%service_add_post rhnmd.service
+%else
/sbin/chkconfig --add rhnmd
/usr/sbin/semanage fcontext -a -t sshd_key_t '/var/lib/nocpulse/\.ssh/nocpulse-identity' || :
%if 0%{?rhel} && "%rhel" < "6"
@@ -97,12 +116,22 @@ fi
/usr/sbin/semanage fcontext -a -t ssh_home_t '/var/lib/nocpulse/\.ssh/authorized_keys' || :
%endif
/sbin/restorecon -rvv /var/lib/nocpulse || :
+%endif
%preun
+%if 0%{?suse_version} >= 1210
+%service_del_preun rhnmd.service
+%else
if [ $1 = 0 ]; then
/sbin/service rhnmd stop > /dev/null 2>&1
/sbin/chkconfig --del rhnmd
fi
+%endif
+
+%if 0%{?suse_version} >= 1210
+%postun
+%service_del_preun rhnmd.service
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -112,10 +141,16 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/pam.d/rhnmd
%dir %attr(-, %{np_name},%{np_name}) %{_var}/lib/%{np_name}
%dir %attr(700, %{np_name},%{np_name}) %{_var}/lib/%{np_name}/.ssh
+%dir %attr(-, %{np_name},%{np_name}) %{_var}/lib/%{np_name}/sbin
%config(noreplace) %attr(-, %{np_name},%{np_name}) %{_var}/lib/%{np_name}/.ssh/authorized_keys
+%{_var}/lib/%{np_name}/sbin/*
%{_usr}/sbin/rhnmd
%config(noreplace) %{_sysconfdir}/%{np_name}/rhnmd_config
+%if 0%{?suse_version} >= 1210
+%{_unitdir}/rhnmd.service
+%else
%{_initddir}/rhnmd
+%endif
%doc LICENSE
%changelog
diff --git a/monitoring/rhnmd/rhnmd_create_key.sh b/monitoring/rhnmd/rhnmd_create_key.sh
new file mode 100755
index 0000000..ffef919
--- /dev/null
+++ b/monitoring/rhnmd/rhnmd_create_key.sh
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+IDENTITY="/var/lib/nocpulse/.ssh/nocpulse-identity"
+if [ ! -f "$IDENTITY" ]
+then
+ /bin/su -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f $IDENTITY" - nocpulse
+ if [ ! -e "/var/lib/nocpulse/.bashrc" ]; then
+ echo 'LANG="C"' > /var/lib/nocpulse/.bashrc
+ fi
+fi
commit 1904cdaabbd497fcc7a062065d2f9301244aafc9
Author: Michael Calmer <mc(a)suse.de>
Date: Wed Oct 31 13:41:27 2012 +0100
osad: use systemd for openSUSE >= 12.1
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 0eeb1f3..beb2f90 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -33,6 +33,10 @@ Requires: python-xml
%endif
Conflicts: osa-dispatcher < %{version}-%{release}
Conflicts: osa-dispatcher > %{version}-%{release}
+%if 0%{?suse_version} >= 1210
+BuildRequires: systemd
+%{?systemd_requires}
+%endif
%if 0%{?suse_version}
# provides chkconfig on SUSE
Requires(post): aaa_base
@@ -71,15 +75,18 @@ Requires: jabberpy
Requires: lsof
Conflicts: %{name} < %{version}-%{release}
Conflicts: %{name} > %{version}-%{release}
-%if !0%{?suse_version}
+%if 0%{?suse_version} >= 1210
+%{?systemd_requires}
+%endif
+%if 0%{?suse_version}
+# provides chkconfig on SUSE
+Requires(post): aaa_base
+Requires(preun): aaa_base
+%else
Requires(post): chkconfig
Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
-%else
-# provides chkconfig on SUSE
-Requires(post): aaa_base
-Requires(preun): aaa_base
%endif
%description -n osa-dispatcher
@@ -146,7 +153,7 @@ mkdir -p %{buildroot}%{_var}/log/rhn
touch %{buildroot}%{_var}/log/osad
touch %{buildroot}%{_var}/log/rhn/osa-dispatcher.log
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?suse_version} >= 1210
rm $RPM_BUILD_ROOT/%{_initrddir}/osad
rm $RPM_BUILD_ROOT/%{_initrddir}/osa-dispatcher
mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
@@ -178,27 +185,63 @@ install -p -m 755 osa-dispatcher-selinux/osa-dispatcher-selinux-enable %{buildro
%clean
rm -rf $RPM_BUILD_ROOT
+%if 0%{?suse_version} >= 1210
+
+%pre
+%service_add_pre osad.service
+
+%postun
+%service_del_postun osad.service
+
+%endif
+
%post
+%if 0%{?suse_version} >= 1210
+%service_add_post osad.service
+%else
if [ -f %{_sysconfdir}/init.d/osad ]; then
/sbin/chkconfig --add osad
fi
+%endif
%preun
+%if 0%{?suse_version} >= 1210
+%service_del_preun osad.service
+%else
if [ $1 = 0 ]; then
/sbin/service osad stop > /dev/null 2>&1
/sbin/chkconfig --del osad
fi
+%endif
+
+%if 0%{?suse_version} >= 1210
+
+%pre -n osa-dispatcher
+%service_add_pre osa-dispatcher.service
+
+%postun -n osa-dispatcher
+%service_del_postun osa-dispatcher.service
+
+%endif
%post -n osa-dispatcher
+%if 0%{?suse_version} >= 1210
+%service_add_post osa-dispatcher.service
+%else
if [ -f %{_sysconfdir}/init.d/osa-dispatcher ]; then
/sbin/chkconfig --add osa-dispatcher
fi
+%endif
%preun -n osa-dispatcher
+%if 0%{?suse_version} >= 1210
+%service_del_preun osa-dispatcher.service
+%else
if [ $1 = 0 ]; then
/sbin/service osa-dispatcher stop > /dev/null 2>&1
/sbin/chkconfig --del osa-dispatcher
fi
+%endif
%if 0%{?include_selinux_package}
%post -n osa-dispatcher-selinux
@@ -246,7 +289,7 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%config(noreplace) %{_sysconfdir}/sysconfig/rhn/osad.conf
%config(noreplace) %attr(600,root,root) %{_sysconfdir}/sysconfig/rhn/osad-auth.conf
%config(noreplace) %{client_caps_dir}/*
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?suse_version} >= 1210
%{_unitdir}/osad.service
%else
%attr(755,root,root) %{_initrddir}/osad
@@ -275,7 +318,7 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%dir %{_sysconfdir}/rhn/tns_admin
%dir %{_sysconfdir}/rhn/tns_admin/osa-dispatcher
%config(noreplace) %{_sysconfdir}/rhn/tns_admin/osa-dispatcher/sqlnet.ora
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?suse_version} >= 1210
%{_unitdir}/osa-dispatcher.service
%else
%attr(755,root,root) %{_initrddir}/osa-dispatcher
commit 22605bf89faf4ebabfbdb3d384d16820d25112eb
Author: Michael Calmer <mc(a)suse.de>
Date: Wed Oct 31 11:29:04 2012 +0100
use systemd on openSUSE >= 12.1
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec
index e683d9e..83511bc 100644
--- a/client/rhel/rhnsd/rhnsd.spec
+++ b/client/rhel/rhnsd/rhnsd.spec
@@ -11,6 +11,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
Requires: rhn-check >= 0.0.8
+%if 0%{?suse_version} >= 1210
+BuildRequires: systemd
+%{?systemd_requires}
+%endif
%if 0%{?suse_version}
Requires(post): aaa_base
Requires(preun): aaa_base
@@ -48,10 +52,10 @@ make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="%{optflags}"
rm -rf $RPM_BUILD_ROOT
make -f Makefile.rhnsd install VERSION=%{version}-%{release} PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir} INIT_DIR=$RPM_BUILD_ROOT/%{_initrddir}
-%if 0%{?suse_version}
+%if 0%{?suse_version} && 0%{?suse_version} < 1210
install -m 0755 rhnsd.init.SUSE $RPM_BUILD_ROOT/%{_initrddir}/rhnsd
%endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?suse_version} >= 1210
rm $RPM_BUILD_ROOT/%{_initrddir}/rhnsd
mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
install -m 0644 rhnsd.service $RPM_BUILD_ROOT/%{_unitdir}/
@@ -59,11 +63,22 @@ install -m 0644 rhnsd.service $RPM_BUILD_ROOT/%{_unitdir}/
%find_lang %{name}
+%if 0%{?suse_version} >= 1210
+%pre
+%service_add_pre rhnsd.service
+%endif
%post
+%if 0%{?suse_version} >= 1210
+%service_add_post rhnsd.service
+%else
/sbin/chkconfig --add rhnsd
+%endif
%preun
+%if 0%{?suse_version} >= 1210
+%service_del_preun rhnsd.service
+%else
if [ $1 = 0 ] ; then
%if 0%{?fedora}
/bin/systemctl stop rhnsd >/dev/null 2>&1
@@ -72,9 +87,12 @@ if [ $1 = 0 ] ; then
%endif
/sbin/chkconfig --del rhnsd
fi
-
+%endif
%postun
+%if 0%{?suse_version} >= 1210
+%service_del_postun rhnsd.service
+%else
if [ "$1" -ge "1" ]; then
%if 0%{?fedora}
/bin/systemctl condrestart rhnsd >/dev/null 2>&1 || :
@@ -82,16 +100,17 @@ if [ "$1" -ge "1" ]; then
service rhnsd condrestart >/dev/null 2>&1 || :
%endif
fi
+%endif
%clean
rm -fr $RPM_BUILD_ROOT
-%files -f %{name}.lang
+%files -f %{name}.lang
%dir %{_sysconfdir}/sysconfig/rhn
%config(noreplace) %{_sysconfdir}/sysconfig/rhn/rhnsd
%{_sbindir}/rhnsd
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?suse_version} >= 1210
%{_unitdir}/rhnsd.service
%else
%{_initrddir}/rhnsd
commit 5d1b00242193cadc2470cf034e3b695695018e45
Author: Michael Calmer <mc(a)suse.de>
Date: Wed Oct 31 10:00:34 2012 +0100
do not start rhnsd in runlevel 2 which has no network
diff --git a/client/rhel/rhnsd/rhnsd.init.SUSE b/client/rhel/rhnsd/rhnsd.init.SUSE
index d02a5af..a909579 100644
--- a/client/rhel/rhnsd/rhnsd.init.SUSE
+++ b/client/rhel/rhnsd/rhnsd.init.SUSE
@@ -17,7 +17,7 @@
# Provides: rhnsd
# Required-Start: $local_fs $network $remote_fs $named $time
# Required-Stop: $local_fs $network $remote_fs $named
-# Default-Start: 2 3 5
+# Default-Start: 3 5
# Default-Stop: 0 1 6
# Short-Description: Starts the Red Hat Network Daemon
# Description: This is a daemon which handles the task of connecting
commit 88beea883dbc292fe5475f574eb7a34f699b9be5
Author: Michael Calmer <mc(a)suse.de>
Date: Sat Oct 20 15:51:17 2012 +0200
check if system id has changed
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py
index d0d02f4..ef84f8b 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateAuth.py
@@ -127,6 +127,15 @@ def readCachedLogin():
pcklAuth.close()
return False
pcklAuth.close()
+ # Check if system_id has changed
+ try:
+ idVer = rpclib.xmlrpclib.loads(getSystemId())[0][0]['system_id']
+ cidVer = "ID-%s" % data['loginInfo']['X-RHN-Server-Id']
+ if idVer != cidVer:
+ log.log_debug("system id version changed: %s vs %s" % (idVer, cidVer))
+ return False
+ except:
+ pass
createdTime = data['time']
li = data['loginInfo']
currentTime = time.time()
commit 7fb24d1f0db67fad2040309812e0f529ff413ccf
Author: Michael Calmer <mc(a)suse.de>
Date: Sat Oct 20 15:48:09 2012 +0200
check if /etc/sysconfig/network is a file
Other Linux distributions may not have a file named /etc/sysconfig/network.
Check if it is a file and use the other methods to
find the hostname.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index ba53256..41856e4 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -453,7 +453,7 @@ def findHostByRoute():
# Override hostname with the one in /etc/sysconfig/network
# for bz# 457953
- if os.access("/etc/sysconfig/network", os.R_OK):
+ if os.path.isfile("/etc/sysconfig/network") and os.access("/etc/sysconfig/network", os.R_OK):
networkinfo = open("/etc/sysconfig/network", "r").readlines()
for info in networkinfo:
commit a3e441fefb49e7519a688273d530a656c4407bde
Author: Michael Calmer <mc(a)suse.de>
Date: Sat Oct 20 15:45:05 2012 +0200
no hal for openSUSE >= 11.4
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index b9f0ded..dec7fa7 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -23,7 +23,7 @@ Requires: dbus-1-python
%else
Requires: dbus-python
%endif
-%if 0%{?fedora} || 0%{?rhel} > 5
+%if 0%{?fedora} || 0%{?rhel} > 5 || 0%{?suse_version} >= 1140
Requires: python-gudev
Requires: python-hwdata
%else
@@ -143,7 +143,7 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/up2date
mkdir -pm700 $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date
touch $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date/loginAuth.pkl
-%if 0%{?fedora} || 0%{?rhel} > 5
+%if 0%{?fedora} || 0%{?rhel} > 5 || 0%{?suse_version} >= 1140
rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_hal.*
%else
rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_gudev.*
commit f12a815d475477aab4c85f6e2b87bf4c90b593ca
Author: Michael Calmer <mc(a)suse.de>
Date: Sat Oct 6 17:29:59 2012 +0200
package solaris converter
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index 8046e30..80df3e4 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -68,7 +68,7 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%attr(755,root,root) %{_bindir}/rpm2mpm
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/rhn/rhnpushrc
%{_mandir}/man8/rhnpush.8*
-%if 0%{?fedora} || 0%{?rhel} > 5
+%if 0%{?fedora} || 0%{?rhel} > 5 || 0%{?suse_version}
%attr(755,root,root) %{_bindir}/solaris2mpm
%{_mandir}/man8/solaris2mpm.8*
%endif
commit 4b0f74c1dc1a01f7922c09fd5a80412f44ed4836
Author: Michael Calmer <mc(a)suse.de>
Date: Sat May 5 15:48:45 2012 +0200
no use of /var/lock/subsys/ anymore
diff --git a/monitoring/rhnmd/rhnmd.init.SUSE b/monitoring/rhnmd/rhnmd.init.SUSE
index a1662f6..a95b652 100644
--- a/monitoring/rhnmd/rhnmd.init.SUSE
+++ b/monitoring/rhnmd/rhnmd.init.SUSE
@@ -52,14 +52,12 @@ start()
fi
startproc -p $SSHD_PIDFILE $SSHD -f /etc/nocpulse/rhnmd_config -o "PidFile=$SSHD_PIDFILE"
rc_status
- touch /var/lock/subsys/rhnmd
rc_status -v
}
stop()
{
echo -n $"Stopping $prog:"
- rm -f /var/lock/subsys/rhnmd
killproc -p $SSHD_PIDFILE -TERM $SSHD
rc_status -v
}
@@ -86,15 +84,19 @@ case "$1" in
reload
;;
condrestart|try-restart)
- if [ -f /var/lock/subsys/rhnmd ] ; then
- do_restart_sanity_check
- if [ "$RETVAL" = 0 ] ; then
- stop
- # avoid race
- sleep 3
- start
- fi
- fi
+ $0 status
+ if test $? = 0; then
+ do_restart_sanity_check
+ if [ "$RETVAL" = 0 ] ; then
+ $0 stop
+ # avoid race
+ sleep 3
+ $0 start
+ fi
+ else
+ rc_reset
+ fi
+ rc_status
;;
status)
echo -n "Checking for service rhnmd: "
@@ -102,6 +104,6 @@ case "$1" in
rc_status -v
;;
*)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+ echo $"Usage: $0 {start|stop|restart|reload|condrestart|try-restart|status}"
esac
rc_exit
commit 19adc96e5c6f56c9877dd7c66180d4ec1a88e5a1
Author: Michael Calmer <mc(a)suse.de>
Date: Sat May 5 15:29:24 2012 +0200
no use of /var/lock/subsys/ anymore
diff --git a/client/tools/rhn-virtualization/scripts/rhn-virtualization-host.SUSE b/client/tools/rhn-virtualization/scripts/rhn-virtualization-host.SUSE
index da66d86..04ae45a 100644
--- a/client/tools/rhn-virtualization/scripts/rhn-virtualization-host.SUSE
+++ b/client/tools/rhn-virtualization/scripts/rhn-virtualization-host.SUSE
@@ -41,7 +41,6 @@ start() {
fi
done
- touch /var/lock/subsys/rhn-virtualization
rc_status -v
}
@@ -55,28 +54,29 @@ stop() {
fi
done
- rm -f /var/lock/subsys/rhn-virtualization
rc_status -v
}
status() {
found_guests=0
+ rc_reset
for NAME in $list_of_files; do
found_guests=1
dom_name=$(eval $get_name $auto_dir/$NAME)
dom_state=$(virsh domstate $dom_name 2> /dev/null)
+ rc_check
if [ $? -eq 0 ]; then
echo "$dom_name: $dom_state"
else
echo "Error getting the status for $dom_name."
- rc_check
fi
done
if [ $found_guests -eq 0 ]; then
echo "No guest configurations symlinked in $auto_dir."
+ rc_status -u
fi
rc_status -v
@@ -99,10 +99,13 @@ case "$1" in
start
;;
condrestart|try-restart)
- if [ -f /var/lock/subsys/rhn-virtualization ]; then
- stop
- start
- fi
+ $0 status
+ if test $? = 0; then
+ $0 restart
+ else
+ rc_reset
+ fi
+ rc_status
;;
status)
status
commit 67ce1a3a8892af89241520d34de55867c8c66627
Author: Michael Calmer <mc(a)suse.de>
Date: Sat May 5 15:14:25 2012 +0200
no use of /var/lock/subsys/ anymore
diff --git a/client/tools/osad/prog.init.SUSE b/client/tools/osad/prog.init.SUSE
index c1662a3..a99e225 100644
--- a/client/tools/osad/prog.init.SUSE
+++ b/client/tools/osad/prog.init.SUSE
@@ -30,8 +30,6 @@ start() {
# Start daemon
echo -n "Starting $prog: "
startproc -p $PIDFILE $script --pid-file="$PIDFILE"
- rc_status
- touch /var/lock/subsys/$prog
rc_status -v
}
@@ -39,7 +37,6 @@ start() {
stop() {
# Stop daemon
echo -n "Shutting down $prog: "
- rm -f /var/lock/subsys/$prog
killproc -p $PIDFILE $script
rc_status -v
}
@@ -62,10 +59,13 @@ case "$1" in
rc_status -v
;;
condrestart|try-restart)
- if [ -f /var/lock/subsys/$prog ]; then
- stop
- start
+ $0 status
+ if test $? = 0; then
+ $0 restart
+ else
+ rc_reset
fi
+ rc_status
;;
*)
echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
commit 897ec558d59d2d2f75371812903bc6ddc5e3c484
Author: Michael Calmer <mc(a)suse.de>
Date: Sat May 5 15:10:09 2012 +0200
no use of /var/lock/subsys/ anymore
diff --git a/client/rhel/rhnsd/rhnsd.init.SUSE b/client/rhel/rhnsd/rhnsd.init.SUSE
index e2faf8e..d02a5af 100644
--- a/client/rhel/rhnsd/rhnsd.init.SUSE
+++ b/client/rhel/rhnsd/rhnsd.init.SUSE
@@ -66,8 +66,6 @@ rc_reset
start() {
echo -n $"Starting Red Hat Network Daemon: "
startproc -p $RHNSD_PIDFILE $RHNSD
- rc_status
- touch /var/lock/subsys/rhnsd
rc_status -v
}
@@ -75,7 +73,6 @@ stop() {
echo -n $"Stopping Red Hat Network Daemon: "
killproc -p $RHNSD_PIDFILE $RHNSD
rc_status -v
- rm -f /var/lock/subsys/rhnsd
}
# See how we were called.
@@ -96,10 +93,13 @@ case "$1" in
start
;;
condrestart|try-restart)
- if [ -f /var/lock/subsys/rhnsd ]; then
- stop
- start
- fi
+ $0 status
+ if test $? = 0; then
+ $0 restart
+ else
+ rc_reset
+ fi
+ rc_status
;;
reload)
echo -n $"Reloading Red Hat Network Daemon: "
commit dd2b4fd915a8aac725291ec445fa0f0499747582
Author: Michael Calmer <mc(a)suse.de>
Date: Sun Apr 22 16:33:37 2012 +0200
BuildRequire docbook-style-xsl only on redhat
diff --git a/spacewalk/pylint/spacewalk-pylint.spec b/spacewalk/pylint/spacewalk-pylint.spec
index 0c102cc..b2d4e62 100644
--- a/spacewalk/pylint/spacewalk-pylint.spec
+++ b/spacewalk/pylint/spacewalk-pylint.spec
@@ -13,7 +13,7 @@ BuildArch: noarch
Requires: pylint
BuildRequires: asciidoc
BuildRequires: libxslt
-%if 0%{?rhel} < 6
+%if 0%{?rhel} && 0%{?rhel} < 6
BuildRequires: docbook-style-xsl
%endif
11 years, 6 months
Changes to 'refs/tags/spacewalk-config-1.9.1-1'
by Jan Pazdziora
Tag 'spacewalk-config-1.9.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-09 14:47 +0000
Tagging package [spacewalk-config] version [1.9.1-1] in directory [spacewalk/config/].
Changes since spacewalk-web-1.9.2-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-config] release [1.9.1-1].
---
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 6 months
rel-eng/packages spacewalk/config
by Jan Pazdziora
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e23dd7b8cb9305472fbb60f3710c6ec4f6db2f41
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 9 15:47:37 2012 +0100
Automatic commit of package [spacewalk-config] release [1.9.1-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index dac73d1..8a1c212 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-1.8.6-1 spacewalk/config/
+1.9.1-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index 81ce563..a643f22 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -1,6 +1,6 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 1.9.0
+Version: 1.9.1
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -104,6 +104,9 @@ chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini 2> /dev/null || :
chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* 2> /dev/null || :
%changelog
+* Fri Nov 09 2012 Jan Pazdziora 1.9.1-1
+- Address Permission Error on proxy details page.
+
* Wed Oct 31 2012 Jan Pazdziora 1.8.6-1
- Advertise the www.spacewalkproject.org.
11 years, 6 months
Changes to 'refs/tags/spacewalk-web-1.9.2-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.9.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-09 14:31 +0000
Tagging package [spacewalk-web] version [1.9.2-1] in directory [web/].
Changes since spacewalk-java-1.9.7-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.9.2-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 12 +++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
---
11 years, 6 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 12 +++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit e3c55b872722bacb48665bcd1ffc19d192ba5c85
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 9 15:31:12 2012 +0100
Automatic commit of package [spacewalk-web] release [1.9.2-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index ff4f324..d7b708d 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.9.1-1 web/
+1.9.2-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 3db95a9..03214e2 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.9.1
+Version: 1.9.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,16 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Nov 09 2012 Jan Pazdziora 1.9.2-1
+- 490524 - Return the datetime in the local time zone.
+- 490524 - Epoch is always in UTC, no time_zone setting for epoch case.
+- Function date_to_epoch made obsolete, not used anymore.
+- The from_zone parameter is not used anywhere.
+- Use RHN::Date where it is used (only).
+- 490524 - Avoid initializing the object with local only to call time_zone
+ right away.
+- 490524 - Shortcut RHN::Date->now->long_date, avoiding DateTime.
+
* Wed Oct 31 2012 Jan Pazdziora 1.9.1-1
- Bumping version string to 1.9.
- Bumping package versions for 1.9.
11 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.9.7-1'
by Michael Mraka
Tag 'spacewalk-java-1.9.7-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-11-09 14:19 +0000
Tagging package [spacewalk-java] version [1.9.7-1] in directory [java/].
Changes since spacewalk-java-1.9.6-1:
Jan Pazdziora (7):
490524 - Shortcut RHN::Date->now->long_date, avoiding DateTime.
490524 - Avoid initializing the object with local only to call time_zone right away.
Use RHN::Date where it is used (only).
The from_zone parameter is not used anywhere.
Function date_to_epoch made obsolete, not used anymore.
490524 - Epoch is always in UTC, no time_zone setting for epoch case.
490524 - Return the datetime in the local time zone.
Michael Mraka (2):
reverted macro name translation
Automatic commit of package [spacewalk-java] release [1.9.7-1].
---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 2
java/spacewalk-java.spec | 5
rel-eng/packages/spacewalk-java | 2
web/modules/rhn/RHN/DB/ChannelEditor.pm | 2
web/modules/rhn/RHN/DB/SystemSnapshot.pm | 4
web/modules/rhn/RHN/DB/TinyURL.pm | 2
web/modules/rhn/RHN/Date.pm | 60 ++++------
web/modules/sniglets/Sniglets/Errata.pm | 1
web/modules/sniglets/Sniglets/ListView/ErrataList.pm | 6 -
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 4
web/modules/sniglets/Sniglets/ListView/SystemList.pm | 4
web/modules/sniglets/Sniglets/ServerActions.pm | 12 --
web/modules/sniglets/Sniglets/Servers.pm | 2
14 files changed, 50 insertions(+), 58 deletions(-)
---
11 years, 6 months