From 5e94397137703565fc09069b879649be98f2382e Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 8 Jan 2015 17:24:58 +0100 Subject: [PATCH] - partial patches review: tentative,getprecision,broadcastdelay obsolete; mlock probably obsolete; logdefault updated --- ntp-4.2.4p7-getprecision.patch | 12 ------------ ntp-4.2.6p1-logdefault.patch | 12 ------------ ntp-4.2.6p1-tentative.patch | 23 ----------------------- ntp-4.2.6p3-broadcastdelay.patch | 31 ------------------------------- ntp-logdefault.patch | 11 +++++++++++ ntp.spec | 14 ++++---------- 6 files changed, 15 insertions(+), 88 deletions(-) delete mode 100644 ntp-4.2.4p7-getprecision.patch delete mode 100644 ntp-4.2.6p1-logdefault.patch delete mode 100644 ntp-4.2.6p1-tentative.patch delete mode 100644 ntp-4.2.6p3-broadcastdelay.patch create mode 100644 ntp-logdefault.patch diff --git a/ntp-4.2.4p7-getprecision.patch b/ntp-4.2.4p7-getprecision.patch deleted file mode 100644 index ecf6def..0000000 --- a/ntp-4.2.4p7-getprecision.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ntp-4.2.4p7/ntpd/ntp_proto.c.getprecision ntp-4.2.4p7/ntpd/ntp_proto.c ---- ntp-4.2.4p7/ntpd/ntp_proto.c.getprecision 2009-09-29 14:16:22.000000000 +0200 -+++ ntp-4.2.4p7/ntpd/ntp_proto.c 2009-09-29 14:18:13.000000000 +0200 -@@ -3099,7 +3099,7 @@ peer_unfit( - /* - * Find the precision of this particular machine - */ --#define MINSTEP 100e-9 /* minimum clock increment (s) */ -+#define MINSTEP 10e-9 /* minimum clock increment (s) */ - #define MAXSTEP 20e-3 /* maximum clock increment (s) */ - #define MINLOOPS 5 /* minimum number of step samples */ - diff --git a/ntp-4.2.6p1-logdefault.patch b/ntp-4.2.6p1-logdefault.patch deleted file mode 100644 index ae816b7..0000000 --- a/ntp-4.2.6p1-logdefault.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ntp-4.2.6p1/ntpd/ntp_config.c.logdefault ntp-4.2.6p1/ntpd/ntp_config.c ---- ntp-4.2.6p1/ntpd/ntp_config.c.logdefault 2010-01-24 11:01:45.000000000 +0100 -+++ ntp-4.2.6p1/ntpd/ntp_config.c 2010-03-09 17:44:09.000000000 +0100 -@@ -3794,7 +3794,7 @@ getconfig( - - #endif /* SYS_WINNT */ - res_fp = NULL; -- ntp_syslogmask = NLOG_SYNCMASK; /* set more via logconfig */ -+ ntp_syslogmask = NLOG_SYNCMASK | NLOG_EVENT | NLOG_STATUS; /* set more via logconfig */ - - /* - * install a non default variable with this daemon version diff --git a/ntp-4.2.6p1-tentative.patch b/ntp-4.2.6p1-tentative.patch deleted file mode 100644 index b4b7526..0000000 --- a/ntp-4.2.6p1-tentative.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up ntp-4.2.6p3/lib/isc/unix/interfaceiter.c.tentative ntp-4.2.6p3/lib/isc/unix/interfaceiter.c ---- ntp-4.2.6p3/lib/isc/unix/interfaceiter.c.tentative 2010-12-25 10:40:35.000000000 +0100 -+++ ntp-4.2.6p3/lib/isc/unix/interfaceiter.c 2011-01-05 17:49:44.429413622 +0100 -@@ -45,6 +45,8 @@ - #include - #include - -+#include -+ - /* Must follow . */ - #ifdef HAVE_NET_IF6_H - #include -@@ -253,6 +255,10 @@ linux_if_inet6_current(isc_interfaceiter - iter->current.flags |= INTERFACE_F_MULTICAST; - #endif - -+ /* ignore tentative address */ -+ if (flags & IFA_F_TENTATIVE) -+ iter->current.flags &= ~INTERFACE_F_UP; -+ - isc_netaddr_fromin6(&iter->current.address, &addr6); - iter->current.ifindex = ifindex; - if (isc_netaddr_islinklocal(&iter->current.address)) { diff --git a/ntp-4.2.6p3-broadcastdelay.patch b/ntp-4.2.6p3-broadcastdelay.patch deleted file mode 100644 index f9c1929..0000000 --- a/ntp-4.2.6p3-broadcastdelay.patch +++ /dev/null @@ -1,31 +0,0 @@ -==== ntpd/ntp_proto.c ==== -2010-10-22 01:55:45-04:00, stenn@deacon.udel.edu +2 -5 - [Bug 1670] Fix peer->bias and broadcastdelay - ---- 1.307/ntpd/ntp_proto.c 2010-10-11 21:06:05 -07:00 -+++ 1.308/ntpd/ntp_proto.c 2010-10-21 22:55:45 -07:00 -@@ -929,7 +929,6 @@ receive( - - } else { - peer->delay = sys_bdelay; -- peer->bias = -sys_bdelay / 2.; - } - break; - } -@@ -1570,7 +1569,6 @@ process_packet( - p_del = fabs(t21 - t34); - p_offset = (t21 + t34) / 2.; - } -- p_offset += peer->bias; - p_disp = LOGTOD(sys_precision) + LOGTOD(peer->precision) + - clock_phi * p_del; - -@@ -1647,7 +1645,7 @@ process_packet( - /* - * That was awesome. Now hand off to the clock filter. - */ -- clock_filter(peer, p_offset, p_del, p_disp); -+ clock_filter(peer, p_offset + peer->bias, p_del, p_disp); - - /* - * If we are in broadcast calibrate mode, return to broadcast diff --git a/ntp-logdefault.patch b/ntp-logdefault.patch new file mode 100644 index 0000000..8d6a5a8 --- /dev/null +++ b/ntp-logdefault.patch @@ -0,0 +1,11 @@ +--- ntp-4.2.8/ntpd/ntpd.c.orig 2014-12-19 12:58:06.000000000 +0100 ++++ ntp-4.2.8/ntpd/ntpd.c 2015-01-08 16:32:21.460203962 +0100 +@@ -477,7 +477,7 @@ ntpdmain( + || HAVE_OPT(SAVECONFIGQUIT)) + nofork = TRUE; + +- init_logging(progname, NLOG_SYNCMASK, TRUE); ++ init_logging(progname, NLOG_SYNCMASK | NLOG_EVENT | NLOG_STATUS, TRUE); + /* honor -l/--logfile option to log to a file */ + if (HAVE_OPT(LOGFILE)) { + logfilename = OPT_ARG(LOGFILE); diff --git a/ntp.spec b/ntp.spec index f4e740f..d2f5fb9 100644 --- a/ntp.spec +++ b/ntp.spec @@ -43,13 +43,10 @@ Patch102: %{name}-4.2.6p1-droproot.patch Patch103: %{name}-4.2.6p1-bcast.patch Patch104: %{name}-4.2.6p1-cmsgalign.patch Patch105: %{name}-4.2.6p1-linkfastmath.patch -Patch106: %{name}-4.2.6p1-tentative.patch Patch107: %{name}-4.2.6p1-retcode.patch Patch108: %{name}-4.2.6p1-rtnetlink.patch -Patch109: %{name}-4.2.4p7-getprecision.patch -Patch110: %{name}-4.2.6p1-logdefault.patch +Patch110: %{name}-logdefault.patch Patch111: %{name}-4.2.6p1-mlock.patch -Patch112: %{name}-4.2.6p3-broadcastdelay.patch URL: http://www.ntp.org/ BuildRequires: autoconf BuildRequires: autogen-devel @@ -274,18 +271,15 @@ Este pacote contém documentação adicional sobre o NTP versão 4. #%patch103 -p1 %patch104 -p1 %patch105 -p1 -#%patch106 -p1 looks like obsolete %patch107 -p1 %patch108 -p1 -#%patch109 -p1 upstream already decreased to 20e-9, not needed then? -#%patch110 -p1 -#%patch111 -p1 -#%patch112 -p1 +%patch110 -p1 +#%patch111 -p1 -- obsolete? echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> configure.ac echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> sntp/configure.ac -rm sntp/m4/{lt*,libtool}.m4 sntp/libevent/m4/{lt*,libtool}.m4 +%{__rm} sntp/m4/{lt*,libtool}.m4 sntp/libevent/m4/{lt*,libtool}.m4 %build %{__libtoolize} -- 2.44.0