rpms/nocpulse-common/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 nocpulse-common.spec, 1.3, 1.4 sources, 1.2, 1.3
Miroslav Suchý
msuchy at fedoraproject.org
Thu Feb 11 13:39:11 UTC 2010
Author: msuchy
Update of /cvs/pkgs/rpms/nocpulse-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12629/devel
Modified Files:
.cvsignore import.log nocpulse-common.spec sources
Log Message:
Rebase to nocpulse-common-2.1.19-1.el6.src.rpm in rawhide.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nocpulse-common/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 4 Dec 2008 10:33:59 -0000 1.2
+++ .cvsignore 11 Feb 2010 13:39:10 -0000 1.3
@@ -1 +1 @@
-nocpulse-common-2.0.14.tar.gz
+nocpulse-common-2.1.19.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nocpulse-common/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 4 Dec 2008 10:33:59 -0000 1.1
+++ import.log 11 Feb 2010 13:39:10 -0000 1.2
@@ -1 +1,2 @@
nocpulse-common-2_0_14-1:HEAD:nocpulse-common-2.0.14-1.src.rpm:1228386788
+nocpulse-common-2_1_19-1_el6:HEAD:nocpulse-common-2.1.19-1.el6.src.rpm:1265895511
Index: nocpulse-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nocpulse-common/devel/nocpulse-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nocpulse-common.spec 25 Jul 2009 19:27:40 -0000 1.3
+++ nocpulse-common.spec 11 Feb 2010 13:39:10 -0000 1.4
@@ -1,6 +1,6 @@
Name: nocpulse-common
-Version: 2.0.14
-Release: 3%{?dist}
+Version: 2.1.19
+Release: 1%{?dist}
Summary: NOCpulse common
License: GPLv2
URL: https://fedorahosted.org/spacewalk
@@ -10,11 +10,17 @@ Group: Applications/System
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(pre): httpd, /usr/sbin/useradd
Requires(post): /sbin/runuser, openssh
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# merging this two packages together
# not backward compatible => no Provides:
Obsoletes: NPusers <= 1.17.50-1
Obsoletes: np-config <= 2.110.50-1
+Obsoletes: nslogs < 2.3.0
+Provides: nslogs = 2.3.0
+Obsoletes: ConfigPusher-general < 1.3.0
+Provides: ConfigPusher-general = 1.3.0
+
%define package_name nocpulse
%define identity %{_var}/lib/%{package_name}/.ssh/nocpulse-identity
@@ -46,7 +52,8 @@ install -m644 nocpulse.logrotate \
$RPM_BUILD_ROOT/etc/logrotate.d/%{name}
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
-install -m644 NOCpulse.ini $RPM_BUILD_ROOT/%{_var}/lib/%{package_name}/NOCpulse.ini
+install -m644 NOCpulse.ini $RPM_BUILD_ROOT/%{_sysconfdir}/%{package_name}/NOCpulse.ini
+install -m644 forward $RPM_BUILD_ROOT/%{_var}/lib/%{package_name}/.forward
mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib}/NOCpulse/Config/test
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m644 perl-API/NOCpulse/Config.pm $RPM_BUILD_ROOT%{perl_vendorlib}/NOCpulse/
@@ -55,28 +62,78 @@ install -m644 perl-API/NOCpulse/test/Tes
install -m 755 npConfigValue $RPM_BUILD_ROOT%{_bindir}/
%pre
-if [ $1 -eq 1 ] ; then
- getent group %{package_name} >/dev/null || groupadd -r %{package_name}
- getent passwd %{package_name} >/dev/null || \
- useradd -r -g %{package_name} -G apache -d %{_var}/lib/%{package_name} -c "NOCpulse user" %{package_name}
- /usr/bin/passwd -l %{package_name} >/dev/null
- exit 0
+# change nocpulse user & group to system user & group if needed
+dirs="/home/nocpulse /opt/notification /opt/nocpulse /var/log/nocpulse /var/www/templates /var/tmp"
+
+# Fedora guys do not want this stuff
+%if ! 0%{?fedora}
+if [ -d /home/nocpulse -a 0`id -u nocpulse 2> /dev/null` -ge 500 ]; then
+ if [ 0`id -g nocpulse` -ge 500 ]; then
+ groupmod -n nocpulse-old nocpulse
+ groupadd -r nocpulse
+ usermod -g nocpulse nocpulse
+ # chgrp of existing fs objects owned by previous nocpulse group
+ for i in $dirs; do
+ find $i -group nocpulse-old -exec chgrp nocpulse '{}' ';'
+ done
+ groupdel nocpulse-old
+ fi
+
+ # find lowest unused system uid to change nocpulse uid to
+ old_uid=`id -u nocpulse`
+ useradd -r tempnoc -s /bin/bash
+ uid=`id -u tempnoc`
+ userdel tempnoc
+ usermod -u $uid nocpulse
+
+ # chown of existing fs objects owned by previous nocpulse user
+ for i in $dirs; do
+ find $i -user $old_uid -exec chown nocpulse '{}' ';'
+ done
fi
+%endif
+
+
+getent group %{package_name} >/dev/null || groupadd -r %{package_name}
+getent passwd %{package_name} >/dev/null || \
+useradd -r -g %{package_name} -G apache -d %{_var}/lib/%{package_name} -s /bin/bash -c "NOCpulse user" %{package_name}
+/usr/bin/passwd -l %{package_name} >/dev/null
+
+# if user already exists (rhnmd creates it too) add nocpulse to apache group
+getent group apache | grep nocpulse >/dev/null || usermod -G apache nocpulse
%post
+# Fedora guys do not want this stuff
+%if ! 0%{?fedora}
+# migrate things from /home/nocpulse to /var/lib/nocpulse and /var/log/nocpulse
+if [ `getent passwd nocpulse|awk -F ':' '{ print $6 }'` = "/home/nocpulse" ]; then
+ # /var/lib/nocpulse is new homedir for nocpulse user
+ usermod -d %{_var}/lib/%{package_name} nocpulse
+ [ -f /home/nocpulse/etc/SatCluster.ini ] && mv /home/nocpulse/etc/SatCluster.ini %{_sysconfdir}/nocpulse
+ mv /home/nocpulse/.ssh/* %{_var}/lib/%{package_name}/.ssh
+ mv /home/nocpulse/.bash* /home/nocpulse/var/*.db \
+ /home/nocpulse/var/scheduler.xml /home/nocpulse/var/events.frozen \
+ %{_var}/lib/%{package_name} 2>/dev/null
+ # archive of log files into /var/log/nocpulse
+ mv /home/nocpulse/var/archives/* \
+ %{_var}/log/%{package_name} 2> /dev/null
+fi
+%endif
+
if [ ! -f %{identity} ]
then
- runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{package_name}
+ /sbin/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{package_name}
fi
%files
%defattr(-, root,root,-)
%dir %{_sysconfdir}/nocpulse
-%config(missingok,noreplace) %{_var}/lib/%{package_name}/NOCpulse.ini
+%config(missingok,noreplace) %{_sysconfdir}/%{package_name}/NOCpulse.ini
+%config(missingok,noreplace) %attr(-, %{package_name},%{package_name}) %{_var}/lib/%{package_name}/.forward
%{_bindir}/npConfigValue
%dir %{perl_vendorlib}/NOCpulse
%{perl_vendorlib}/NOCpulse/*
-%dir %attr(-, %{package_name},%{package_name}) %{_var}/log/%{package_name}
+%dir %attr(775, %{package_name},apache) %{_var}/log/%{package_name}
%dir %attr(-, %{package_name},%{package_name}) %{_var}/lib/%{package_name}
%dir %attr(700, %{package_name},%{package_name})%{_var}/lib/%{package_name}/.ssh
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
@@ -86,11 +143,59 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.14-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Thu Feb 11 2010 Miroslav Suchý <msuchy at redhat.com> 2.1.19-1
+- Fedora guys do not want to have migration code in theirs spec
+
+* Thu Sep 17 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.18-1
+- 476851 - removal of tables: rhn_db_environment, rhn_environment
+
+* Mon Jul 27 2009 John Matthews <jmatthew at redhat.com> 2.1.17-1
+- specify login shell for useradd (msuchy at redhat.com)
+- 457011 - add warning to top of file. This file should not be edited manualy
+ (msuchy at redhat.com)
+- 457011 - create NOCpulse-ini - tool to handle NOCpulse.ini
+ (msuchy at redhat.com)
+
+* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 2.1.16-1
+- don't print error when files to be moved don't exist (mzazrivec at redhat.com)
+- Don't to migrate log files from /home/nocpulse/var (mzazrivec at redhat.com)
+
+* Tue Jun 16 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.15-1
+- fix problem when nocpulse user do not exist
+
+* Wed Jun 03 2009 Milan Zazrivec <mzazrivec at redhat.com> 2.1.14-1
+- switch nocpulse to a system user if needed
+
+* Mon May 11 2009 Milan Zazrivec <mzazrivec at redhat.com> 2.1.13-1
+- 498257 - migrate existing files into new nocpulse homedir
+
+* Mon May 11 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.12-1
+- 499568 - require scout_shared_key for requesting NOCpulse.ini
+
+* Wed Apr 22 2009 Jan Pazdziora 2.1.10-1
+- 497064 - do not inherit crond's stdin
+
+* Fri Apr 10 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.9-1
+- 494538 - remove the dependecy of rhnmd on nocpulse-common
+
+* Wed Mar 25 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.8-1
+- be sure that nocpulse home is correct after upgrade
+
+* Thu Mar 5 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.7-1
+- keep last 5 logs in logrotate
+
+* Wed Mar 4 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.6-1
+- 435203 - set /var/log/nocpulse writeable by apache user
+
+* Thu Feb 19 2009 Miroslav Suchý <msuchy at redhat.com> 2.1.5-1
+- 435415 - redirect nocops emails to root
+
+* Wed Jan 28 2009 Dennis Gilmore <dennis at ausil.us> 2.1.2-1
+- fix Requires so we need the perl version we built against
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Dec 10 2008 Miroslav Suchy <msuchy at redhat.com> 2.1.1-1
+- 474551 - obsolete nslogs and ConfigPusher-General
+- bump up version for 0.4 branch
* Tue Nov 4 2008 Miroslav Suchy <msuchy at redhat.com> 2.0.14-1
- 469708 - obsolete newer np-config
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nocpulse-common/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 4 Dec 2008 10:33:59 -0000 1.2
+++ sources 11 Feb 2010 13:39:10 -0000 1.3
@@ -1 +1 @@
-e8c0175db41fb1e34d11700b29e9689d nocpulse-common-2.0.14.tar.gz
+1a8cd6c124618e585ed250b3e2619488 nocpulse-common-2.1.19.tar.gz
More information about the scm-commits
mailing list