packages: ntp/ntp.conf, ntp/ntp.spec - move drift to ntp user writable /var...

[glen]

Author: glen                         Date: Fri Jan 29 07:42:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move drift to ntp user writable /var/lib/ntp

---- Files affected:
packages/ntp:
   ntp.conf (1.11 -> 1.12) , ntp.spec (1.121 -> 1.122) 

---- Diffs:

================================================================
Index: packages/ntp/ntp.conf
diff -u packages/ntp/ntp.conf:1.11 packages/ntp/ntp.conf:1.12
--- packages/ntp/ntp.conf:1.11	Mon Jan 25 09:35:31 2010
+++ packages/ntp/ntp.conf	Fri Jan 29 08:41:57 2010
@@ -40,7 +40,7 @@
 # by creating a temporary in the same directory and then rename()'ing
 # it to the file.
 #
-driftfile /etc/ntp/drift
+driftfile /var/lib/ntp/drift
 multicastclient			# listen on default 224.0.1.1
 broadcastdelay	0.008
 

================================================================
Index: packages/ntp/ntp.spec
diff -u packages/ntp/ntp.spec:1.121 packages/ntp/ntp.spec:1.122
--- packages/ntp/ntp.spec:1.121	Mon Jan 25 09:32:01 2010
+++ packages/ntp/ntp.spec	Fri Jan 29 08:41:57 2010
@@ -5,7 +5,7 @@
 Summary(pt_BR.UTF-8):	Network Time Protocol versão 4
 Name:		ntp
 Version:	4.2.4p8
-Release:	3.6
+Release:	3.14
 License:	distributable
 Group:		Daemons
 Source0:	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
@@ -265,9 +265,12 @@
 cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/ntpdate
 cp -a man/*.1  $RPM_BUILD_ROOT%{_mandir}/man1
 
+install -d $RPM_BUILD_ROOT/var/lib/ntp
+touch $RPM_BUILD_ROOT/var/lib/ntp/drift
+
 cat > $RPM_BUILD_ROOT/etc/cron.hourly/ntpdate <<'EOF'
 #!/bin/sh
-/sbin/service ntpdate cronsettime
+exec /sbin/service ntpdate cronsettime
 EOF
 
 %clean
@@ -285,7 +288,7 @@
 if [ "$1" = "0" ]; then
 	%service ntpd stop
 	/sbin/chkconfig --del ntpd
-	rm -f %{_sysconfdir}/drift
+	rm -f /var/lib/ntp/drift
 fi
 
 %postun -n ntp
@@ -314,7 +317,18 @@
 	%groupremove ntp
 fi
 
+%triggerpostun -n ntpd -- ntpd < 4.2.4p8-3.14
+sed -i -e 's,/etc/ntp/drift,/var/lib/ntp/drift,' %{_sysconfdir}/ntp.conf
+mv -f /etc/ntp/ntp.drift /var/lib/ntp/drift
+mv -f /etc/ntp/drift /var/lib/ntp/drift
+%service -q ntpd restart
+
 %triggerpostun -n ntpd -- ntp < 4.2.4p8-3.1
+sed -i -e 's,/etc/ntp/drift,/var/lib/ntp/drift,' %{_sysconfdir}/ntp.conf
+mv -f /etc/ntp/ntp.drift /var/lib/ntp/drift
+mv -f /etc/ntp/drift /var/lib/ntp/drift
+%service -q ntpd restart
+
 %triggerpostun -n ntpdate -- ntp-client < 4.2.4p8-3.2
 if [ -f /etc/sysconfig/ntp.rpmsave ]; then
 	cp -f /etc/sysconfig/ntpdate{,.rpmnew}
@@ -343,6 +357,9 @@
 %{_mandir}/man1/ntptime.1*
 %{_mandir}/man1/sntp.1*
 
+%dir %attr(770,root,ntp) /var/lib/ntp
+%attr(640,ntp,ntp) %ghost /var/lib/ntp/drift
+
 %files -n ntpdate
 %defattr(644,root,root,755)
 %doc COPYRIGHT
@@ -368,6 +385,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.122  2010/01/29 07:41:57  glen
+- move drift to ntp user writable /var/lib/ntp
+
 Revision 1.121  2010/01/25 08:32:01  glen
 - allow ntpq -p to work by default from localhost
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp.conf?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp.spec?r1=1.121&r2=1.122&f=u