diff options
author | fredb <fredb> | 2001-07-12 16:24:58 +0000 |
---|---|---|
committer | fredb <fredb> | 2001-07-12 16:24:58 +0000 |
commit | e222b183e4bae42e86889cc71e77cd42c8ccd435 (patch) | |
tree | b35d98749f18c003b6174f82feab73f2c9be14a5 /net/ntp4 | |
parent | 0f1df2fc4e1d4daa428f0b95f3174853f12809b3 (diff) | |
download | pkgsrc-e222b183e4bae42e86889cc71e77cd42c8ccd435.tar.gz |
Update to latest release candidate, ntp-4.0.99m-rc3. Continued
refinements since 4.0.99k, a new feature -- an experimental
"huff-n-puff" filter (optionally enabled in /etc/ntp.conf) -- which
discards samples with the highest delays, and new drivers for:
Forum Graphic GPS, WWV/H, Heath GC-100 II, HOPF serial and PCI,
ONCORE, ulink331.
Drop the packages's requirement for GNU readline. It turns out
that command line editing in "ntpq" is not all that useful, as
you can alway let your shell recall "ntpq -c <command>".
Diffstat (limited to 'net/ntp4')
-rw-r--r-- | net/ntp4/Makefile | 25 | ||||
-rw-r--r-- | net/ntp4/distinfo | 7 | ||||
-rw-r--r-- | net/ntp4/patches/patch-aa | 29 | ||||
-rw-r--r-- | net/ntp4/pkg/PLIST | 35 |
4 files changed, 43 insertions, 53 deletions
diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile index 07110e6398e..48b8775ba0f 100644 --- a/net/ntp4/Makefile +++ b/net/ntp4/Makefile @@ -1,28 +1,35 @@ -# $NetBSD: Makefile,v 1.16 2001/06/12 20:33:06 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2001/07/12 16:24:58 fredb Exp $ # -DISTNAME= ntp-4.0.99k +DISTNAME= ntp-4.0.99m-rc3 +PKGNAME= ntp-4.0.99.13.3 CATEGORIES= net MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/ntp4/ \ http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ -MAINTAINER= fb@enteract.com +MAINTAINER= fredb@netbsd.org HOMEPAGE= http://www.ntp.org/ COMMENT= Network Time Protocol Version 4 -DEPENDS+= readline-4.*:../../devel/readline - GNU_CONFIGURE= YES -LIBS= -ltermcap # for ntpdc +CONFIGURE_ENV+= PATH_PERL="${PERL5}" DOCDIR= ${PREFIX}/share/doc EXAMPLESDIR= ${PREFIX}/share/examples +pre-configure: + cd ${WRKSRC} && \ + ${TOUCH} stamp-h.in COPYRIGHT \ + `${FIND} . -name aclocal.m4 -print` \ + `${FIND} . -name configure -print` \ + `${FIND} . -name Makefile.in -print` + post-install: - cd ${WRKSRC}; \ - ${RM} html/.cvsignore* 2> /dev/null || ${TRUE}; \ - ${PAX} -r -w -s "/html/ntp4/" html ${DOCDIR}; \ + cd ${WRKSRC} && \ + ${RM} conf/.cvsignore* 2> /dev/null || ${TRUE}; \ + ${RM} html/.cvsignore* 2> /dev/null || ${TRUE}; \ + ${PAX} -r -w -s "/html/ntp4/" html ${DOCDIR}; \ ${PAX} -r -w -s "/conf/ntp4/" conf ${EXAMPLESDIR} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR}/ntp4 ${EXAMPLESDIR}/ntp4 ${CHMOD} -R ${SHAREMODE} ${DOCDIR}/ntp4 ${EXAMPLESDIR}/ntp4 diff --git a/net/ntp4/distinfo b/net/ntp4/distinfo index 50d39bfc633..fd24cc0cc41 100644 --- a/net/ntp4/distinfo +++ b/net/ntp4/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 11:23:26 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/07/12 16:24:58 fredb Exp $ -SHA1 (ntp-4.0.99k.tar.gz) = c79b1cefa321ff2827c5863f38ef16ba55b3d946 -Size (ntp-4.0.99k.tar.gz) = 1961418 bytes -SHA1 (patch-aa) = 2ba2b21de71a6855e4290aa8a0ab96216e156937 +SHA1 (ntp-4.0.99m-rc3.tar.gz) = 967ff44db1e262e83f7a918601a732e2c9d00edf +Size (ntp-4.0.99m-rc3.tar.gz) = 1991434 bytes diff --git a/net/ntp4/patches/patch-aa b/net/ntp4/patches/patch-aa deleted file mode 100644 index b561b273854..00000000000 --- a/net/ntp4/patches/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2001/04/06 15:21:06 fredb Exp $ - ---- ntpd/ntp_control.c 2000/04/22 14:53:15 1.1.1.2 -+++ ntpd/ntp_control.c 2001/04/05 09:45:27 1.1.1.2.4.1 -@@ -1812,9 +1812,22 @@ - while (cp < reqend && - isspace((int)*cp)) - cp++; -- while (cp < reqend && *cp != -- ',') -+ while (cp < reqend && *cp != ',') { - *tp++ = *cp++; -+ if (tp >= -+ buf + sizeof(buf) - 1) { -+#if 0 /* don't syslog for now - DoS potential on filling syslog */ -+ msyslog(LOG_WARNING, -+ "Attempted \"ntpdx\" exploit from IP %d.%d.%d.%d:%d (possibly spoofed)\n", -+ (ntohl(rmt_addr->sin_addr.s_addr) >> 24) & 0xff, -+ (ntohl(rmt_addr->sin_addr.s_addr) >> 16) & 0xff, -+ (ntohl(rmt_addr->sin_addr.s_addr) >> 8) & 0xff, -+ (ntohl(rmt_addr->sin_addr.s_addr) >> 0) & 0xff, -+ ntohs(rmt_addr->sin_port)); -+#endif -+ return (0); -+ } -+ } - if (cp < reqend) - cp++; - *tp = '\0'; diff --git a/net/ntp4/pkg/PLIST b/net/ntp4/pkg/PLIST index 181d51264e9..8b5cfd006f1 100644 --- a/net/ntp4/pkg/PLIST +++ b/net/ntp4/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2000/08/18 19:39:54 fredb Exp $ +@comment $NetBSD: PLIST,v 1.7 2001/07/12 16:24:58 fredb Exp $ bin/ntpd bin/ntpdate bin/ntpdc @@ -6,6 +6,8 @@ bin/ntpq bin/ntptime bin/ntptimeset bin/ntptrace +bin/ntp-genkeys +bin/ntp-wait bin/tickadj share/doc/ntp4/Oncore-SHMEM.htm share/doc/ntp4/accopt.htm @@ -43,6 +45,8 @@ share/doc/ntp4/driver34.htm share/doc/ntp4/driver35.htm share/doc/ntp4/driver36.htm share/doc/ntp4/driver37.htm +share/doc/ntp4/driver38.htm +share/doc/ntp4/driver39.htm share/doc/ntp4/driver4.htm share/doc/ntp4/driver5.htm share/doc/ntp4/driver6.htm @@ -60,6 +64,7 @@ share/doc/ntp4/index.htm share/doc/ntp4/kern.htm share/doc/ntp4/kernpps.htm share/doc/ntp4/ldisc.htm +share/doc/ntp4/leap.htm share/doc/ntp4/measure.htm share/doc/ntp4/miscopt.htm share/doc/ntp4/monopt.htm @@ -83,8 +88,6 @@ share/doc/ntp4/rdebug.htm share/doc/ntp4/refclock.htm share/doc/ntp4/release.htm share/doc/ntp4/tickadj.htm -share/doc/ntp4/vxworks.htm -share/doc/ntp4/y2k.htm share/doc/ntp4/hints/a-ux share/doc/ntp4/hints/aix share/doc/ntp4/hints/bsdi @@ -110,15 +113,14 @@ share/doc/ntp4/hints/sun4 share/doc/ntp4/hints/svr4-dell share/doc/ntp4/hints/svr4_package share/doc/ntp4/hints/todo +share/doc/ntp4/hints/vxworks.htm share/doc/ntp4/hints/vxworks.html share/doc/ntp4/hints/winnt.htm share/doc/ntp4/pic/9400n.jpg -share/doc/ntp4/pic/alautun4a.gif share/doc/ntp4/pic/alice11.gif share/doc/ntp4/pic/alice12.gif share/doc/ntp4/pic/alice13.gif share/doc/ntp4/pic/alice15.gif -share/doc/ntp4/pic/alice15b.gif share/doc/ntp4/pic/alice23.gif share/doc/ntp4/pic/alice31.gif share/doc/ntp4/pic/alice32.gif @@ -128,12 +130,16 @@ share/doc/ntp4/pic/alice44.gif share/doc/ntp4/pic/alice47.gif share/doc/ntp4/pic/alice51.gif share/doc/ntp4/pic/alice61.gif -share/doc/ntp4/pic/appletree.gif share/doc/ntp4/pic/barnstable.gif share/doc/ntp4/pic/beaver.gif +share/doc/ntp4/pic/boom3.gif +share/doc/ntp4/pic/boom3a.gif +share/doc/ntp4/pic/boom4.gif +share/doc/ntp4/pic/bustardfly.gif share/doc/ntp4/pic/c51.jpg share/doc/ntp4/pic/driver29.gif share/doc/ntp4/pic/fg6021.gif +share/doc/ntp4/pic/fg6039.jpg share/doc/ntp4/pic/flatheads.gif share/doc/ntp4/pic/gadget.jpg share/doc/ntp4/pic/gps167.jpg @@ -143,28 +149,35 @@ share/doc/ntp4/pic/igclock.gif share/doc/ntp4/pic/oncore_evalbig.gif share/doc/ntp4/pic/oncore_remoteant.jpg share/doc/ntp4/pic/oncore_utplusbig.gif +share/doc/ntp4/pic/oz2.gif share/doc/ntp4/pic/panda.gif share/doc/ntp4/pic/pd_om006.gif share/doc/ntp4/pic/pd_om011.gif share/doc/ntp4/pic/pogo.gif -share/doc/ntp4/pic/pogo1.gif share/doc/ntp4/pic/pogo1a.gif -share/doc/ntp4/pic/pogo3.gif share/doc/ntp4/pic/pogo3a.gif -share/doc/ntp4/pic/pogo3b.gif -share/doc/ntp4/pic/pogoa.gif +share/doc/ntp4/pic/pogo4.gif +share/doc/ntp4/pic/pogo5.gif +share/doc/ntp4/pic/pogo6.gif +share/doc/ntp4/pic/pogo8.gif share/doc/ntp4/pic/pzf509.jpg share/doc/ntp4/pic/rabbit.gif +share/doc/ntp4/pic/radio2.jpg share/doc/ntp4/pic/sheepb.jpg -share/doc/ntp4/pic/tardisa.gif share/doc/ntp4/pic/tonea.gif +share/doc/ntp4/pic/stack1a.jpg +share/doc/ntp4/pic/wingdorothy.gif share/examples/ntp4/README share/examples/ntp4/beauregard.conf share/examples/ntp4/baldwin.conf share/examples/ntp4/dewey.conf share/examples/ntp4/grundoon.conf share/examples/ntp4/malarky.conf +share/examples/ntp4/ntp_malarky.conf +share/examples/ntp4/ntp_pogo.conf +share/examples/ntp4/ntp_rackety.conf share/examples/ntp4/pogo.conf +share/examples/ntp4/rackety.conf @dirrm share/examples/ntp4 @dirrm share/doc/ntp4/pic @dirrm share/doc/ntp4/hints |