From ee9bcc89f4eb10460cd8a9c07e94f1c6e2030e85 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 09:30:31 +0000
Subject: auto-import changelog data from ntp-4.2.0.a.20040616-3.src.rpm

Tue Aug 17 2004 Harald Hoyer <harald@redhat.com> - 4.2.0.a.20040616-3
- added ntp-stable-4.2.0a-20040616-groups.patch (bug 130112)

---

diff --git a/ntp.conf b/ntp.conf
index 357fc4e..d83dc15 100644
--- a/ntp.conf
+++ b/ntp.conf
@@ -12,7 +12,7 @@ restrict 127.0.0.1
 # time service.  Do not permit those systems to modify the
 # configuration of this service.  Also, do not use those
 # systems as peers for synchronization.
-# restrict 192.168.1.0 mask 255.255.255.0 notrust nomodify notrap
+# restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap
 
 
 # --- OUR TIMESERVERS ----- 
@@ -27,8 +27,8 @@ restrict 127.0.0.1
 
 # --- NTP MULTICASTCLIENT ---
 #multicastclient			# listen on default 224.0.1.1
-# restrict 224.0.1.1 mask 255.255.255.255 notrust nomodify notrap
-# restrict 192.168.1.0 mask 255.255.255.0 notrust nomodify notrap
+# restrict 224.0.1.1 mask 255.255.255.255 nomodify notrap
+# restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap
 
 
 
@@ -58,13 +58,6 @@ driftfile /var/lib/ntp/drift
 broadcastdelay	0.008
 
 #
-# Authentication delay.  If you use, or plan to use someday, the
-# authentication facility you should make the programs in the auth_stuff
-# directory and figure out what this number should be on your machine.
-#
-authenticate yes
-
-#
 # Keys file.  If you want to diddle your server at run time, make a
 # keys file (mode 600 for sure) and define the key number to be
 # used for making requests.
diff --git a/ntp.spec b/ntp.spec
index 3f7bf97..251ba27 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -8,7 +8,7 @@
 Summary: Synchronizes system time using the Network Time Protocol (NTP).
 Name: ntp
 Version: 4.2.0.a.20040616
-Release: 2
+Release: 3
 License: distributable
 Group: System Environment/Daemons
 Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-%{tarversion}.tar.gz
@@ -27,6 +27,7 @@ Patch1: ntp-4.0.99j-vsnprintf.patch
 Patch3: ntp-4.0.99m-usegethost.patch
 
 Patch6: ntp-4.2.0-droproot.patch
+Patch7: ntp-stable-4.2.0a-20040616-groups.patch
 
 #Patch12: ntp-4.2.0-limit.patch
 #Patch13: ntp-4.2.0-loopfilter.patch
@@ -62,6 +63,7 @@ time synchronized via the NTP protocol.
 
 %patch3 -p1 -b .usegethost
 %patch6 -p1 -b .droproot
+%patch7 -p1 -b .groups
 #%patch12 -p1 -b .limit
 #%patch13 -p1 -b .loop
 %patch15 -p1 -b .authkey
@@ -209,6 +211,9 @@ fi
 
 
 %changelog
+* Tue Aug 17 2004 Harald Hoyer <harald@redhat.com> - 4.2.0.a.20040616-3
+- added ntp-stable-4.2.0a-20040616-groups.patch (bug 130112)
+
 * Thu Jul 29 2004 Harald Hoyer <harald@redhat.com> - 4.2.0.a.20040616-2
 - take chroot in account (bug 127252)
 
diff --git a/ntpd.init b/ntpd.init
index 6438d23..42a9905 100755
--- a/ntpd.init
+++ b/ntpd.init
@@ -66,7 +66,7 @@ readconf() {
           if [ "$args" = "U" ]; then
         	# correct the options string
 		OPTIONS=$(echo $OPTIONS|sed -e 's#-U#-u#g')
-		echo "Please change -U to -u in /etc/sysconfig/ntpd"
+		echo "Please change '-U ntp' to '-u ntp' in /etc/sysconfig/ntpd"
 	  fi
 
           if [ "$args" = "u" ]; then
diff --git a/ntpd.sysconfig b/ntpd.sysconfig
index 7ab1a26..d1bfa0d 100644
--- a/ntpd.sysconfig
+++ b/ntpd.sysconfig
@@ -1,2 +1,2 @@
 # Drop root to id 'ntp:ntp' by default.  Requires kernel >= 2.2.18.
-OPTIONS="-u ntp -p /var/run/ntpd.pid"
+OPTIONS="-u ntp:ntp -p /var/run/ntpd.pid"