|
|
@@ -2,7 +2,7 @@
|
|
|
|
|
|
Summary: Synchronizes system time using the Network Time Protocol (NTP).
|
|
|
Name: ntp
|
|
|
-Version: 4.2.6p3
|
|
|
+Version: 4.2.6p5
|
|
|
Release: 2%{?_dist_release}
|
|
|
License: distributable
|
|
|
Group: System Environment/Daemons
|
|
|
@@ -20,7 +20,7 @@ Source999: filter-requires-ntp.sh
|
|
|
# ntpbz #802
|
|
|
Patch1: ntp-4.2.6p1-sleep.patch
|
|
|
# add support for dropping root to ntpdate
|
|
|
-Patch2: ntp-4.2.6p1-droproot.patch
|
|
|
+Patch2: ntp-4.2.6p4-droproot.patch
|
|
|
# ntpbz #779
|
|
|
Patch3: ntp-4.2.6p3-bcast.patch
|
|
|
# align buffer for control messages
|
|
|
@@ -28,31 +28,33 @@ 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
|
|
|
+# Patch6: ntp-4.2.6p5-tentative.patch
|
|
|
+# ntpbz #2294
|
|
|
+Patch6: ntp-4.2.6p5-fipsmd5.patch
|
|
|
# ntpbz #759
|
|
|
Patch7: ntp-4.2.6p1-retcode.patch
|
|
|
# ntpbz #992
|
|
|
-Patch8: ntp-4.2.6p3-rtnetlink.patch
|
|
|
+Patch8: ntp-4.2.6p4-rtnetlink.patch
|
|
|
# fix script used to generate man pages
|
|
|
-Patch9: ntp-4.2.6p2-html2man.patch
|
|
|
+# Patch9: ntp-4.2.6p2-html2man.patch
|
|
|
# ntpbz #898
|
|
|
-Patch10: ntp-4.2.6p2-htmldoc.patch
|
|
|
+Patch10: ntp-4.2.6p4-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
|
|
|
+Patch14: ntp-4.2.6p4-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
|
|
|
+# 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
|
|
|
+Patch18: ntp-4.2.6p5-delaycalib.patch
|
|
|
# ntpbz #1695
|
|
|
-Patch19: ntp-4.2.6p3-ntpdaterecv.patch
|
|
|
+# Patch19: ntp-4.2.6p5-ntpdaterecv.patch
|
|
|
|
|
|
# handle unknown clock types
|
|
|
Patch50: ntpstat-0.2-clksrc.patch
|
|
|
@@ -62,6 +64,8 @@ Patch51: ntpstat-0.2-multipacket.patch
|
|
|
Patch52: ntpstat-0.2-sysvars.patch
|
|
|
# print synchronization distance instead of dispersion
|
|
|
Patch53: ntpstat-0.2-maxerror.patch
|
|
|
+# fix error bit checking
|
|
|
+Patch54: ntpstat-0.2-errorbit.patch
|
|
|
|
|
|
# workaround fix for glibc headers
|
|
|
Patch60: ntp-4.2.x_MOD_NANO.patch
|
|
|
@@ -118,19 +122,20 @@ Distribution: Vine Linux
|
|
|
%ifarch ia64
|
|
|
# %patch5 -p1 -b .linkfastmath
|
|
|
%endif
|
|
|
-%patch6 -p1 -b .tentative
|
|
|
+# %patch6 -p1 -b .tentative
|
|
|
+%patch6 -p1 -b .fipsmd5
|
|
|
%patch7 -p1 -b .retcode
|
|
|
%patch8 -p1 -b .rtnetlink
|
|
|
-%patch9 -p1 -b .html2man
|
|
|
+# %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
|
|
|
+# %patch16 -p1 -b .nosyspeer
|
|
|
%patch17 -p1 -b .broadcastdelay
|
|
|
%patch18 -p1 -b .delaycalib
|
|
|
-%patch19 -p1 -b .ntpdaterecv
|
|
|
+# %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}
|
|
|
@@ -140,6 +145,7 @@ sed -i 's|/var/db/ntp-kod|%{_localstatedir}/lib/ntp/sntp-kod|' sntp/{sntp.1,main
|
|
|
%patch51 -p1 -b .multipacket
|
|
|
%patch52 -p1 -b .sysvars
|
|
|
%patch53 -p1 -b .maxerror
|
|
|
+%patch54 -p1 -b .errorbit
|
|
|
|
|
|
%patch60 -p0 -b .NANO
|
|
|
|
|
|
@@ -255,6 +261,11 @@ fi
|
|
|
%{_mandir}/man8/ntptrace.8*
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Nov 3 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.2.6p5-1
|
|
|
+- new upstream release
|
|
|
+- update patches from fc18
|
|
|
+- fix changelog typo....
|
|
|
+
|
|
|
* Sun Jan 16 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.2.6p3-2
|
|
|
- add config options to use openssl libs, readline libs
|
|
|
- add BR: libcap-devel, perl-HTML-Parser (Thanks to Take-san)
|
|
|
@@ -262,7 +273,7 @@ fi
|
|
|
* 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
|
|
|
+- perl scripts are separated 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)
|
iwamoto