ntp: new upstream release with openssl 1.0.0c

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2509 ec354946-7b23-47d6-9f5a-488ba84defc7

n/ntp/ntp-vl.spec

@@ -2,8 +2,8 @@
 
 Summary: Synchronizes system time using the Network Time Protocol (NTP).
 Name: ntp
-Version: 4.2.4p7
-Release: 3%{?_dist_release}
+Version: 4.2.6p3
+Release: 1%{?_dist_release}
 License: distributable
 Group: System Environment/Daemons
 URL: http://www.ntp.org/
@@ -12,21 +12,65 @@ Source1: ntp.conf
 Source2: ntp.keys
 Source3: ntpd.init
 Source4: ntpd.sysconfig
-Source5: ntpd-NM-dispatch
+Source5: ntpstat-0.2.tgz
 
-# Don't depend on perl modules
+Source100: ntpd-NM-dispatch
 Source999: filter-requires-ntp.sh
 
-#Patch0: ntp-4.0.99j-glibc22.patch
-#Patch1: ntp-4.1.2-vsnprintf.patch
-Patch3: ntp-4.0.99k23-usegethost.patch
-Patch4: ntp-4.2.0-config_crypto.patch
-Patch5: ntp-4.2.4p7-md5.patch
+# ntpbz #802
+Patch1: ntp-4.2.6p1-sleep.patch
+# add support for dropping root to ntpdate
+Patch2: ntp-4.2.6p1-droproot.patch
+# ntpbz #779
+Patch3: ntp-4.2.6p3-bcast.patch
+# align buffer for control messages
+Patch4: ntp-4.2.6p1-cmsgalign.patch
+# link ntpd with -ffast-math on ia64
+# Patch5: ntp-4.2.6p1-linkfastmath.patch
+# ntpbz #1134
+Patch6: ntp-4.2.6p3-tentative.patch
+# ntpbz #759
+Patch7: ntp-4.2.6p1-retcode.patch
+# ntpbz #992
+Patch8: ntp-4.2.6p3-rtnetlink.patch
+# fix script used to generate man pages
+Patch9: ntp-4.2.6p2-html2man.patch
+# ntpbz #898
+Patch10: ntp-4.2.6p2-htmldoc.patch
+# fix precision calculation on fast CPUs
+Patch12: ntp-4.2.4p7-getprecision.patch
+# ntpbz #1408
+Patch13: ntp-4.2.6p1-logdefault.patch
+# add option -m to lock memory
+Patch14: ntp-4.2.6p3-mlock.patch
+# allow -u and -p options to be used twice (#639101)
+Patch15: ntp-4.2.6p2-multiopts.patch
+# ntpbz #1554
+Patch16: ntp-4.2.6p3-nosyspeer.patch
+# ntpbz #1670
+Patch17: ntp-4.2.6p3-broadcastdelay.patch
+# ntpbz #1671
+Patch18: ntp-4.2.6p3-delaycalib.patch
+# ntpbz #1695
+Patch19: ntp-4.2.6p3-ntpdaterecv.patch
+
+# handle unknown clock types
+Patch50: ntpstat-0.2-clksrc.patch
+# process first packet in multipacket response
+Patch51: ntpstat-0.2-multipacket.patch
+# use current system variable names
+Patch52: ntpstat-0.2-sysvars.patch
+# print synchronization distance instead of dispersion
+Patch53: ntpstat-0.2-maxerror.patch
+
+# workaround fix for glibc headers
+Patch60: ntp-4.2.x_MOD_NANO.patch
 
 # security
 # Patch100: ntp-4.2.4_CVE-2009-0159.patch
 
-PreReq: /sbin/chkconfig
+Requires(pre): /sbin/chkconfig
+# PreReq: /sbin/chkconfig
 BuildRequires: openssl-devel, readline-devel
 BuildRequires: autoconf
 #Conflicts: xntp3
@@ -49,15 +93,48 @@ Install the ntp package if you need tools for keeping your system's
 time synchronized via the NTP protocol.
 #'
 
-%prep 
-%setup -q 
+%package perl
+Summary: NTP utilities written in perl
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description perl
+This package contains perl scripts ntp-wait and ntptrace.
 
-#%patch1 -p1 -b .vsnprintf
-%patch3 -p1 -b .usegethost
-%ifarch alpha
-%patch4 -p1 -b .config_crypto
+%prep 
+%setup -q -a 5
+
+%patch1 -p1 -b .sleep
+%patch2 -p1 -b .droproot
+%patch3 -p1 -b .bcast
+%patch4 -p1 -b .cmsgalign
+%ifarch ia64
+# %patch5 -p1 -b .linkfastmath
 %endif
-%patch5 -p1 -b .nomd5
+%patch6 -p1 -b .tentative
+%patch7 -p1 -b .retcode
+%patch8 -p1 -b .rtnetlink
+%patch9 -p1 -b .html2man
+%patch10 -p1 -b .htmldoc
+%patch12 -p1 -b .getprecision
+%patch13 -p1 -b .logdefault
+%patch14 -p1 -b .mlock
+%patch15 -p1 -b .multiopts
+%patch16 -p1 -b .nosyspeer
+%patch17 -p1 -b .broadcastdelay
+%patch18 -p1 -b .delaycalib
+%patch19 -p1 -b .ntpdaterecv
+
+# set default path to sntp KoD database
+sed -i 's|/var/db/ntp-kod|%{_localstatedir}/lib/ntp/sntp-kod|' sntp/{sntp.1,main.c}
+
+# ntpstat patches
+%patch50 -p1 -b .clksrc
+%patch51 -p1 -b .multipacket
+%patch52 -p1 -b .sysvars
+%patch53 -p1 -b .maxerror
+
+%patch60 -p0 -b .NANO
 
 # security
 # %patch100 -p1 -b .CVE-2009-0159
@@ -69,17 +146,25 @@ autoreconf -vfi
 # XXX work around for anal ntp configure
 %define	_target_platform	%{nil}
 #%configure
-CFLAGS="-g -DDEBUG" ./configure --prefix=/usr
+# CFLAGS="-g -DDEBUG" ./configure --prefix=/usr
+CFLAGS="-g" ./configure --prefix=/usr
 %undefine	_target_platform
 
 %__make %{?_smp_mflags}
+%__make %{?_smp_mflags} -C ntpstat-0.2 CFLAGS="$CFLAGS"
+
+pushd html
+../scripts/html2man
+# remove adjacent blank lines
+sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58]
+popd 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
 
-{ cd $RPM_BUILD_ROOT
+{ pushd $RPM_BUILD_ROOT
 
   mkdir -p .%{_sysconfdir}/{ntp,rc.d/init.d,sysconfig}
   mkdir -p .%{_sysconfdir}/NetworkManager/dispatcher.d
@@ -89,11 +174,24 @@ rm -rf $RPM_BUILD_ROOT
   touch .%{_sysconfdir}/ntp/step-tickers
   install -m755 $RPM_SOURCE_DIR/ntpd.init .%{_sysconfdir}/rc.d/init.d/ntpd
   install -m644 %{SOURCE4} .%{_sysconfdir}/sysconfig/ntpd
-  install -m755 %{SOURCE5} .%{_sysconfdir}/NetworkManager/dispatcher.d/06-ntpd
+  install -m755 %{SOURCE100} .%{_sysconfdir}/NetworkManager/dispatcher.d/06-ntpd
 
   strip .%{_bindir}/* || :
+  popd
 }
 
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
+pushd html/man/man8
+install -m 644 ntp-wait.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+install -m 644 ntptrace.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+popd
+
+pushd ntpstat-0.2
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m 755 ntpstat $RPM_BUILD_ROOT%{_bindir}
+install -m 644 ntpstat.1 $RPM_BUILD_ROOT%{_mandir}/man8/ntpstat.8
+popd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -115,7 +213,17 @@ fi
 %files
 %defattr(-,root,root)
 %doc html/* NEWS TODO 
-%{_bindir}/*
+
+%{_sbindir}/ntp-keygen
+%{_sbindir}/ntpd
+%{_sbindir}/ntpdate
+%{_sbindir}/ntpdc
+%{_sbindir}/ntpq
+%{_sbindir}/ntpstat
+%{_sbindir}/ntptime
+%{_sbindir}/sntp
+%{_sbindir}/tickadj
+
 %config				%{_sysconfdir}/rc.d/init.d/ntpd
 %config(noreplace)		%{_sysconfdir}/ntp.conf
 %dir				%{_sysconfdir}/ntp/
@@ -125,8 +233,24 @@ fi
 %config(noreplace)		%{_sysconfdir}/sysconfig/ntpd
 %{_sysconfdir}/NetworkManager/dispatcher.d/*
 %{_mandir}/man1/*
+%{_mandir}/man8/ntpstat*
+
+%files perl
+%defattr(-,root,root)
+%{_sbindir}/ntp-wait
+%{_sbindir}/ntptrace
+%{_mandir}/man8/ntp-wait.8*
+%{_mandir}/man8/ntptrace.8*
 
 %changelog
+* Sat Jan 15 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.2.6p3-1
+- new upstream release
+- built with openssl 1.0.0c
+- perl scripts are saparated to -perl package
+
+* Sat Dec 12 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.2.4p8-1
+- new upstream release with security fix (CVE-2009-3563)
+
 * Fri Aug 21 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.2.4p7-3
 - add NetworkManager/dispatcher.d/06-ntpd for NM
 - fix changelog typo...