-diff -up ntp-4.2.6p1/html/ntpd.html.mlock ntp-4.2.6p1/html/ntpd.html
---- ntp-4.2.6p1/html/ntpd.html.mlock 2010-03-04 16:06:38.000000000 +0100
-+++ ntp-4.2.6p1/html/ntpd.html 2010-03-04 16:07:42.000000000 +0100
+diff -up ntp-4.2.6p3/html/ntpd.html.mlock ntp-4.2.6p3/html/ntpd.html
+--- ntp-4.2.6p3/html/ntpd.html.mlock 2011-01-05 17:51:36.242120783 +0100
++++ ntp-4.2.6p3/html/ntpd.html 2011-01-05 17:51:36.254121258 +0100
@@ -32,7 +32,7 @@
</ul>
<hr>
<dt><tt>-n</tt></dt>
<dd>Don't fork.</dd>
<dt><tt>-N</tt></dt>
-diff -up ntp-4.2.6p1/ntpd/ntpd-opts.c.mlock ntp-4.2.6p1/ntpd/ntpd-opts.c
---- ntp-4.2.6p1/ntpd/ntpd-opts.c.mlock 2010-02-09 11:27:18.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntpd-opts.c 2010-03-04 16:09:12.000000000 +0100
-@@ -9,7 +9,7 @@
- */
-
- /*
-- * This file was produced by an AutoOpts template. AutoOpts is a
-+ * This file was produced by an AutoOpts template. AutoOpts is
- * copyrighted work. This source file is not encumbered by AutoOpts
- * licensing, but is provided under the licensing terms chosen by the
- * ntpd author or copyright holder. AutoOpts is licensed under
-@@ -284,6 +284,15 @@ tSCC zNice_Name[] = "ni
+diff -up ntp-4.2.6p3/ntpd/ntpd-opts.c.mlock ntp-4.2.6p3/ntpd/ntpd-opts.c
+--- ntp-4.2.6p3/ntpd/ntpd-opts.c.mlock 2011-01-04 03:15:35.000000000 +0100
++++ ntp-4.2.6p3/ntpd/ntpd-opts.c 2011-01-05 17:55:01.609260787 +0100
+@@ -282,6 +282,15 @@ static char const zNice_Name[]
#define NICE_FLAGS (OPTST_DISABLED)
/*
+ * Mlock option description:
+ */
-+tSCC zMlockText[] =
++static char const zMlockText[] =
+ "Lock memory";
-+tSCC zMlock_NAME[] = "MLOCK";
-+tSCC zMlock_Name[] = "mlock";
++static char const zMlock_NAME[] = "MLOCK";
++static char const zMlock_Name[] = "mlock";
+#define MLOCK_FLAGS (OPTST_DISABLED)
+
+/*
* Pidfile option description:
*/
- tSCC zPidfileText[] =
-@@ -911,6 +920,18 @@ static tOptDesc optDesc[ OPTION_CT ] = {
+ static char const zPidfileText[] =
+@@ -909,6 +918,18 @@ static tOptDesc optDesc[ OPTION_CT ] = {
/* desc, NAME, name */ zPccfreqText, zPccfreq_NAME, zPccfreq_Name,
/* disablement strs */ NULL, NULL },
{ /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
/* equiv idx value */ NO_EQUIVALENT, 0,
/* equivalenced to */ NO_EQUIVALENT,
-@@ -1005,7 +1026,7 @@ tOptions ntpdOptions = {
+@@ -1008,7 +1029,7 @@ tOptions ntpdOptions = {
NO_EQUIVALENT, /* '-#' option index */
NO_EQUIVALENT /* index of default opt */
},
- 35 /* full option count */, 32 /* user option count */,
+ 36 /* full option count */, 33 /* user option count */,
ntpd_full_usage, ntpd_short_usage,
- NULL, NULL
- };
-diff -up ntp-4.2.6p1/ntpd/ntpd-opts.h.mlock ntp-4.2.6p1/ntpd/ntpd-opts.h
---- ntp-4.2.6p1/ntpd/ntpd-opts.h.mlock 2010-02-09 11:27:18.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntpd-opts.h 2010-03-04 16:10:16.000000000 +0100
-@@ -84,12 +84,13 @@ typedef enum {
- INDEX_OPT_SLEW = 29,
- INDEX_OPT_USEPCC = 30,
- INDEX_OPT_PCCFREQ = 31,
+ NULL, NULL,
+ PKGDATADIR
+diff -up ntp-4.2.6p3/ntpd/ntpd-opts.h.mlock ntp-4.2.6p3/ntpd/ntpd-opts.h
+--- ntp-4.2.6p3/ntpd/ntpd-opts.h.mlock 2011-01-04 03:15:35.000000000 +0100
++++ ntp-4.2.6p3/ntpd/ntpd-opts.h 2011-01-05 17:51:36.256121337 +0100
+@@ -82,6 +82,7 @@ typedef enum {
- INDEX_OPT_VERSION = 32,
- INDEX_OPT_HELP = 33,
- INDEX_OPT_MORE_HELP = 34
-#define OPTION_CT 35
+#define OPTION_CT 36
- #define NTPD_VERSION "4.2.6p1"
- #define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.6p1"
-
-@@ -182,6 +183,10 @@ typedef enum {
+@@ -189,6 +190,10 @@ typedef enum {
# warning undefining MODIFYMMTIMER due to option name conflict
# undef MODIFYMMTIMER
# endif
# ifdef NOFORK
# warning undefining NOFORK due to option name conflict
# undef NOFORK
-@@ -263,6 +268,7 @@ typedef enum {
+@@ -270,6 +275,7 @@ typedef enum {
# undef LOGFILE
# undef NOVIRTUALIPS
# undef MODIFYMMTIMER
# undef NOFORK
# undef NICE
# undef PIDFILE
-@@ -301,6 +307,7 @@ typedef enum {
+@@ -308,6 +314,7 @@ typedef enum {
#define VALUE_OPT_LOGFILE 'l'
#define VALUE_OPT_NOVIRTUALIPS 'L'
#define VALUE_OPT_MODIFYMMTIMER 'M'
#define VALUE_OPT_NOFORK 'n'
#define VALUE_OPT_NICE 'N'
#define VALUE_OPT_PIDFILE 'p'
-diff -up ntp-4.2.6p1/ntpd/ntpd.c.mlock ntp-4.2.6p1/ntpd/ntpd.c
---- ntp-4.2.6p1/ntpd/ntpd.c.mlock 2010-02-09 11:02:27.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntpd.c 2010-03-04 16:11:42.000000000 +0100
-@@ -724,7 +724,8 @@ ntpdmain(
+diff -up ntp-4.2.6p3/ntpd/ntpd.c.mlock ntp-4.2.6p3/ntpd/ntpd.c
+--- ntp-4.2.6p3/ntpd/ntpd.c.mlock 2011-01-05 17:51:36.191118761 +0100
++++ ntp-4.2.6p3/ntpd/ntpd.c 2011-01-05 17:51:36.257121377 +0100
+@@ -723,7 +723,8 @@ ntpdmain(
}
#endif
# ifdef HAVE_SETRLIMIT
/*
* Set the stack limit to something smaller, so that we don't lock a lot
-@@ -750,7 +751,7 @@ ntpdmain(
+@@ -749,7 +750,7 @@ ntpdmain(
* fail if we drop root privlege. To be useful the value
* has to be larger than the largest ntpd resident set size.
*/
if (setrlimit(RLIMIT_MEMLOCK, &rl) == -1) {
msyslog(LOG_ERR, "Cannot set RLIMIT_MEMLOCK: %m");
}
-@@ -762,6 +763,7 @@ ntpdmain(
+@@ -761,6 +762,7 @@ ntpdmain(
*/
if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0)
msyslog(LOG_ERR, "mlockall(): %m");
-diff -up ntp-4.2.6p1/configure.rtnetlink ntp-4.2.6p1/configure
---- ntp-4.2.6p1/configure.rtnetlink 2010-02-09 11:19:49.000000000 +0100
-+++ ntp-4.2.6p1/configure 2010-03-04 17:11:50.000000000 +0100
-@@ -20579,6 +20579,7 @@ else
+diff -up ntp-4.2.6p3/configure.rtnetlink ntp-4.2.6p3/configure
+--- ntp-4.2.6p3/configure.rtnetlink 2011-01-04 03:03:47.000000000 +0100
++++ ntp-4.2.6p3/configure 2011-01-05 17:39:29.342985208 +0100
+@@ -25858,6 +25858,7 @@ else
/* end confdefs.h. */
- #include <stddef.h>
-+#include <sys/socket.h>
- #include <linux/rtnetlink.h>
+ #include <stddef.h>
++ #include <sys/socket.h>
+ #include <linux/rtnetlink.h>
+
int
- main ()
-diff -up ntp-4.2.6p1/ntpd/ntp_io.c.rtnetlink ntp-4.2.6p1/ntpd/ntp_io.c
---- ntp-4.2.6p1/ntpd/ntp_io.c.rtnetlink 2009-12-09 08:36:37.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntp_io.c 2010-03-04 17:11:32.000000000 +0100
-@@ -4304,10 +4304,7 @@ init_async_notifications()
+diff -up ntp-4.2.6p3/ntpd/ntp_io.c.rtnetlink ntp-4.2.6p3/ntpd/ntp_io.c
+--- ntp-4.2.6p3/ntpd/ntp_io.c.rtnetlink 2011-01-05 16:03:19.328001089 +0100
++++ ntp-4.2.6p3/ntpd/ntp_io.c 2011-01-05 16:03:19.349001911 +0100
+@@ -4549,10 +4549,7 @@ init_async_notifications()
#ifdef HAVE_RTNETLINK
memset(&sa, 0, sizeof(sa));
sa.nl_family = PF_NETLINK;
-diff -up ntp-4.2.6p1/lib/isc/unix/interfaceiter.c.tentative ntp-4.2.6p1/lib/isc/unix/interfaceiter.c
---- ntp-4.2.6p1/lib/isc/unix/interfaceiter.c.tentative 2009-12-09 08:36:35.000000000 +0100
-+++ ntp-4.2.6p1/lib/isc/unix/interfaceiter.c 2010-03-04 17:50:17.000000000 +0100
+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 <isc/types.h>
#include <isc/util.h>
/* Must follow <isc/net.h>. */
#ifdef HAVE_NET_IF6_H
#include <net/if6.h>
-@@ -223,6 +225,11 @@ linux_if_inet6_current(isc_interfaceiter
- }
- iter->current.af = AF_INET6;
- iter->current.flags = INTERFACE_F_UP;
-+
+@@ -253,6 +255,10 @@ linux_if_inet6_current(isc_interfaceiter
+ iter->current.flags |= INTERFACE_F_MULTICAST;
+ #endif
+
+ /* ignore tentative address */
-+ if (flag4 & IFA_F_TENTATIVE)
++ 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)) {
- isc_netaddr_setzone(&iter->current.address,
--- /dev/null
+==== 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
--- /dev/null
+diff -up ntp-4.2.6p3/ntpd/ntp_proto.c.delaycalib ntp-4.2.6p3/ntpd/ntp_proto.c
+--- ntp-4.2.6p3/ntpd/ntp_proto.c.delaycalib 2010-11-25 15:21:52.578492466 +0100
++++ ntp-4.2.6p3/ntpd/ntp_proto.c 2010-11-25 15:21:55.987625500 +0100
+@@ -1498,7 +1498,7 @@ process_packet(
+ */
+ if (peer->cast_flags & MDF_BCLNT) {
+ peer->cast_flags &= ~MDF_BCLNT;
+- peer->delay = (peer->offset - p_offset) * 2;
++ peer->delay = fabs(peer->offset - p_offset) * 2;
+ }
+ p_del = peer->delay;
+ p_offset += p_del / 2;
--- /dev/null
+==== ntpd/ntp_proto.c ====
+2010-09-30 00:43:09-04:00, stenn@deacon.udel.edu +10 -3
+ [Bug 1554]: peer may stay selected as system peer after becoming
+ unreachable.
+
+--- 1.303/ntpd/ntp_proto.c 2010-09-25 10:39:41 -07:00
++++ 1.304/ntpd/ntp_proto.c 2010-09-29 21:43:09 -07:00
+@@ -2187,8 +2187,10 @@ clock_filter(
+ * save the offset, delay and jitter. Note the jitter must not
+ * be less than the precision.
+ */
+- if (m == 0)
++ if (m == 0) {
++ clock_select();
+ return;
++ }
+
+ etemp = fabs(peer->offset - peer->filter_offset[k]);
+ peer->offset = peer->filter_offset[k];
--- /dev/null
+diff -up ntp-4.2.6p3/ntpdate/ntpdate.c.ntpdaterecv ntp-4.2.6p3/ntpdate/ntpdate.c
+--- ntp-4.2.6p3/ntpdate/ntpdate.c.ntpdaterecv 2010-11-25 15:18:01.669483673 +0100
++++ ntp-4.2.6p3/ntpdate/ntpdate.c 2010-11-25 15:18:01.720485666 +0100
+@@ -1042,6 +1042,17 @@ receive(
+ * Shift this data in, then schedule another transmit.
+ */
+ server_data(server, (s_fp) di, &ci, 0);
++
++ if ((int)server->filter_nextpt >= sys_samples) {
++ /*
++ * Got all the data we need. Mark this guy
++ * completed and return.
++ */
++ server->event_time = 0;
++ complete_servers++;
++ return;
++ }
++
+ server->event_time = current_time + sys_timeout;
+ }
+
diff -ur ntp-4.1.1a.orig/configure.ac ntp-4.1.1a/configure.ac
--- ntp-4.1.1a.orig/configure.ac Thu Mar 28 23:42:00 2002
+++ ntp-4.1.1a/configure.ac Thu Nov 21 11:56:41 2002
-@@ -512,9 +512,9 @@
- case "$ac_cv_func___adjtimex" in
- yes) ;;
+@@ -687,9 +687,9 @@
+ yes)
+ ;;
*)
-- AC_CHECK_LIB(elf, nlist) dnl Only needed for tickadj...
-+ #AC_CHECK_LIB(elf, nlist) dnl Only needed for tickadj...
+- AC_CHECK_LIB([elf], [nlist]) dnl Only needed for tickadj...
++ #AC_CHECK_LIB([elf], [nlist]) dnl Only needed for tickadj...
dnl AC_CHECK_LIB(kvm, main, , , -lelf)
-- AC_CHECK_LIB(kvm, main) dnl We already know about -lelf here...
-+ #AC_CHECK_LIB(kvm, main) dnl We already know about -lelf here...
- AC_CHECK_LIB(ld, nlist)
- AC_CHECK_LIB(mld, nlist)
- AC_CHECK_HEADER(nlist.h,
-
+- AC_CHECK_LIB([kvm], [main]) dnl We already know about -lelf here...
++ #AC_CHECK_LIB([kvm], [main]) dnl We already know about -lelf here...
+ AC_CHECK_LIB([ld], [nlist])
+ AC_CHECK_LIB([mld], [nlist])
+ AC_CHECK_HEADERS([nlist.h sys/var.h])
+++ /dev/null
---- ntp-4.2.6p1/ntpdc/Makefile.am.orig 2010-01-24 11:01:48.000000000 +0100
-+++ ntp-4.2.6p1/ntpdc/Makefile.am 2010-05-24 20:59:08.000000000 +0200
-@@ -14,8 +14,8 @@
- -I$(top_srcdir)/lib/isc/nothreads/include \
- -I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
- # LDADD might need RESLIB and ADJLIB
--ntpdc_LDADD= version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
-- ../libntp/libntp.a @LCRYPTO@
-+ntpdc_LDADD= version.o $(LIBOPTS_LDADD) \
-+ ../libntp/libntp.a @LCRYPTO@ @EDITLINE_LIBS@
- # ntpdc-layout doesn't need any additional libraries at all
- ntpdc_layout_LDADD=
- DISTCLEANFILES= .version version.c
---- ntp-4.2.6p1/ntpq/Makefile.am~ 2010-01-24 11:01:47.000000000 +0100
-+++ ntp-4.2.6p1/ntpq/Makefile.am 2010-05-24 21:06:30.000000000 +0200
-@@ -12,8 +12,8 @@
- -I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
-
- # LDADD might need RESLIB and ADJLIB
--ntpq_LDADD= version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
-- ../libntp/libntp.a @LCRYPTO@
-+ntpq_LDADD= version.o $(LIBOPTS_LDADD) \
-+ ../libntp/libntp.a @EDITLINE_LIBS@ @LCRYPTO@
- noinst_HEADERS= ntpq.h
- noinst_LIBRARIES= libntpq.a
- libntpq_a_CFLAGS= -DNO_MAIN_ALLOWED -DBUILD_AS_LIB
+++ /dev/null
-diff -dur -x '*.orig' ntp-4.2.6p1.orig/configure.ac ntp-4.2.6p1/configure.ac
---- ntp-4.2.6p1.orig/configure.ac 2010-05-24 20:26:21.000000000 +0200
-+++ ntp-4.2.6p1/configure.ac 2010-05-24 20:32:57.000000000 +0200
-@@ -3247,7 +3247,6 @@
- AC_SUBST(OPENSSL_INC)
- AC_SUBST(OPENSSL_LIB)
-
--AC_MSG_CHECKING([for openssl library directory])
- AC_ARG_WITH(openssl-libdir,
- AC_HELP_STRING([--with-openssl-libdir], [+ =/something/reasonable]),
- [ans=$withval],
-@@ -3257,39 +3256,14 @@
- esac])
- case "$ans" in
- no) ;;
-- yes) # Look in:
-- ans="/usr/lib /usr/lib/openssl /usr/sfw/lib /usr/local/lib /usr/local/ssl/lib /lib"
-- ;;
-- *) # Look where they said
-- ;;
--esac
--case "$ans" in
-- no) ;;
-- *) # Look for libcrypto.a and libssl.a:
-- for i in $ans no
-- do
-- case "$host" in
-- *-*-darwin*)
-- test -f $i/libcrypto.dylib -a -f $i/libssl.dylib && break
-- ;;
-- *)
-- test -f $i/libcrypto.so -a -f $i/libssl.so && break
-- test -f $i/libcrypto.a -a -f $i/libssl.a && break
-- ;;
-- esac
-- done
-- case "$i" in
-- no)
-- ans=no
-- OPENSSL_LIB=
-- ;;
-- *) ans=$i
-- OPENSSL_LIB=$ans
-- ;;
-- esac
-- ;;
-+ *)
-+ if test "$ans" != "yes" ; then
-+ LDFLAGS="$LDFLAGS -L$ans"
-+ fi
-+ AC_CHECK_LIB([crypto],[DES_crypt],[AC_SUBST(LCRYPTO,[-lcrypto])])
-+ AC_CHECK_LIB([ssl],[SSL_CTX_new],[AC_SUBST(LSSL,[-lssl])])
-+ ;;
- esac
--AC_MSG_RESULT([$ans])
-
- AC_MSG_CHECKING([for openssl include directory])
- AC_ARG_WITH(openssl-incdir,
-@@ -3301,14 +3275,6 @@
- esac])
- case "$ans" in
- no) ;;
-- yes) # look in:
-- ans="/usr/include /usr/sfw/include /usr/local/include /usr/local/ssl/include"
-- ;;
-- *) # Look where they said
-- ;;
--esac
--case "$ans" in
-- no) ;;
- *) # look for openssl/opensslconf.h:
- for i in $ans no
- do
-@@ -3335,7 +3301,7 @@
- no)
- ;;
- yes|openssl)
-- if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INC"
-+ if test -z "$LCRYPTO" -o -z "$OPENSSL_INC"
- then
- ans=no
- else
-@@ -3349,11 +3315,9 @@
- yes)
- # We have OpenSSL inc/lib - use them.
- CPPFLAGS="$CPPFLAGS -I$OPENSSL_INC"
-- LDFLAGS="$LDFLAGS -L$OPENSSL_LIB"
- case "$need_dash_r" in
- 1) LDFLAGS="$LDFLAGS -R$OPENSSL_LIB"
- esac
-- AC_SUBST(LCRYPTO, [-lcrypto])
- AC_DEFINE(OPENSSL, , [Use OpenSSL?])
- esac
-
-Only in ntp-4.2.6p1: configure.ac~
Summary(pl.UTF-8): Narzędzia do synchronizacji czasu (Network Time Protocol)
Summary(pt_BR.UTF-8): Network Time Protocol versão 4
Name: ntp
-Version: 4.2.6p1
-Release: 4
+Version: 4.2.6p3
+Release: 1
License: distributable
Group: Networking/Daemons
Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
-# Source0-md5: 0510396dfbde40678b92f808ec07c0d2
+# Source0-md5: 59876a9009b098ff59767ee45a88ebd2
Source1: %{name}.conf
Source2: %{name}.keys
Source3: %{name}.init
Patch0: %{name}-time.patch
Patch1: %{name}-no_libelf.patch
Patch2: %{name}-ipv6.patch
-Patch3: %{name}-openssl_check.patch
-Patch4: %{name}-nano.patch
-Patch5: %{name}-ntpdc-link_order.patch
-Patch6: %{name}-no_avahi.patch
+Patch3: %{name}-nano.patch
+Patch4: %{name}-no_avahi.patch
# FC patches + 100
Patch101: %{name}-4.2.6p1-sleep.patch
Patch102: %{name}-4.2.6p1-droproot.patch
Patch112: %{name}-4.2.4p7-getprecision.patch
Patch113: %{name}-4.2.6p1-logdefault.patch
Patch114: %{name}-4.2.6p1-mlock.patch
+Patch116: %{name}-4.2.6p3-nosyspeer.patch
+Patch117: %{name}-4.2.6p3-broadcastdelay.patch
+Patch118: %{name}-4.2.6p3-delaycalib.patch
+Patch119: %{name}-4.2.6p3-ntpdaterecv.patch
URL: http://www.ntp.org/
BuildRequires: autoconf
BuildRequires: automake
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%{!?with_avahi:%patch6 -p1}
+%{!?with_avahi:%patch4 -p1}
## FC patches
%patch101 -p1
%patch112 -p1
%patch113 -p1
%patch114 -p1
+%patch116 -p1
+%patch117 -p1
+%patch118 -p1
+%patch119 -p1
echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> configure.ac
echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> sntp/configure.ac
%build
%{__libtoolize}
-%{__aclocal} -I m4 -I libopts/m4
+%{__aclocal} -I m4 -I sntp/libopts/m4
%{__autoconf}
%{__automake}
cd sntp
projects / packages / ntp.git / commitdiff