From 47c21724f2d95b7eb7e28dcf84cefb60b7cf9ce6 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 09:29:24 +0000
Subject: auto-import changelog data from ntp-4.2.0.a.20040616-1.src.rpm

Fri Jul 23 2004 Harald Hoyer <harald@redhat.com> - 4.2.0.a.20040616-1
- new version ntp-stable-4.2.0a-20040616
- removed most patches

---

diff --git a/.cvsignore b/.cvsignore
index 1b8dc21..74f1d3e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-ntp-4.1.2-rh-manpages.tar.gz
-ntp-4.2.0.tar.gz
+ntp-4.2.0-rh-manpages.tar.gz
+ntp-stable-4.2.0a-20040616.tar.gz
 ntpstat-0.2.tgz
diff --git a/ntp.spec b/ntp.spec
index 959bea9..2a1f966 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -3,19 +3,21 @@
 %define glibc21 %([ "%glibc_version" = glibc-2.1 ] && echo 1 || echo 0)
 %define glibc22 %([ "%glibc_version" = glibc-2.2 ] && echo 1 || echo 0)
 
+%define tarversion stable-4.2.0a-20040616
+
 Summary: Synchronizes system time using the Network Time Protocol (NTP).
 Name: ntp
-Version: 4.2.0
-Release: 8
+Version: 4.2.0.a.20040616
+Release: 1
 License: distributable
 Group: System Environment/Daemons
-Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2.0.tar.gz
+Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-%{tarversion}.tar.gz
 Source1: ntp.conf
 Source2: ntp.keys
 Source3: ntpd.init
 Source4: ntpd.sysconfig
 Source5: ntpstat-0.2.tgz
-Source6: ntp-4.1.2-rh-manpages.tar.gz
+Source6: ntp-4.2.0-rh-manpages.tar.gz
 
 # new find-requires
 Source7: filter-requires-ntp.sh
@@ -23,19 +25,15 @@ Source7: filter-requires-ntp.sh
 
 Patch1: ntp-4.0.99j-vsnprintf.patch
 Patch3: ntp-4.0.99m-usegethost.patch
-#Patch4: ntp-4.0.99m-rc2-droproot.patch
-#Patch5: ntp-4.1.0-multi.patch
+
 Patch6: ntp-4.2.0-droproot.patch
-#Patch7: ntp-4.2.0-genkey.patch
-#Patch8: ntp-4.1.1a-genkey2.patch
-#Patch9: ntp-4.1.1a-mfp.patch
-#Patch10: ntp-4.1.1a-adjtime.patch
-#Patch11: ntp-4.1.1-slewwarning.patch
-Patch12: ntp-4.2.0-limit.patch
-Patch13: ntp-4.2.0-loopfilter.patch
+
+#Patch12: ntp-4.2.0-limit.patch
+#Patch13: ntp-4.2.0-loopfilter.patch
 Patch15: ntp-4.1.1c-rc3-authkey.patch
 Patch16: ntp-4.2.0-md5.patch
 Patch17: ntp-4.2.0-genkey3.patch
+
 Patch99: ntp-4.2.0-autofoo.patch
 
 URL: http://www.ntp.org
@@ -60,23 +58,17 @@ Install the ntp package if you need tools for keeping your system's
 time synchronized via the NTP protocol.
 
 %prep 
-%setup -q -a 5 -a 6
+%setup -q -n ntp-%{tarversion} -a 5 -a 6
 
-#%patch1 -p1 -b .vsnprintf
 %patch3 -p1 -b .usegethost
 %patch6 -p1 -b .droproot
-#%patch5 -p1 -b .multi
-#%patch7 -p1 -b .genkey
-#%patch8 -p1 -b .genkey2
-#%patch9 -p1 -b .mfp
-#%patch10 -p1 -b .adjtime
-#%patch11 -p1 -b .slewwarning
-%patch12 -p1 -b .limit
-%patch13 -p1 -b .loop
+#%patch12 -p1 -b .limit
+#%patch13 -p1 -b .loop
 %patch15 -p1 -b .authkey
 %patch16 -p1 -b .nomd5lib
 %patch17 -p1 -b .md5key
 #autoreconf -fi
+
 %patch99 -p1 -b .autofoo
 %build
 
@@ -89,7 +81,7 @@ if echo 'int main () { return 0; }' | gcc -pie -fPIE -O2 -xc - -o pietest 2>/dev
 	./pietest && export CFLAGS="$CFLAGS -pie -fPIE"
 	rm -f pietest
 fi
-%configure --sysconfdir=%{_sysconfdir}/ntp --bindir=%{_sbindir} --enable-all-clocks --enable-parse-clocks --with-openssl-libdir=%{_libdir}
+%configure --sysconfdir=%{_sysconfdir}/ntp --bindir=%{_sbindir} --enable-all-clocks --enable-parse-clocks --with-openssl-libdir=%{_libdir} --enable-linuxcaps
 unset CFLAGS
 %undefine	_target_platform
 
@@ -217,6 +209,10 @@ fi
 
 
 %changelog
+* Fri Jul 23 2004 Harald Hoyer <harald@redhat.com> - 4.2.0.a.20040616-1
+- new version ntp-stable-4.2.0a-20040616
+- removed most patches
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/ntpd.init b/ntpd.init
index 606dcbf..bdb32f6 100755
--- a/ntpd.init
+++ b/ntpd.init
@@ -52,18 +52,26 @@ start() {
 	OPTIND=0
 	dostep=''
 	dropstr=''
-	while getopts ":aAbc:dD:f:gk:l:LmnN:p:P:qr:s:t:v:V:xU:T:" args $OPTIONS;
+	while getopts ":46aAbc:dD:f:gk:l:LmnN:p:P:qr:s:t:v:V:xU:T:" args $OPTIONS;
 	do 
 	  if [ "$args" = "x" ]; then
 	      dostep='yes' 
 	  fi
           if [ "$args" = "U" ]; then
-	      dropstr="-U $OPTARG"
+        	# correct the options string
+		OPTIONS=$(echo $OPTIONS|sed -e 's#-U#-u#g')
+		echo "Please change -U to -u in /etc/sysconfig/ntpd"
+	  fi
+
+          if [ "$args" = "u" ]; then
+              dropstr="-U $OPTARG"
           fi
 
+
 	done
 	OPTIND=0
 
+
         # Open the firewall for ntp
 	if [ -n "$FWACTIVE" -a "$FIREWALL_MODS" != "no" ]; then
 	  for server in `echo $tickers $timeservers | tr ' ' '\n' | sort -u`; do
diff --git a/ntpd.sysconfig b/ntpd.sysconfig
index c3a24bb..7ab1a26 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 -p /var/run/ntpd.pid"
diff --git a/sources b/sources
index f012cf1..6cd5c2d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-432952298cbed396576d005d9041079c  ntp-4.1.2-rh-manpages.tar.gz
-0f8fabe87cf54f409b57c6283f0c0c3d  ntp-4.2.0.tar.gz
+6ef838e8f3a93efbea648d7b21881eb9  ntp-4.2.0-rh-manpages.tar.gz
+63fced45231c187cef513bfc86be405f  ntp-stable-4.2.0a-20040616.tar.gz
 6b2bedefe2e7c63ea52609b222022121  ntpstat-0.2.tgz