rpms/ntp/F-9 ntp-4.2.4p5-driftonexit.patch, NONE, 1.1 ntp-4.2.4p4-kernel.patch, 1.1, 1.2 ntp-4.2.4p4-resinit.patch, 1.1, 1.2 ntp.spec, 1.82, 1.83
Miroslav Lichvar
mlichvar at fedoraproject.org
Wed Oct 8 11:29:14 UTC 2008
Author: mlichvar
Update of /cvs/pkgs/rpms/ntp/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16131
Modified Files:
ntp-4.2.4p4-kernel.patch ntp-4.2.4p4-resinit.patch ntp.spec
Added Files:
ntp-4.2.4p5-driftonexit.patch
Log Message:
- don't write drift file upon exit
- run ntpq with full path in ntp-wait script
ntp-4.2.4p5-driftonexit.patch:
--- NEW FILE ntp-4.2.4p5-driftonexit.patch ---
diff -up ntp-4.2.4p5/ntpd/ntpd.c.driftonexit ntp-4.2.4p5/ntpd/ntpd.c
--- ntp-4.2.4p5/ntpd/ntpd.c.driftonexit 2008-10-07 15:22:27.000000000 +0200
+++ ntp-4.2.4p5/ntpd/ntpd.c 2008-10-07 16:29:06.000000000 +0200
@@ -1174,7 +1174,6 @@ finish(
{
msyslog(LOG_NOTICE, "ntpd exiting on signal %d", sig);
- write_stats();
#ifdef HAVE_DNSREGISTRATION
if (mdns != NULL)
DNSServiceRefDeallocate(mdns);
ntp-4.2.4p4-kernel.patch:
Index: ntp-4.2.4p4-kernel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-9/ntp-4.2.4p4-kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntp-4.2.4p4-kernel.patch 29 Feb 2008 14:54:31 -0000 1.1
+++ ntp-4.2.4p4-kernel.patch 8 Oct 2008 11:29:13 -0000 1.2
@@ -25,9 +25,12 @@
rval = 1;
if (fabs(fp_offset) > clock_max && clock_max > 0) {
switch (state) {
-@@ -895,7 +893,7 @@ loop_config(
+@@ -893,9 +891,9 @@ loop_config(
+ pll_control = 1;
+ memset(&ntv, 0, sizeof(ntv));
#ifdef STA_NANO
- ntv.modes = MOD_BITS | MOD_NANO;
+- ntv.modes = MOD_BITS | MOD_NANO;
++ ntv.modes = MOD_BITS | MOD_FREQUENCY | MOD_NANO;
#else /* STA_NANO */
- ntv.modes = MOD_BITS;
+ ntv.modes = MOD_BITS | MOD_FREQUENCY;
ntp-4.2.4p4-resinit.patch:
Index: ntp-4.2.4p4-resinit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-9/ntp-4.2.4p4-resinit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntp-4.2.4p4-resinit.patch 28 Jul 2008 11:06:59 -0000 1.1
+++ ntp-4.2.4p4-resinit.patch 8 Oct 2008 11:29:13 -0000 1.2
@@ -1,26 +1,6 @@
-diff -up ntp-4.2.4p4/ntpd/ntp_config.c.resinit ntp-4.2.4p4/ntpd/ntp_config.c
---- ntp-4.2.4p4/ntpd/ntp_config.c.resinit 2008-07-28 12:17:43.000000000 +0200
-+++ ntp-4.2.4p4/ntpd/ntp_config.c 2008-07-28 12:18:56.000000000 +0200
-@@ -18,6 +18,7 @@
- #include <ntp_random.h>
- #include <isc/net.h>
- #include <isc/result.h>
-+#include <resolv.h>
-
- #include <stdio.h>
- #include <ctype.h>
-@@ -2256,6 +2257,8 @@ getnetnum(
- ? ", ignored"
- : "");
- #endif
-+ if (retval == EAI_AGAIN)
-+ res_init();
- if (retval == 0 &&
- ptr->ai_family == AF_INET6 &&
- isc_net_probeipv6() != ISC_R_SUCCESS)
-diff -up ntp-4.2.4p4/ntpd/ntp_intres.c.resinit ntp-4.2.4p4/ntpd/ntp_intres.c
---- ntp-4.2.4p4/ntpd/ntp_intres.c.resinit 2007-01-23 10:05:57.000000000 +0100
-+++ ntp-4.2.4p4/ntpd/ntp_intres.c 2008-07-28 12:17:43.000000000 +0200
+diff -up ntp-4.2.4p5/ntpd/ntp_intres.c.resinit ntp-4.2.4p5/ntpd/ntp_intres.c
+--- ntp-4.2.4p5/ntpd/ntp_intres.c.resinit 2008-08-10 13:02:43.000000000 +0200
++++ ntp-4.2.4p5/ntpd/ntp_intres.c 2008-10-07 14:54:20.000000000 +0200
@@ -39,6 +39,7 @@
/**/
#include <netinet/in.h>
@@ -29,11 +9,11 @@
/**/
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h> /* MAXHOSTNAMELEN (often) */
-@@ -545,6 +546,7 @@ findhostaddr(
- switch (error)
- {
- case EAI_AGAIN:
+@@ -272,6 +273,7 @@ ntp_intres(void)
+ * Sleep a little to make sure the network is completely up
+ */
+ sleep(SLEEPTIME);
+ res_init();
- return (1);
- case EAI_NONAME:
- #ifndef FORCE_DNSRETRY
+ doconfigure(1);
+
+ /* prepare retry, in case there's more work to do */
Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/F-9/ntp.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- ntp.spec 29 Aug 2008 08:36:37 -0000 1.82
+++ ntp.spec 8 Oct 2008 11:29:13 -0000 1.83
@@ -1,7 +1,7 @@
Summary: The NTP daemon and utilities
Name: ntp
Version: 4.2.4p5
-Release: 1%{?dist}
+Release: 2%{?dist}
# primary license (COPYRIGHT) : MIT
# ElectricFence/ (not used) : GPLv2
# kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -39,30 +39,45 @@
Source8: ntp.cryptopw
Source9: ntpdate.sysconfig
+# ntpbz #628, #1073
Patch1: ntp-4.2.4p4-kernel.patch
Patch2: ntp-4.2.4p0-droproot.patch
+# ntpbz #812
Patch3: ntp-4.2.4-groups.patch
Patch5: ntp-4.2.4-linkfastmath.patch
Patch6: ntp-4.2.4p2-tentative.patch
+# ntpbz #897
Patch7: ntp-4.2.4p2-noseed.patch
+# ntpbz #830
Patch8: ntp-4.2.4p4-multilisten.patch
Patch9: ntp-4.2.4-html2man.patch
+# ntpbz #898
Patch10: ntp-4.2.4p5-htmldoc.patch
+# fixed in 4.2.5
Patch11: ntp-4.2.4p2-filegen.patch
+# ntpbz #738
Patch12: ntp-4.2.4-sprintf.patch
Patch13: ntp-4.2.4p4-bsdadv.patch
Patch14: ntp-4.2.4p5-mlock.patch
+# fixed in 4.2.5
Patch15: ntp-4.2.4p2-clockselect.patch
Patch16: ntp-4.2.4p2-nosntp.patch
+# ntpbz #802
Patch17: ntp-4.2.4p5-sleep.patch
+# ntpbz #779, #823
Patch18: ntp-4.2.4p5-bcast.patch
+# ntpbz #759
Patch19: ntp-4.2.4p0-retcode.patch
+# ntpbz #397
Patch20: ntp-4.2.4p2-noif.patch
Patch21: ntp-4.2.4p4-ipv6.patch
Patch22: ntp-4.2.4p4-cmsgalign.patch
Patch23: ntp-4.2.4p4-gettime.patch
Patch24: ntp-4.2.4p4-resinit.patch
+# ntpbz #992
Patch25: ntp-4.2.4p5-rtnetlink.patch
+# ntpbz #808
+Patch27: ntp-4.2.4p5-driftonexit.patch
URL: http://www.ntp.org
Requires(post): /sbin/chkconfig
@@ -127,6 +142,7 @@
%patch22 -p1 -b .cmsgalign
%patch24 -p1 -b .resinit
%patch25 -p1 -b .rtnetlink
+%patch27 -p1 -b .driftonexit
# clock_gettime needs -lrt
sed -i.gettime 's|^LIBS = @LIBS@|& -lrt|' ntp{d,q,dc,date}/Makefile.in
@@ -161,6 +177,7 @@
make %{?_smp_mflags}
sed -i 's|$ntpq = "ntpq"|$ntpq = "%{_sbindir}/ntpq"|' scripts/ntptrace
+sed -i 's|ntpq -c |%{_sbindir}/ntpq -c |' scripts/ntp-wait
pushd html
../scripts/html2man
@@ -288,6 +305,10 @@
%{_mandir}/man8/ntpdate.8*
%changelog
+* Wed Oct 08 2008 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p5-2.fc9
+- don't write drift file upon exit
+- run ntpq with full path in ntp-wait script
+
* Fri Aug 29 2008 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p5-1
- update to 4.2.4p5
- add support for fast interface updates
More information about the scm-commits
mailing list