| author | Brian Utterback <brian.utterback@oracle.com> |
| Fri, 16 Aug 2013 06:35:08 -0700 | |
| changeset 1467 | f14b6c5766ca |
| parent 1466 | 24d2be32f88c |
| child 1468 | 07b38c2bfed7 |
--- a/components/ntp/Makefile Thu Sep 12 07:07:27 2013 -0700 +++ b/components/ntp/Makefile Fri Aug 16 06:35:08 2013 -0700 @@ -20,27 +20,29 @@ # # -# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. # include ../../make-rules/shared-macros.mk COMPONENT_NAME= ntp -COMPONENT_PATCH_VERSION= 200 -COMPONENT_VERSION= 4.2.5 +COMPONENT_PATCH_VERSION= 381 +COMPONENT_VERSION= 4.2.7 HUMAN_VERSION= $(COMPONENT_VERSION)p$(COMPONENT_PATCH_VERSION) IPS_COMPONENT_VERSION= $(COMPONENT_VERSION).$(COMPONENT_PATCH_VERSION) COMPONENT_PROJECT_URL= http://www.ntp.org/ COMPONENT_SRC_NAME= ntp-dev COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(HUMAN_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= \ - sha256:97eeb4e90fba1ae3210e13574a4b3df715957cb9895264c6a455ee97dec87611 +COMPONENT_ARCHIVE_HASH= \ + sha256:169e56bde7df2822c48e5dc8c3cebc6033a47fd278c8783aaf32770ca295fdcc COMPONENT_ARCHIVE_URL= http://archive.ntp.org/ntp4/ntp-dev/$(COMPONENT_ARCHIVE) -COMPONENT_BUGDB= service/ntp +COMPONENT_BUGDB= service/ntp PATCH_LEVEL = 0 +ASLR_MODE= $(ASLR_ENABLE) + include ../../make-rules/prep.mk include ../../make-rules/configure.mk include ../../make-rules/ips.mk @@ -59,9 +61,7 @@ CONFIGURE_OPTIONS += --enable-parse-clocks CONFIGURE_OPTIONS += --enable-ignore-dns-errors CONFIGURE_OPTIONS += --without-ntpsnmpd -CONFIGURE_OPTIONS += --without-lineeditlibs CONFIGURE_OPTIONS += --with-openssl-libdir=/lib -CONFIGURE_OPTIONS += --disable-getifaddrs BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
--- a/components/ntp/Solaris/ntp.client Thu Sep 12 07:07:27 2013 -0700 +++ b/components/ntp/Solaris/ntp.client Fri Aug 16 06:35:08 2013 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. # If you do not want to configure your client to listen for multicast, comment # this line out. This should only be used for casual time keeping, like keeping @@ -26,6 +26,18 @@ multicastclient 224.0.1.1 +# You can also use broadcast mode. Again, only use for casual timekeeping. + +broadcastclient + +# The default is to require authentication. Without authentication you do not +# have any control over what servers your system is getting its time from. +# It is possible for another system to target your system to change the time. +# However for casual time keeping and ease of administration authentication +# may not be necessary. Using authentication is recommended. + +disable auth + # To configure NTP servers, replace the server_name with either the IP address # or hostname of the server you wish to use. If you just want to keep the time # in a causual way, one server may be enough for you. If you wish to keep it
--- a/components/ntp/ntp.p5m Thu Sep 12 07:07:27 2013 -0700 +++ b/components/ntp/ntp.p5m Fri Aug 16 06:35:08 2013 -0700 @@ -59,20 +59,26 @@ file path=usr/sbin/ntpq file path=usr/sbin/ntptime file path=usr/sbin/ntptrace +file path=usr/share/doc/ntp/access.html file path=usr/share/doc/ntp/accopt.html file path=usr/share/doc/ntp/assoc.html file path=usr/share/doc/ntp/audio.html +file path=usr/share/doc/ntp/authentic.html file path=usr/share/doc/ntp/authopt.html +file path=usr/share/doc/ntp/autokey.html file path=usr/share/doc/ntp/bugs.html file path=usr/share/doc/ntp/build.html +file path=usr/share/doc/ntp/clock.html file path=usr/share/doc/ntp/clockopt.html +file path=usr/share/doc/ntp/cluster.html file path=usr/share/doc/ntp/comdex.html file path=usr/share/doc/ntp/config.html file path=usr/share/doc/ntp/confopt.html file path=usr/share/doc/ntp/copyright.html file path=usr/share/doc/ntp/debug.html file path=usr/share/doc/ntp/decode.html -file path=usr/share/doc/ntp/description_files/description.jpg +file path=usr/share/doc/ntp/discipline.html +file path=usr/share/doc/ntp/discover.html file path=usr/share/doc/ntp/drivers/driver1.html file path=usr/share/doc/ntp/drivers/driver10.html file path=usr/share/doc/ntp/drivers/driver11.html @@ -80,7 +86,6 @@ file path=usr/share/doc/ntp/drivers/driver16.html file path=usr/share/doc/ntp/drivers/driver18.html file path=usr/share/doc/ntp/drivers/driver19.html -file path=usr/share/doc/ntp/drivers/driver2.html file path=usr/share/doc/ntp/drivers/driver20.html file path=usr/share/doc/ntp/drivers/driver22.html file path=usr/share/doc/ntp/drivers/driver26.html @@ -103,6 +108,7 @@ file path=usr/share/doc/ntp/drivers/driver42.html file path=usr/share/doc/ntp/drivers/driver43.html file path=usr/share/doc/ntp/drivers/driver44.html +file path=usr/share/doc/ntp/drivers/driver45.html file path=usr/share/doc/ntp/drivers/driver5.html file path=usr/share/doc/ntp/drivers/driver6.html file path=usr/share/doc/ntp/drivers/driver7.html @@ -116,7 +122,7 @@ file path=usr/share/doc/ntp/drivers/scripts/style.css file path=usr/share/doc/ntp/drivers/tf582_4.html file path=usr/share/doc/ntp/extern.html -file path=usr/share/doc/ntp/gadget.html +file path=usr/share/doc/ntp/filter.html file path=usr/share/doc/ntp/hints.html file path=usr/share/doc/ntp/hints/a-ux file path=usr/share/doc/ntp/hints/aix @@ -146,17 +152,21 @@ file path=usr/share/doc/ntp/hints/todo file path=usr/share/doc/ntp/hints/vxworks.html file path=usr/share/doc/ntp/hints/winnt.html +file path=usr/share/doc/ntp/history.html file path=usr/share/doc/ntp/howto.html +file path=usr/share/doc/ntp/huffpuff.html file path=usr/share/doc/ntp/icons/home.gif file path=usr/share/doc/ntp/icons/mail2.gif +file path=usr/share/doc/ntp/icons/sitemap.png file path=usr/share/doc/ntp/index.html file path=usr/share/doc/ntp/kern.html file path=usr/share/doc/ntp/kernpps.html file path=usr/share/doc/ntp/keygen.html -file path=usr/share/doc/ntp/manyopt.html +file path=usr/share/doc/ntp/leap.html file path=usr/share/doc/ntp/miscopt.html file path=usr/share/doc/ntp/monopt.html file path=usr/share/doc/ntp/msyslog.html +file path=usr/share/doc/ntp/ntp-wait.html file path=usr/share/doc/ntp/ntp_conf.html file path=usr/share/doc/ntp/ntpd.html file path=usr/share/doc/ntp/ntpdate.html @@ -166,6 +176,7 @@ file path=usr/share/doc/ntp/ntpq.html file path=usr/share/doc/ntp/ntptime.html file path=usr/share/doc/ntp/ntptrace.html +file path=usr/share/doc/ntp/orphan.html file path=usr/share/doc/ntp/parsedata.html file path=usr/share/doc/ntp/parsenew.html file path=usr/share/doc/ntp/pic/9400n.jpg @@ -190,16 +201,28 @@ file path=usr/share/doc/ntp/pic/bustardfly.gif file path=usr/share/doc/ntp/pic/c51.jpg file path=usr/share/doc/ntp/pic/description.jpg +file path=usr/share/doc/ntp/pic/discipline.gif file path=usr/share/doc/ntp/pic/dogsnake.gif file path=usr/share/doc/ntp/pic/driver29.gif file path=usr/share/doc/ntp/pic/driver43_1.gif file path=usr/share/doc/ntp/pic/driver43_2.jpg file path=usr/share/doc/ntp/pic/fg6021.gif file path=usr/share/doc/ntp/pic/fg6039.jpg +file path=usr/share/doc/ntp/pic/fig_3_1.gif file path=usr/share/doc/ntp/pic/flatheads.gif +file path=usr/share/doc/ntp/pic/flt1.gif +file path=usr/share/doc/ntp/pic/flt2.gif +file path=usr/share/doc/ntp/pic/flt3.gif +file path=usr/share/doc/ntp/pic/flt4.gif +file path=usr/share/doc/ntp/pic/flt5.gif +file path=usr/share/doc/ntp/pic/flt6.gif +file path=usr/share/doc/ntp/pic/flt7.gif +file path=usr/share/doc/ntp/pic/flt8.gif +file path=usr/share/doc/ntp/pic/flt9.gif file path=usr/share/doc/ntp/pic/freq1211.gif file path=usr/share/doc/ntp/pic/gadget.jpg file path=usr/share/doc/ntp/pic/gps167.jpg +file path=usr/share/doc/ntp/pic/group.gif file path=usr/share/doc/ntp/pic/hornraba.gif file path=usr/share/doc/ntp/pic/igclock.gif file path=usr/share/doc/ntp/pic/neoclock4x.gif @@ -226,10 +249,12 @@ file path=usr/share/doc/ntp/pic/radio2.jpg file path=usr/share/doc/ntp/pic/sheepb.jpg file path=usr/share/doc/ntp/pic/stack1a.jpg +file path=usr/share/doc/ntp/pic/sx5.gif file path=usr/share/doc/ntp/pic/thunderbolt.jpg file path=usr/share/doc/ntp/pic/tonea.gif file path=usr/share/doc/ntp/pic/tribeb.gif file path=usr/share/doc/ntp/pic/wingdorothy.gif +file path=usr/share/doc/ntp/poll.html file path=usr/share/doc/ntp/pps.html file path=usr/share/doc/ntp/prefer.html file path=usr/share/doc/ntp/quick.html @@ -246,16 +271,21 @@ file path=usr/share/doc/ntp/scripts/confopt.txt file path=usr/share/doc/ntp/scripts/external.txt file path=usr/share/doc/ntp/scripts/footer.txt +file path=usr/share/doc/ntp/scripts/hand.txt file path=usr/share/doc/ntp/scripts/install.txt file path=usr/share/doc/ntp/scripts/manual.txt file path=usr/share/doc/ntp/scripts/misc.txt file path=usr/share/doc/ntp/scripts/miscopt.txt file path=usr/share/doc/ntp/scripts/monopt.txt file path=usr/share/doc/ntp/scripts/refclock.txt +file path=usr/share/doc/ntp/scripts/special.txt file path=usr/share/doc/ntp/scripts/style.css +file path=usr/share/doc/ntp/select.html file path=usr/share/doc/ntp/sitemap.html file path=usr/share/doc/ntp/sntp.html +file path=usr/share/doc/ntp/stats.html file path=usr/share/doc/ntp/tickadj.html +file path=usr/share/doc/ntp/warp.html file path=usr/share/doc/ntp/xleave.html file manpages/ntp-keygen.1m path=usr/share/man/man1m/ntp-keygen.1m file manpages/ntpd.1m path=usr/share/man/man1m/ntpd.1m
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ntp/patches/10-etcfix.patch Fri Aug 16 06:35:08 2013 -0700 @@ -0,0 +1,50 @@ +This patch does the customization for the Solaris way +of installing things. There is a method for doing this +with the configure scripts, but these last few file +paths have not been converted. When they are, this patch +can go away. + +--- include/ntp_config.h.orig Thu May 14 06:34:41 2009 ++++ include/ntp_config.h Thu May 14 06:15:12 2009 +@@ -10,7 +10,7 @@ + */ + #ifndef CONFIG_FILE + # ifndef SYS_WINNT +-# define CONFIG_FILE "/etc/ntp.conf" ++# define CONFIG_FILE "/etc/inet/ntp.conf" + # else /* SYS_WINNT */ + # define CONFIG_FILE "%windir%\\system32\\drivers\\etc\\ntp.conf" + # define ALT_CONFIG_FILE "%windir%\\ntp.conf" +--- libntp/audio.c.orig Thu May 14 06:34:41 2009 ++++ libntp/audio.c Thu May 14 06:15:12 2009 +@@ -53,7 +53,7 @@ + static struct audio_device device; /* audio device ident */ + #endif /* HAVE_SYS_AUDIOIO_H */ + #ifdef PCM_STYLE_SOUND +-# define INIT_FILE "/etc/ntp.audio" ++# define INIT_FILE "/etc/inet/ntp.audio" + int agc = SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */ + int monitor = SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */ + int devmask = 0; +--- ntpdate/ntpdate.c.orig Thu May 14 06:34:41 2009 ++++ ntpdate/ntpdate.c Thu May 14 06:15:12 2009 +@@ -179,7 +179,7 @@ + + #ifndef KEYFILE + # ifndef SYS_WINNT +-#define KEYFILE "/etc/ntp.keys" ++#define KEYFILE "/etc/inet/ntp.keys" + # else + #define KEYFILE "%windir%\\ntp.keys" + # endif /* SYS_WINNT */ +--- ntpd/refclock_oncore.c.orig Thu May 14 06:34:41 2009 ++++ ntpd/refclock_oncore.c Thu May 14 06:15:12 2009 +@@ -1210,7 +1210,7 @@ + + FILE *fd; + char *cp, *cc, *ca, line[100], units[2], device[64], **cpp; +- char *dirs[] = { "/etc/ntp", "/etc", 0 }; ++ char *dirs[] = { "/etc/inet", "/etc", 0 }; + int i, sign, lat_flg, long_flg, ht_flg, mode, mask; + double f1, f2, f3; +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ntp/patches/30-mode7.patch Fri Aug 16 06:35:08 2013 -0700 @@ -0,0 +1,15 @@ +This patch reenables support for the ntpdc command's protocol, which +has been EOL'ed by the community. Once we finish the EOL process +in Solaris, we can remove this patch. + +--- ntpd/ntp_proto.c.fcs 2012-07-27 13:19:00.241528650 -0500 ++++ ntpd/ntp_proto.c 2012-07-27 13:19:16.684268838 -0500 +@@ -99,7 +99,7 @@ u_long leap_expire; /* leap information + static int leap_vote; /* leap consensus */ + keyid_t sys_private; /* private value for session seed */ + int sys_manycastserver; /* respond to manycast client pkts */ +-int ntp_mode7; /* respond to ntpdc (mode7) */ ++int ntp_mode7 = TRUE; /* respond to ntpdc (mode7) */ + int peer_ntpdate; /* active peers in ntpdate mode */ + int sys_survivors; /* truest of the truechimers */ + char *sys_ident = NULL; /* identity scheme */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ntp/patches/40-ntpwait.patch Fri Aug 16 06:35:08 2013 -0700 @@ -0,0 +1,18 @@ +This change allows ntp-wait to work with more versions +of NTP, since the format changed slightly. It can be removed +at the next upgrade since there will be no possibility +of running an older ntp with the old format. + +--- scripts/ntp-wait.in ++++ scripts/ntp-wait.in +@@ -20,8 +20,8 @@ + while(<Q>) { + chomp; + # the first line should be similar to: +- # associd=0 status=0645 leap_none, sync_ntp, ... +- if (/^asso?c?id=0 status=(\S{4}) (\S+), (\S+),/i) { ++ # status=0645 leap_none, sync_ntp, ... ++ if (/status=(\S{4}) (\S+), (\S+),/i) { + my $status = $1; + my $leap = $2; + my $sync = $3;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ntp/patches/50-noserve.patch Fri Aug 16 06:35:08 2013 -0700 @@ -0,0 +1,20 @@ +See: + http://bugzilla.ntp.org/show_bug.cgi?id=2367 + +--- ntpd/ntp_proto.c ++++ ntpd/ntp_proto.c +@@ -429,9 +429,11 @@ receive( + process_control(rbufp, restrict_mask); + return; + } +- if (restrict_mask & RES_DONTSERVE) { +- sys_restricted++; +- return; /* no time serve */ ++ if (hismode == MODE_CLIENT) { ++ if (restrict_mask & RES_DONTSERVE) { ++ sys_restricted++; ++ return; /* no time serve */ ++ } + } + + /*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ntp/patches/60-exit-message.patch Fri Aug 16 06:35:08 2013 -0700 @@ -0,0 +1,36 @@ +See: + + http://bugzilla.ntp.org/show_bug.cgi?id=2410 + + +--- ntpd/ntp_proto.c ++++ ntpd/ntp_proto.c +@@ -1856,23 +1856,27 @@ clock_update( + * Clock exceeds panic threshold. Life as we know it ends. + */ + case -1: ++ msyslog(LOG_ERR, "Clock offset exceeds panic threshold."); + #ifdef HAVE_LIBSCF_H + /* + * For Solaris enter the maintenance mode. + */ + if ((fmri = getenv("SMF_FMRI")) != NULL) { + if (smf_maintain_instance(fmri, 0) < 0) { +- printf("smf_maintain_instance: %s\n", ++ msyslog(LOG_ERR, "smf_maintain_instance: %s\n", + scf_strerror(scf_error())); + exit(1); + } + /* + * Sleep until SMF kills us. + */ ++ msyslog(LOG_ERR, "%s placed into maintenance. " ++ "Set system clock by hand before clearing.", fmri); + for (;;) + pause(); + } + #endif /* HAVE_LIBSCF_H */ ++ msyslog(LOG_ERR, "Set system clock by hand."); + exit (-1); + /* not reached */ +
--- a/components/ntp/patches/etcfix.patch Thu Sep 12 07:07:27 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ ---- sntp/header.h.orig Thu May 14 06:34:41 2009 -+++ sntp/header.h Thu May 14 06:15:12 2009 -@@ -19,10 +19,10 @@ - #define MAX_SOCKETS 10 /* Maximum number of addresses */ - - #ifndef LOCKNAME --# define LOCKNAME "/etc/sntp.pid" /* Stores the pid */ -+# define LOCKNAME "/var/run/sntp.pid" /* Stores the pid */ - #endif - #ifndef SAVENAME --# define SAVENAME "/etc/sntp.state" /* Stores the recovery state */ -+# define SAVENAME "/var/ntp/sntp.state" /* Stores the recovery state */ - #endif - - ---- include/ntp_config.h.orig Thu May 14 06:34:41 2009 -+++ include/ntp_config.h Thu May 14 06:15:12 2009 -@@ -10,7 +10,7 @@ - */ - #ifndef CONFIG_FILE - # ifndef SYS_WINNT --# define CONFIG_FILE "/etc/ntp.conf" -+# define CONFIG_FILE "/etc/inet/ntp.conf" - # else /* SYS_WINNT */ - # define CONFIG_FILE "%windir%\\system32\\drivers\\etc\\ntp.conf" - # define ALT_CONFIG_FILE "%windir%\\ntp.conf" ---- libntp/audio.c.orig Thu May 14 06:34:41 2009 -+++ libntp/audio.c Thu May 14 06:15:12 2009 -@@ -53,7 +53,7 @@ - static struct audio_device device; /* audio device ident */ - #endif /* HAVE_SYS_AUDIOIO_H */ - #ifdef PCM_STYLE_SOUND --# define INIT_FILE "/etc/ntp.audio" -+# define INIT_FILE "/etc/inet/ntp.audio" - int agc = SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */ - int monitor = SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */ - int devmask = 0; ---- ntpdate/ntpdate.c.orig Thu May 14 06:34:41 2009 -+++ ntpdate/ntpdate.c Thu May 14 06:15:12 2009 -@@ -192,7 +192,7 @@ - - #ifndef KEYFILE - # ifndef SYS_WINNT --#define KEYFILE "/etc/ntp.keys" -+#define KEYFILE "/etc/inet/ntp.keys" - # else - #define KEYFILE "%windir%\\ntp.keys" - # endif /* SYS_WINNT */ ---- ntpdate/ntptimeset.c.orig Thu May 14 06:34:41 2009 -+++ ntpdate/ntptimeset.c Thu May 14 06:15:12 2009 -@@ -270,7 +270,7 @@ - - #ifndef KEYFILE - # ifndef SYS_WINNT --#define KEYFILE "/etc/ntp.keys" -+#define KEYFILE "/etc/inet/ntp.keys" - # else - #define KEYFILE "%windir%\\ntp.keys" - # endif /* SYS_WINNT */ ---- ntpdate/ntptime_config.c.orig Thu May 14 06:34:41 2009 -+++ ntpdate/ntptime_config.c Thu May 14 06:15:12 2009 -@@ -37,7 +37,7 @@ - */ - #ifndef CONFIG_FILE - # ifndef SYS_WINNT --# define CONFIG_FILE "/etc/ntp.conf" -+# define CONFIG_FILE "/etc/inet/ntp.conf" - # else /* SYS_WINNT */ - # define CONFIG_FILE "%windir%\\ntp.conf" - # define ALT_CONFIG_FILE "%windir%\\ntp.ini" ---- ntpd/refclock_oncore.c.orig Thu May 14 06:34:41 2009 -+++ ntpd/refclock_oncore.c Thu May 14 06:15:12 2009 -@@ -1188,7 +1188,7 @@ - - FILE *fd; - char *cp, *cc, *ca, line[100], units[2], device[20], Msg[160], **cpp; -- char *dirs[] = { "/etc/ntp", "/etc", 0 }; -+ char *dirs[] = { "/etc/inet", "/etc", 0 }; - int i, sign, lat_flg, long_flg, ht_flg, mode, mask; - double f1, f2, f3; -
--- a/components/ntp/patches/ins-ntp-wait.patch Thu Sep 12 07:07:27 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ ---- scripts/Makefile.in.fcs Mon Mar 28 10:55:26 2011 -+++ scripts/Makefile.in Mon Mar 28 11:00:55 2011 -@@ -58,11 +58,11 @@ - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = calc_tickadj checktime freq_adj html2man mkver \ - ntp-wait ntpsweep ntptrace ntpver plot_summary summary - am__installdirs = "$(DESTDIR)$(bindir)" - binSCRIPT_INSTALL = $(INSTALL_SCRIPT) --SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS) -+SCRIPTS = $(bin_SCRIPTS) $(lib_SCRIPTS) $(noinst_SCRIPTS) - SOURCES = - DIST_SOURCES = - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMDEP_FALSE = @AMDEP_FALSE@ -@@ -194,11 +194,12 @@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - subdirs = @subdirs@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --bin_SCRIPTS = ntp-wait ntptrace -+bin_SCRIPTS = ntptrace -+lib_SCRIPTS = ntp-wait - noinst_SCRIPTS = calc_tickadj checktime freq_adj html2man mkver ntpsweep ntpver plot_summary summary - EXTRA_DIST = VersionName fixautomakedepsmagic genCommitLog genver \ - hpadjtime.sh monitoring ntp-close ntp-groper ntp-restart \ - ntp-status rc1 rc2 stats - -@@ -274,10 +275,30 @@ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -+install-libSCRIPTS: $(lib_SCRIPTS) -+ @$(NORMAL_INSTALL) -+ test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)" -+ @list='$(lib_SCRIPTS)'; for p in $$list; do \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ if test -f $$d$$p; then \ -+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -+ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \ -+ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(libexecdir)/$$f"; \ -+ else :; fi; \ -+ done -+ -+uninstall-libSCRIPTS: -+ @$(NORMAL_UNINSTALL) -+ @list='$(lib_SCRIPTS)'; for p in $$list; do \ -+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -+ echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(libexecdir)/$$f"; \ -+ done -+ - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -@@ -368,11 +389,11 @@ - - info-am: - - install-data-am: - --install-exec-am: install-binSCRIPTS -+install-exec-am: install-binSCRIPTS install-libSCRIPTS - - install-info: install-info-am - - install-man: - -@@ -392,20 +413,20 @@ - - ps: ps-am - - ps-am: - --uninstall-am: uninstall-binSCRIPTS uninstall-info-am -+uninstall-am: uninstall-binSCRIPTS uninstall-libSCRIPTS uninstall-info-am - - .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ -- install-binSCRIPTS install-data install-data-am install-exec \ -+ install-binSCRIPTS install-libSCRIPTS install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am -+ uninstall uninstall-am uninstall-binSCRIPTS uninstall-libSCRIPTS uninstall-info-am - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT:
--- a/components/ntp/patches/ins-ntpd.patch Thu Sep 12 07:07:27 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ ---- ntpd/Makefile.in.fcs Mon Mar 28 10:52:07 2011 -+++ ntpd/Makefile.in Mon Mar 28 10:54:13 2011 -@@ -243,11 +243,11 @@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ - am__tar = @am__tar@ - am__untar = @am__untar@ --bindir = ${exec_prefix}/${BINSUBDIR} -+bindir = @libexecdir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@
--- a/components/ntp/patches/mc.patch Thu Sep 12 07:07:27 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -*** ntpd/ntp_io.c.orig Fri Jul 30 06:57:58 2010 ---- ntpd/ntp_io.c Fri Jul 30 06:58:46 2010 -*************** -*** 1869,1875 **** - - case AF_INET: - if (setsockopt(iface->fd, IPPROTO_IP, IP_MULTICAST_IF, -! (char *)NSRCADR(&iface->sin), - sizeof(NSRCADR(&iface->sin)))) { - - msyslog(LOG_ERR, ---- 1869,1875 ---- - - case AF_INET: - if (setsockopt(iface->fd, IPPROTO_IP, IP_MULTICAST_IF, -! (void *)&NSRCADR(&iface->sin), - sizeof(NSRCADR(&iface->sin)))) { - - msyslog(LOG_ERR,
--- a/components/ntp/patches/mdns.patch Thu Sep 12 07:07:27 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,317 +0,0 @@ ---- ntpd/ntpd-opts.c.orig Thu Jul 29 09:29:51 2010 -+++ ntpd/ntpd-opts.c Thu Jul 29 09:43:40 2010 -@@ -243,6 +243,24 @@ - #define NOVIRTUALIPS_FLAGS (OPTST_DISABLED) - - /* -+ * Mdns option description: -+ */ -+#ifdef HAVE_DNSREGISTRATION -+tSCC zMdnsText[] = -+ "Register with mDNS as a NTP server"; -+tSCC zMdns_NAME[] = "MDNS"; -+tSCC zMdns_Name[] = "mdns"; -+#define MDNS_FLAGS (OPTST_DISABLED) -+ -+#else /* disable Mdns */ -+#define VALUE_OPT_MDNS NO_EQUIVALENT -+#define MDNS_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -+#define zMdnsText NULL -+#define zMdns_NAME NULL -+#define zMdns_Name NULL -+#endif /* HAVE_DNSREGISTRATION */ -+ -+/* - * Modifymmtimer option description: - */ - #ifdef SYS_WINNT -@@ -673,10 +691,22 @@ - /* desc, NAME, name */ zNovirtualipsText, zNovirtualips_NAME, zNovirtualips_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 15, VALUE_OPT_MODIFYMMTIMER, -- /* equiv idx, value */ 15, VALUE_OPT_MODIFYMMTIMER, -+ { /* entry idx, value */ 15, VALUE_OPT_MDNS, -+ /* equiv idx, value */ 15, VALUE_OPT_MDNS, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, -+ /* opt state flags */ MDNS_FLAGS, 0, -+ /* last opt argumnt */ { NULL }, -+ /* arg list/cookie */ NULL, -+ /* must/cannot opts */ NULL, NULL, -+ /* option proc */ NULL, -+ /* desc, NAME, name */ zMdnsText, zMdns_NAME, zMdns_Name, -+ /* disablement strs */ NULL, NULL }, -+ -+ { /* entry idx, value */ 16, VALUE_OPT_MODIFYMMTIMER, -+ /* equiv idx, value */ 16, VALUE_OPT_MODIFYMMTIMER, -+ /* equivalenced to */ NO_EQUIVALENT, -+ /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ MODIFYMMTIMER_FLAGS, 0, - /* last opt argumnt */ { NULL }, - /* arg list/cookie */ NULL, -@@ -685,8 +715,8 @@ - /* desc, NAME, name */ zModifymmtimerText, zModifymmtimer_NAME, zModifymmtimer_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 16, VALUE_OPT_NOFORK, -- /* equiv idx, value */ 16, VALUE_OPT_NOFORK, -+ { /* entry idx, value */ 17, VALUE_OPT_NOFORK, -+ /* equiv idx, value */ 17, VALUE_OPT_NOFORK, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ NOFORK_FLAGS, 0, -@@ -697,8 +727,8 @@ - /* desc, NAME, name */ zNoforkText, zNofork_NAME, zNofork_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 17, VALUE_OPT_NICE, -- /* equiv idx, value */ 17, VALUE_OPT_NICE, -+ { /* entry idx, value */ 18, VALUE_OPT_NICE, -+ /* equiv idx, value */ 18, VALUE_OPT_NICE, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ NICE_FLAGS, 0, -@@ -709,8 +739,8 @@ - /* desc, NAME, name */ zNiceText, zNice_NAME, zNice_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 18, VALUE_OPT_PIDFILE, -- /* equiv idx, value */ 18, VALUE_OPT_PIDFILE, -+ { /* entry idx, value */ 19, VALUE_OPT_PIDFILE, -+ /* equiv idx, value */ 19, VALUE_OPT_PIDFILE, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PIDFILE_FLAGS, 0, -@@ -721,8 +751,8 @@ - /* desc, NAME, name */ zPidfileText, zPidfile_NAME, zPidfile_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 19, VALUE_OPT_PRIORITY, -- /* equiv idx, value */ 19, VALUE_OPT_PRIORITY, -+ { /* entry idx, value */ 20, VALUE_OPT_PRIORITY, -+ /* equiv idx, value */ 20, VALUE_OPT_PRIORITY, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PRIORITY_FLAGS, 0, -@@ -733,8 +763,8 @@ - /* desc, NAME, name */ zPriorityText, zPriority_NAME, zPriority_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 20, VALUE_OPT_QUIT, -- /* equiv idx, value */ 20, VALUE_OPT_QUIT, -+ { /* entry idx, value */ 21, VALUE_OPT_QUIT, -+ /* equiv idx, value */ 21, VALUE_OPT_QUIT, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ QUIT_FLAGS, 0, -@@ -745,8 +775,8 @@ - /* desc, NAME, name */ zQuitText, zQuit_NAME, zQuit_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY, -- /* equiv idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY, -+ { /* entry idx, value */ 22, VALUE_OPT_PROPAGATIONDELAY, -+ /* equiv idx, value */ 22, VALUE_OPT_PROPAGATIONDELAY, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ PROPAGATIONDELAY_FLAGS, 0, -@@ -757,8 +787,8 @@ - /* desc, NAME, name */ zPropagationdelayText, zPropagationdelay_NAME, zPropagationdelay_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 22, VALUE_OPT_STATSDIR, -- /* equiv idx, value */ 22, VALUE_OPT_STATSDIR, -+ { /* entry idx, value */ 23, VALUE_OPT_STATSDIR, -+ /* equiv idx, value */ 23, VALUE_OPT_STATSDIR, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ STATSDIR_FLAGS, 0, -@@ -769,8 +799,8 @@ - /* desc, NAME, name */ zStatsdirText, zStatsdir_NAME, zStatsdir_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 23, VALUE_OPT_TRUSTEDKEY, -- /* equiv idx, value */ 23, VALUE_OPT_TRUSTEDKEY, -+ { /* entry idx, value */ 24, VALUE_OPT_TRUSTEDKEY, -+ /* equiv idx, value */ 24, VALUE_OPT_TRUSTEDKEY, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, NOLIMIT, 0, - /* opt state flags */ TRUSTEDKEY_FLAGS, 0, -@@ -781,8 +811,8 @@ - /* desc, NAME, name */ zTrustedkeyText, zTrustedkey_NAME, zTrustedkey_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 24, VALUE_OPT_USER, -- /* equiv idx, value */ 24, VALUE_OPT_USER, -+ { /* entry idx, value */ 25, VALUE_OPT_USER, -+ /* equiv idx, value */ 25, VALUE_OPT_USER, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ USER_FLAGS, 0, -@@ -793,8 +823,8 @@ - /* desc, NAME, name */ zUserText, zUser_NAME, zUser_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 25, VALUE_OPT_UPDATEINTERVAL, -- /* equiv idx, value */ 25, VALUE_OPT_UPDATEINTERVAL, -+ { /* entry idx, value */ 26, VALUE_OPT_UPDATEINTERVAL, -+ /* equiv idx, value */ 26, VALUE_OPT_UPDATEINTERVAL, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ UPDATEINTERVAL_FLAGS, 0, -@@ -805,8 +835,8 @@ - /* desc, NAME, name */ zUpdateintervalText, zUpdateinterval_NAME, zUpdateinterval_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 26, VALUE_OPT_VAR, -- /* equiv idx, value */ 26, VALUE_OPT_VAR, -+ { /* entry idx, value */ 27, VALUE_OPT_VAR, -+ /* equiv idx, value */ 27, VALUE_OPT_VAR, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, NOLIMIT, 0, - /* opt state flags */ VAR_FLAGS, 0, -@@ -817,8 +847,8 @@ - /* desc, NAME, name */ zVarText, zVar_NAME, zVar_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 27, VALUE_OPT_DVAR, -- /* equiv idx, value */ 27, VALUE_OPT_DVAR, -+ { /* entry idx, value */ 28, VALUE_OPT_DVAR, -+ /* equiv idx, value */ 28, VALUE_OPT_DVAR, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, NOLIMIT, 0, - /* opt state flags */ DVAR_FLAGS, 0, -@@ -829,8 +859,8 @@ - /* desc, NAME, name */ zDvarText, zDvar_NAME, zDvar_Name, - /* disablement strs */ NULL, NULL }, - -- { /* entry idx, value */ 28, VALUE_OPT_SLEW, -- /* equiv idx, value */ 28, VALUE_OPT_SLEW, -+ { /* entry idx, value */ 29, VALUE_OPT_SLEW, -+ /* equiv idx, value */ 29, VALUE_OPT_SLEW, - /* equivalenced to */ NO_EQUIVALENT, - /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ SLEW_FLAGS, 0, -@@ -967,7 +997,7 @@ - NO_EQUIVALENT, /* '-#' option index */ - NO_EQUIVALENT /* index of default opt */ - }, -- 34 /* full option count */, 31 /* user option count */, -+ 35 /* full option count */, 32 /* user option count */, - ntpd_full_usage, ntpd_short_usage, - NULL, NULL - }; ---- ntpd/ntpd.c.orig Wed Aug 12 04:07:05 2009 -+++ ntpd/ntpd.c Thu Jul 29 09:48:44 2010 -@@ -166,7 +166,7 @@ - * after we have synched the first time. If the attempt fails, then try again once per - * minute for up to 5 times. After all, we may be starting before mDNS. - */ --int mdnsreg = 1; -+int mdnsreg = 0; - int mdnstries = 5; - #endif /* HAVE_DNSREGISTRATION */ - -@@ -540,6 +540,9 @@ - if (HAVE_OPT( NOVIRTUALIPS )) - listen_to_virtual_ips = 0; - -+ if (HAVE_OPT( MDNS )) -+ mdnsreg = 1; -+ - /* - * Limit specific interfaces - */ ---- ntpd/ntpd-opts.h.orig Wed Aug 12 04:42:23 2009 -+++ ntpd/ntpd-opts.h Thu Jul 29 09:39:13 2010 -@@ -67,28 +67,29 @@ - INDEX_OPT_KEYFILE = 12, - INDEX_OPT_LOGFILE = 13, - INDEX_OPT_NOVIRTUALIPS = 14, -- INDEX_OPT_MODIFYMMTIMER = 15, -- INDEX_OPT_NOFORK = 16, -- INDEX_OPT_NICE = 17, -- INDEX_OPT_PIDFILE = 18, -- INDEX_OPT_PRIORITY = 19, -- INDEX_OPT_QUIT = 20, -- INDEX_OPT_PROPAGATIONDELAY = 21, -- INDEX_OPT_STATSDIR = 22, -- INDEX_OPT_TRUSTEDKEY = 23, -- INDEX_OPT_USER = 24, -- INDEX_OPT_UPDATEINTERVAL = 25, -- INDEX_OPT_VAR = 26, -- INDEX_OPT_DVAR = 27, -- INDEX_OPT_SLEW = 28, -- INDEX_OPT_USEPCC = 29, -- INDEX_OPT_PCCFREQ = 30, -- INDEX_OPT_VERSION = 31, -- INDEX_OPT_HELP = 32, -- INDEX_OPT_MORE_HELP = 33 -+ INDEX_OPT_MDNS = 15, -+ INDEX_OPT_MODIFYMMTIMER = 16, -+ INDEX_OPT_NOFORK = 17, -+ INDEX_OPT_NICE = 18, -+ INDEX_OPT_PIDFILE = 19, -+ INDEX_OPT_PRIORITY = 20, -+ INDEX_OPT_QUIT = 21, -+ INDEX_OPT_PROPAGATIONDELAY = 22, -+ INDEX_OPT_STATSDIR = 23, -+ INDEX_OPT_TRUSTEDKEY = 24, -+ INDEX_OPT_USER = 25, -+ INDEX_OPT_UPDATEINTERVAL = 26, -+ INDEX_OPT_VAR = 27, -+ INDEX_OPT_DVAR = 28, -+ INDEX_OPT_SLEW = 29, -+ INDEX_OPT_USEPCC = 30, -+ INDEX_OPT_PCCFREQ = 31, -+ INDEX_OPT_VERSION = 32, -+ INDEX_OPT_HELP = 33, -+ INDEX_OPT_MORE_HELP = 34 - } teOptIndex; - --#define OPTION_CT 34 -+#define OPTION_CT 35 - #define NTPD_VERSION "4.2.5p200" - #define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p200" - -@@ -177,6 +178,10 @@ - # warning undefining NOVIRTUALIPS due to option name conflict - # undef NOVIRTUALIPS - # endif -+# ifdef MDNS -+# warning undefining MDNS due to option name conflict -+# undef MDNS -+# endif - # ifdef MODIFYMMTIMER - # warning undefining MODIFYMMTIMER due to option name conflict - # undef MODIFYMMTIMER -@@ -257,6 +262,7 @@ - # undef KEYFILE - # undef LOGFILE - # undef NOVIRTUALIPS -+# undef MDNS - # undef MODIFYMMTIMER - # undef NOFORK - # undef NICE -@@ -302,6 +308,9 @@ - #define VALUE_OPT_KEYFILE 'k' - #define VALUE_OPT_LOGFILE 'l' - #define VALUE_OPT_NOVIRTUALIPS 'L' -+#ifdef HAVE_DNSREGISTRATION -+#define VALUE_OPT_MDNS 'm' -+#endif /* HAVE_DNSREGISTRATION */ - #ifdef SYS_WINNT - #define VALUE_OPT_MODIFYMMTIMER 'M' - #endif /* SYS_WINNT */ -@@ -319,8 +328,8 @@ - #endif /* HAVE_DROPROOT */ - #define VALUE_OPT_UPDATEINTERVAL 'U' - #define OPT_VALUE_UPDATEINTERVAL (DESC(UPDATEINTERVAL).optArg.argInt) --#define VALUE_OPT_VAR 26 --#define VALUE_OPT_DVAR 27 -+#define VALUE_OPT_VAR 27 -+#define VALUE_OPT_DVAR 28 - #define VALUE_OPT_SLEW 'x' - #ifdef SYS_WINNT - #define VALUE_OPT_USEPCC 29
--- a/components/ntp/patches/noextra.patch Thu Sep 12 07:07:27 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ ---- configure.orig Thu May 14 06:34:41 2009 -+++ configure Thu May 14 06:15:13 2009 -@@ -459,8 +459,6 @@ - #endif" - - ac_subdirs_all="$ac_subdirs_all arlib" --ac_subdirs_all="$ac_subdirs_all sntp" --ac_subdirs_all="$ac_subdirs_all gsoc_sntp" - ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP YACC VPATH_HACK_TRUE VPATH_HACK_FALSE LIBOPTS_DIR INSTALL_LIBOPTS_TRUE INSTALL_LIBOPTS_FALSE NEED_LIBOPTS_TRUE NEED_LIBOPTS_FALSE LIBOPTS_LDADD LIBOPTS_CFLAGS BINSUBDIR subdirs ARLIB_DIR LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB LIBTOOL PATH_SH PATH_PERL PATH_NET_SNMP_CONFIG EDITLINE_LIBS HAVE_INLINE LIBPARSE MAKE_LIBPARSE MAKE_LIBPARSE_KERNEL MAKE_CHECK_Y2K OPENSSL OPENSSL_INC OPENSSL_LIB LCRYPTO EF_PROGS EF_LIBS MAKE_CHECK_LAYOUT TESTDCF DCFD MAKE_PARSEKMODULE PROPDELAY CHUTEST CLKTEST MAKE_ADJTIMED MAKE_NTPTIME MAKE_TICKADJ MAKE_TIMETRIM MAKE_LIBNTPSIM MAKE_NTPDSIM SNMP_LIBS SNMP_CPPFLAGS SNMP_CFLAGS MAKE_NTPSNMPD LSCF LIBOBJS LTLIBOBJS' - ac_subst_files='' - -@@ -48060,11 +48058,9 @@ - - - --subdirs="$subdirs sntp" - - - --subdirs="$subdirs gsoc_sntp" - - - cat >confcache <<\_ACEOF ---- Makefile.in.orig Thu May 14 06:34:41 2009 -+++ Makefile.in Thu May 14 06:15:13 2009 -@@ -217,8 +217,8 @@ - ACLOCAL_AMFLAGS = -I m4 -I libopts/m4 - NULL = - SUBDIRS = scripts include ElectricFence $(am__append_1) @ARLIB_DIR@ \ -- libntp libparse ntpd ntpdate ntpdc ntpq ntpsnmpd parseutil \ -- adjtimed clockstuff kernel gsoc_sntp sntp util $(NULL) -+ libntp libparse ntpd ntpdate ntpdc ntpq parseutil \ -+ adjtimed clockstuff kernel util $(NULL) - DIST_SUBDIRS = \ - scripts \ - include \ -@@ -231,13 +231,10 @@ - ntpdate \ - ntpdc \ - ntpq \ -- ntpsnmpd \ - parseutil \ - adjtimed \ - clockstuff \ - kernel \ -- gsoc_sntp \ -- sntp \ - util \ - $(NULL) -
--- a/components/ntp/patches/ntpdate-status.patch Thu Sep 12 07:07:27 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- ntpdate/ntpdate.c -+++ ntpdate/ntpdate.c -@@ -2029,7 +2029,7 @@ l_adj_systime( - if (adjtv.tv_usec != 0 && !debug) { - if (adjtime(&adjtv, &oadjtv) < 0) { - msyslog(LOG_ERR, "Can't adjust the time of day: %m"); -- return 0; -+ exit(1); - } - } - return 1;
--- a/components/ntp/patches/ntpwait.patch Thu Sep 12 07:07:27 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ ---- scripts/ntp-wait.in.orig Thu May 14 06:34:42 2009 -+++ scripts/ntp-wait.in Thu May 14 06:15:13 2009 -@@ -20,8 +20,8 @@ - while(<Q>) { - chomp; - # the first line should be similar to: -- # associd=0 status=0645 leap_none, sync_ntp, ... -- if (/^associd=0 status=(\S{4}) (\S+), (\S+),/) { -+ # status=0645 leap_none, sync_ntp, ... -+ if (/status=(\S{4}) (\S+), (\S+),/) { - my $status = $1; - my $leap = $2; - my $sync = $3;
--- a/components/ntp/patches/timing.patch Thu Sep 12 07:07:27 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ ---- ntpd/ntp_proto.c.orig Thu May 14 06:34:42 2009 -+++ ntpd/ntp_proto.c Thu May 14 06:15:13 2009 -@@ -1629,6 +1629,16 @@ - char *fmri; - #endif /* HAVE_LIBSCF_H */ - -+#ifdef DEBUG_TIMING -+{ -+ char buf[2048]; -+ -+ snprintf(buf, sizeof(buf), "%lu %lu %d %d epoch", -+ sys_epoch,peer->epoch,peer->epoch-sys_epoch,current_time - peer->epoch); -+ record_timing_stats(buf); -+} -+#endif -+ - /* - * Update the system state variables. We do this very carefully, - * as the poll interval might need to be clamped differently.