rpms/ntp/devel ntp-4.2.4p2-clockselect.patch, NONE, 1.1 ntp-4.2.4p2-nosntp.patch, NONE, 1.1 ntp.spec, 1.71, 1.72

[Miroslav Lichvar (mlichvar)]

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8428

Modified Files:
	ntp.spec 
Added Files:
	ntp-4.2.4p2-clockselect.patch ntp-4.2.4p2-nosntp.patch 
Log Message:
- avoid use of uninitialized floating-point values in clock_select
- update license tag (Tom "spot" Callaway)
- drop sntp, MSNTP license is non-free


ntp-4.2.4p2-clockselect.patch:

--- NEW FILE ntp-4.2.4p2-clockselect.patch ---
--- ntp-4.2.4p2/ntpd/ntp_proto.c.clockselect	2007-08-16 16:40:46.000000000 +0200
+++ ntp-4.2.4p2/ntpd/ntp_proto.c	2007-08-16 16:31:32.000000000 +0200
@@ -2085,10 +2085,12 @@ clock_select(void)
 			typeacts->status = CTL_PST_SEL_DISTSYSPEER;
 			peer_list[0] = typeacts;
 			nlist = 1;
+			error[0] = synch[0] = 0.0;
 		} else if (typelocal != 0) {
 			typelocal->status = CTL_PST_SEL_DISTSYSPEER;
 			peer_list[0] = typelocal;
 			nlist = 1;
+			error[0] = synch[0] = 0.0;
 		} else {
 			if (osys_peer != NULL) {
 				NLOG(NLOG_SYNCSTATUS)

ntp-4.2.4p2-nosntp.patch:

--- NEW FILE ntp-4.2.4p2-nosntp.patch ---
--- ntp-4.2.4p2/Makefile.in.nosntp	2007-06-20 13:25:39.000000000 +0200
+++ ntp-4.2.4p2/Makefile.in	2007-08-21 14:58:49.000000000 +0200
@@ -215,7 +215,7 @@ ACLOCAL_AMFLAGS = -I m4 -I libopts/m4
 NULL = 
 SUBDIRS = $(am__append_1) scripts include ElectricFence @ARLIB_DIR@ \
 	libntp libparse ntpd ntpdate ntpdc ntpq parseutil adjtimed \
-	clockstuff kernel sntp util $(NULL)
+	clockstuff kernel util $(NULL)
 DIST_SUBDIRS = \
 	scripts		\
 	include		\
@@ -232,7 +232,6 @@ DIST_SUBDIRS = \
 	adjtimed	\
 	clockstuff	\
 	kernel		\
-	sntp		\
 	util		\
 	$(NULL)
 
--- ntp-4.2.4p2/configure.nosntp	2007-06-20 13:25:58.000000000 +0200
+++ ntp-4.2.4p2/configure	2007-08-21 14:58:34.000000000 +0200
@@ -53073,9 +53073,9 @@ _ACEOF
 
 
 
-ac_subdirs_all="$ac_subdirs_all sntp"
+ac_subdirs_all="$ac_subdirs_all"
 
-subdirs="$subdirs sntp"
+subdirs="$subdirs"
 
 
 cat >confcache <<\_ACEOF


Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ntp.spec	13 Aug 2007 13:00:10 -0000	1.71
+++ ntp.spec	21 Aug 2007 13:39:44 -0000	1.72
@@ -3,8 +3,21 @@
 Summary: Synchronizes system time using the Network Time Protocol (NTP)
 Name: ntp
 Version: 4.2.4p2
-Release: 4%{?dist}
-License: distributable
+Release: 5%{?dist}
+# primary license (COPYRIGHT) : MIT
+# ElectricFence/ (not used) : GPLv2
+# include/ntif.h : BSD
+# include/rsa_md5.h : BSD with advertising
+# libntp/md5c.c : BSD with advertising
+# libntp/adjtimex.c : BSD
+# libopts/ : BSD or GPLv2+
+# libparse/ : BSD
+# ntpd/refclock_jjy.c: MIT
+# ntpd/refclock_oncore.c: BEERWARE License (aka, Public Domain)
+# ntpstat-0.2/ : GPLv2
+# util/ansi2knr.c (not used) : GPL+
+# sntp/ (not packaged) : MSNTP
+License: (MIT and BSD and BSD with advertising) and GPLv2
 Group: System Environment/Daemons
 Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz
 Source1: ntp.conf
@@ -32,6 +45,8 @@
 Patch12: ntp-4.2.4-sprintf.patch
 Patch13: ntp-4.2.4p2-loopback.patch
 Patch14: ntp-4.2.4p2-mlock.patch
+Patch15: ntp-4.2.4p2-clockselect.patch
+Patch16: ntp-4.2.4p2-nosntp.patch
 Patch17: ntp-4.2.4p0-sleep.patch
 Patch18: ntp-4.2.4p0-bcast.patch
 Patch19: ntp-4.2.4p0-retcode.patch
@@ -73,6 +88,8 @@
 %patch12 -p1 -b .sprintf
 %patch13 -p1 -b .loopback
 %patch14 -p1 -b .mlock
+%patch15 -p1 -b .clockselect
+%patch16 -p1 -b .nosntp
 %patch17 -p1 -b .sleep
 %patch18 -p1 -b .bcast
 %patch19 -p1 -b .retcode
@@ -113,7 +130,6 @@
 make DESTDIR=$RPM_BUILD_ROOT bindir=%{_sbindir} install
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{5,8}
-mv $RPM_BUILD_ROOT%{_mandir}/man1/sntp.1 $RPM_BUILD_ROOT%{_mandir}/man8/sntp.8
 rm -rf $RPM_BUILD_ROOT%{_mandir}/man1
 
 pushd ntpstat-0.2
@@ -127,7 +143,8 @@
 cp -r html/man/man[58] $RPM_BUILD_ROOT%{_mandir}
 
 # prepare html documentation
-find html | egrep '\.(html|css|txt|jpg|gif)$' | grep -v '/build/' | cpio -pmd htmldoc
+find html | egrep '\.(html|css|txt|jpg|gif)$' | grep -v '/build/\|sntp' | \
+	cpio -pmd htmldoc
 find htmldoc -type f | xargs chmod 644
 find htmldoc -type d | xargs chmod 755
 
@@ -180,7 +197,6 @@
 %{_sbindir}/ntpdc
 %{_sbindir}/ntpq
 %{_sbindir}/ntptime
-%{_sbindir}/sntp
 %{_sbindir}/tickadj
 %{_initrddir}/ntpd
 %config(noreplace) %{_sysconfdir}/sysconfig/ntpd
@@ -198,6 +214,11 @@
 
 
 %changelog
+* Tue Aug 21 2007 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p2-5
+- avoid use of uninitialized floating-point values in clock_select
+- update license tag (Tom "spot" Callaway)
+- drop sntp, MSNTP license is non-free
+
 * Mon Aug 13 2007 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p2-4
 - allow loopback to share non-loopback address (#249226)
 - require readline >= 5.2-3 (#250917)