Pullup ticket #4649 - requested by bsiegert

net/ntp4: security update

Revisions pulled up:
- net/ntp4/Makefile                                             1.84
- net/ntp4/PLIST                                                1.17
- net/ntp4/distinfo                                             1.20
- net/ntp4/patches/patch-ntpd_ntp__io.c                         deleted

---
   Module Name:    pkgsrc
   Committed By:   bsiegert
   Date:           Sat Mar 21 20:49:28 UTC 2015

   Modified Files:
           pkgsrc/net/ntp4: Makefile PLIST distinfo
   Removed Files:
           pkgsrc/net/ntp4/patches: patch-ntpd_ntp__io.c

   Log Message:
   SECURITY: Update ntpd to 4.2.8p1.

   * [Sec 2671] vallen in extension fields are not validated.
   * [Sec 2672] On some OSes ::1 can be spoofed, bypassing source IP ACLs.

4 files changed, 477 insertions, 681 deletions

diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index c17cf149c2d..89287be5d5b 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.82 2014/12/27 02:48:27 taca Exp $
+# $NetBSD: Makefile,v 1.82.2.1 2015/04/01 18:11:56 hiramatsu Exp $
 #
 
-DISTNAME=	ntp-4.2.8
+DISTNAME=	ntp-4.2.8p1
 PKGNAME=	${DISTNAME:S/-dev-/-/}
-PKGREVISION=	1
 CATEGORIES=	net time
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/
 
@@ -21,7 +20,9 @@ CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=--with-locfile=loc/pkgsrc
 CONFIGURE_ENV+=	  PATH_PERL=${PERL5}
 
-DOCDIR=		${DESTDIR}${PREFIX}/share/doc/ntp4
+OVERRIDE_DIRDEPTH=	4
+
+DOCDIR=		${DESTDIR}${PREFIX}/share/doc/ntp
 EXAMPLESDIR=	${DESTDIR}${PREFIX}/share/examples/ntp4
 ALL_NTP_DOCS=	${DOCDIR} ${EXAMPLESDIR}
 
diff --git a/net/ntp4/PLIST b/net/ntp4/PLIST
index 0ee2160db9a..e0399af57f9 100644
--- a/net/ntp4/PLIST
+++ b/net/ntp4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2014/12/20 09:45:46 taca Exp $
+@comment $NetBSD: PLIST,v 1.16.2.1 2015/04/01 18:11:56 hiramatsu Exp $
 bin/sntp
 man/man1/sntp.1
 man/man5/ntp.conf.5
@@ -21,473 +21,473 @@ ${PLIST.ntptime}sbin/ntptime
 sbin/ntptrace
 ${PLIST.tickadj}sbin/tickadj
 ${PLIST.timetrim}sbin/timetrim
-share/doc/ntp4/access.html
-share/doc/ntp4/accopt.html
-share/doc/ntp4/assoc.html
-share/doc/ntp4/audio.html
-share/doc/ntp4/authentic.html
-share/doc/ntp4/authopt.html
-share/doc/ntp4/autokey.html
-share/doc/ntp4/bugs.html
-share/doc/ntp4/build.html
-share/doc/ntp4/clock.html
-share/doc/ntp4/clockopt.html
-share/doc/ntp4/cluster.html
-share/doc/ntp4/comdex.html
-share/doc/ntp4/config.html
-share/doc/ntp4/confopt.html
-share/doc/ntp4/copyright.html
-share/doc/ntp4/debug.html
-share/doc/ntp4/decode.html
-share/doc/ntp4/discipline.html
-share/doc/ntp4/discover.html
-share/doc/ntp4/drivers/driver1.html
-share/doc/ntp4/drivers/driver10.html
-share/doc/ntp4/drivers/driver11.html
-share/doc/ntp4/drivers/driver12.html
-share/doc/ntp4/drivers/driver16.html
-share/doc/ntp4/drivers/driver18.html
-share/doc/ntp4/drivers/driver19.html
-share/doc/ntp4/drivers/driver20.html
-share/doc/ntp4/drivers/driver22.html
-share/doc/ntp4/drivers/driver26.html
-share/doc/ntp4/drivers/driver27.html
-share/doc/ntp4/drivers/driver28.html
-share/doc/ntp4/drivers/driver29.html
-share/doc/ntp4/drivers/driver3.html
-share/doc/ntp4/drivers/driver30.html
-share/doc/ntp4/drivers/driver31.html
-share/doc/ntp4/drivers/driver32.html
-share/doc/ntp4/drivers/driver33.html
-share/doc/ntp4/drivers/driver34.html
-share/doc/ntp4/drivers/driver35.html
-share/doc/ntp4/drivers/driver36.html
-share/doc/ntp4/drivers/driver37.html
-share/doc/ntp4/drivers/driver38.html
-share/doc/ntp4/drivers/driver39.html
-share/doc/ntp4/drivers/driver4.html
-share/doc/ntp4/drivers/driver40.html
-share/doc/ntp4/drivers/driver42.html
-share/doc/ntp4/drivers/driver43.html
-share/doc/ntp4/drivers/driver44.html
-share/doc/ntp4/drivers/driver45.html
-share/doc/ntp4/drivers/driver46.html
-share/doc/ntp4/drivers/driver5.html
-share/doc/ntp4/drivers/driver6.html
-share/doc/ntp4/drivers/driver7.html
-share/doc/ntp4/drivers/driver8.html
-share/doc/ntp4/drivers/driver9.html
-share/doc/ntp4/drivers/icons/home.gif
-share/doc/ntp4/drivers/icons/mail2.gif
-share/doc/ntp4/drivers/mx4200data.html
-share/doc/ntp4/drivers/oncore-shmem.html
-share/doc/ntp4/drivers/scripts/footer.txt
-share/doc/ntp4/drivers/scripts/style.css
-share/doc/ntp4/drivers/tf582_4.html
-share/doc/ntp4/extern.html
-share/doc/ntp4/filter.html
-share/doc/ntp4/hints.html
-share/doc/ntp4/hints/a-ux
-share/doc/ntp4/hints/aix
-share/doc/ntp4/hints/bsdi
-share/doc/ntp4/hints/changes
-share/doc/ntp4/hints/decosf1
-share/doc/ntp4/hints/decosf2
-share/doc/ntp4/hints/freebsd
-share/doc/ntp4/hints/hpux
-share/doc/ntp4/hints/linux
-share/doc/ntp4/hints/mpeix
-share/doc/ntp4/hints/notes-xntp-v3
-share/doc/ntp4/hints/parse
-share/doc/ntp4/hints/refclocks
-share/doc/ntp4/hints/rs6000
-share/doc/ntp4/hints/sco.html
-share/doc/ntp4/hints/sgi
-share/doc/ntp4/hints/solaris-dosynctodr.html
-share/doc/ntp4/hints/solaris.html
-share/doc/ntp4/hints/solaris.xtra.4023118
-share/doc/ntp4/hints/solaris.xtra.4095849
-share/doc/ntp4/hints/solaris.xtra.S99ntpd
-share/doc/ntp4/hints/solaris.xtra.patchfreq
-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.html
-share/doc/ntp4/hints/winnt.html
-share/doc/ntp4/history.html
-share/doc/ntp4/howto.html
-share/doc/ntp4/html/access.html
-share/doc/ntp4/html/accopt.html
-share/doc/ntp4/html/assoc.html
-share/doc/ntp4/html/audio.html
-share/doc/ntp4/html/authentic.html
-share/doc/ntp4/html/authopt.html
-share/doc/ntp4/html/autokey.html
-share/doc/ntp4/html/bugs.html
-share/doc/ntp4/html/build.html
-share/doc/ntp4/html/clock.html
-share/doc/ntp4/html/clockopt.html
-share/doc/ntp4/html/cluster.html
-share/doc/ntp4/html/comdex.html
-share/doc/ntp4/html/config.html
-share/doc/ntp4/html/confopt.html
-share/doc/ntp4/html/copyright.html
-share/doc/ntp4/html/debug.html
-share/doc/ntp4/html/decode.html
-share/doc/ntp4/html/discipline.html
-share/doc/ntp4/html/discover.html
-share/doc/ntp4/html/drivers/driver1.html
-share/doc/ntp4/html/drivers/driver10.html
-share/doc/ntp4/html/drivers/driver11.html
-share/doc/ntp4/html/drivers/driver12.html
-share/doc/ntp4/html/drivers/driver16.html
-share/doc/ntp4/html/drivers/driver18.html
-share/doc/ntp4/html/drivers/driver19.html
-share/doc/ntp4/html/drivers/driver20.html
-share/doc/ntp4/html/drivers/driver22.html
-share/doc/ntp4/html/drivers/driver26.html
-share/doc/ntp4/html/drivers/driver27.html
-share/doc/ntp4/html/drivers/driver28.html
-share/doc/ntp4/html/drivers/driver29.html
-share/doc/ntp4/html/drivers/driver3.html
-share/doc/ntp4/html/drivers/driver30.html
-share/doc/ntp4/html/drivers/driver31.html
-share/doc/ntp4/html/drivers/driver32.html
-share/doc/ntp4/html/drivers/driver33.html
-share/doc/ntp4/html/drivers/driver34.html
-share/doc/ntp4/html/drivers/driver35.html
-share/doc/ntp4/html/drivers/driver36.html
-share/doc/ntp4/html/drivers/driver37.html
-share/doc/ntp4/html/drivers/driver38.html
-share/doc/ntp4/html/drivers/driver39.html
-share/doc/ntp4/html/drivers/driver4.html
-share/doc/ntp4/html/drivers/driver40.html
-share/doc/ntp4/html/drivers/driver42.html
-share/doc/ntp4/html/drivers/driver43.html
-share/doc/ntp4/html/drivers/driver44.html
-share/doc/ntp4/html/drivers/driver45.html
-share/doc/ntp4/html/drivers/driver46.html
-share/doc/ntp4/html/drivers/driver5.html
-share/doc/ntp4/html/drivers/driver6.html
-share/doc/ntp4/html/drivers/driver7.html
-share/doc/ntp4/html/drivers/driver8.html
-share/doc/ntp4/html/drivers/driver9.html
-share/doc/ntp4/html/drivers/icons/home.gif
-share/doc/ntp4/html/drivers/icons/mail2.gif
-share/doc/ntp4/html/drivers/mx4200data.html
-share/doc/ntp4/html/drivers/oncore-shmem.html
-share/doc/ntp4/html/drivers/scripts/footer.txt
-share/doc/ntp4/html/drivers/scripts/style.css
-share/doc/ntp4/html/drivers/tf582_4.html
-share/doc/ntp4/html/extern.html
-share/doc/ntp4/html/filter.html
-share/doc/ntp4/html/hints.html
-share/doc/ntp4/html/hints/a-ux
-share/doc/ntp4/html/hints/aix
-share/doc/ntp4/html/hints/bsdi
-share/doc/ntp4/html/hints/changes
-share/doc/ntp4/html/hints/decosf1
-share/doc/ntp4/html/hints/decosf2
-share/doc/ntp4/html/hints/freebsd
-share/doc/ntp4/html/hints/hpux
-share/doc/ntp4/html/hints/linux
-share/doc/ntp4/html/hints/mpeix
-share/doc/ntp4/html/hints/notes-xntp-v3
-share/doc/ntp4/html/hints/parse
-share/doc/ntp4/html/hints/refclocks
-share/doc/ntp4/html/hints/rs6000
-share/doc/ntp4/html/hints/sco.html
-share/doc/ntp4/html/hints/sgi
-share/doc/ntp4/html/hints/solaris-dosynctodr.html
-share/doc/ntp4/html/hints/solaris.html
-share/doc/ntp4/html/hints/solaris.xtra.4023118
-share/doc/ntp4/html/hints/solaris.xtra.4095849
-share/doc/ntp4/html/hints/solaris.xtra.S99ntpd
-share/doc/ntp4/html/hints/solaris.xtra.patchfreq
-share/doc/ntp4/html/hints/sun4
-share/doc/ntp4/html/hints/svr4-dell
-share/doc/ntp4/html/hints/svr4_package
-share/doc/ntp4/html/hints/todo
-share/doc/ntp4/html/hints/vxworks.html
-share/doc/ntp4/html/hints/winnt.html
-share/doc/ntp4/html/history.html
-share/doc/ntp4/html/howto.html
-share/doc/ntp4/html/huffpuff.html
-share/doc/ntp4/html/icons/home.gif
-share/doc/ntp4/html/icons/mail2.gif
-share/doc/ntp4/html/icons/sitemap.png
-share/doc/ntp4/html/index.html
-share/doc/ntp4/html/kern.html
-share/doc/ntp4/html/kernpps.html
-share/doc/ntp4/html/keygen.html
-share/doc/ntp4/html/leap.html
-share/doc/ntp4/html/miscopt.html
-share/doc/ntp4/html/monopt.html
-share/doc/ntp4/html/msyslog.html
-share/doc/ntp4/html/ntp-wait.html
-share/doc/ntp4/html/ntp_conf.html
-share/doc/ntp4/html/ntpd.html
-share/doc/ntp4/html/ntpdate.html
-share/doc/ntp4/html/ntpdc.html
-share/doc/ntp4/html/ntpdsim.html
-share/doc/ntp4/html/ntpdsim_new.html
-share/doc/ntp4/html/ntpq.html
-share/doc/ntp4/html/ntptime.html
-share/doc/ntp4/html/ntptrace.html
-share/doc/ntp4/html/orphan.html
-share/doc/ntp4/html/parsedata.html
-share/doc/ntp4/html/parsenew.html
-share/doc/ntp4/html/pic/9400n.jpg
-share/doc/ntp4/html/pic/alice11.gif
-share/doc/ntp4/html/pic/alice13.gif
-share/doc/ntp4/html/pic/alice15.gif
-share/doc/ntp4/html/pic/alice23.gif
-share/doc/ntp4/html/pic/alice31.gif
-share/doc/ntp4/html/pic/alice32.gif
-share/doc/ntp4/html/pic/alice35.gif
-share/doc/ntp4/html/pic/alice38.gif
-share/doc/ntp4/html/pic/alice44.gif
-share/doc/ntp4/html/pic/alice47.gif
-share/doc/ntp4/html/pic/alice51.gif
-share/doc/ntp4/html/pic/alice61.gif
-share/doc/ntp4/html/pic/barnstable.gif
-share/doc/ntp4/html/pic/beaver.gif
-share/doc/ntp4/html/pic/boom3.gif
-share/doc/ntp4/html/pic/boom3a.gif
-share/doc/ntp4/html/pic/boom4.gif
-share/doc/ntp4/html/pic/broad.gif
-share/doc/ntp4/html/pic/bustardfly.gif
-share/doc/ntp4/html/pic/c51.jpg
-share/doc/ntp4/html/pic/description.jpg
-share/doc/ntp4/html/pic/discipline.gif
-share/doc/ntp4/html/pic/dogsnake.gif
-share/doc/ntp4/html/pic/driver29.gif
-share/doc/ntp4/html/pic/driver43_1.gif
-share/doc/ntp4/html/pic/driver43_2.jpg
-share/doc/ntp4/html/pic/fg6021.gif
-share/doc/ntp4/html/pic/fg6039.jpg
-share/doc/ntp4/html/pic/fig_3_1.gif
-share/doc/ntp4/html/pic/flatheads.gif
-share/doc/ntp4/html/pic/flt1.gif
-share/doc/ntp4/html/pic/flt2.gif
-share/doc/ntp4/html/pic/flt3.gif
-share/doc/ntp4/html/pic/flt4.gif
-share/doc/ntp4/html/pic/flt5.gif
-share/doc/ntp4/html/pic/flt6.gif
-share/doc/ntp4/html/pic/flt7.gif
-share/doc/ntp4/html/pic/flt8.gif
-share/doc/ntp4/html/pic/flt9.gif
-share/doc/ntp4/html/pic/freq1211.gif
-share/doc/ntp4/html/pic/gadget.jpg
-share/doc/ntp4/html/pic/gps167.jpg
-share/doc/ntp4/html/pic/group.gif
-share/doc/ntp4/html/pic/hornraba.gif
-share/doc/ntp4/html/pic/igclock.gif
-share/doc/ntp4/html/pic/neoclock4x.gif
-share/doc/ntp4/html/pic/offset1211.gif
-share/doc/ntp4/html/pic/oncore_evalbig.gif
-share/doc/ntp4/html/pic/oncore_remoteant.jpg
-share/doc/ntp4/html/pic/oncore_utplusbig.gif
-share/doc/ntp4/html/pic/oz2.gif
-share/doc/ntp4/html/pic/panda.gif
-share/doc/ntp4/html/pic/pd_om006.gif
-share/doc/ntp4/html/pic/pd_om011.gif
-share/doc/ntp4/html/pic/peer.gif
-share/doc/ntp4/html/pic/pogo.gif
-share/doc/ntp4/html/pic/pogo1a.gif
-share/doc/ntp4/html/pic/pogo3a.gif
-share/doc/ntp4/html/pic/pogo4.gif
-share/doc/ntp4/html/pic/pogo5.gif
-share/doc/ntp4/html/pic/pogo6.gif
-share/doc/ntp4/html/pic/pogo7.gif
-share/doc/ntp4/html/pic/pogo8.gif
-share/doc/ntp4/html/pic/pzf509.jpg
-share/doc/ntp4/html/pic/pzf511.jpg
-share/doc/ntp4/html/pic/rabbit.gif
-share/doc/ntp4/html/pic/radio2.jpg
-share/doc/ntp4/html/pic/sheepb.jpg
-share/doc/ntp4/html/pic/stack1a.jpg
-share/doc/ntp4/html/pic/stats.gif
-share/doc/ntp4/html/pic/sx5.gif
-share/doc/ntp4/html/pic/thunderbolt.jpg
-share/doc/ntp4/html/pic/time1.gif
-share/doc/ntp4/html/pic/tonea.gif
-share/doc/ntp4/html/pic/tribeb.gif
-share/doc/ntp4/html/pic/wingdorothy.gif
-share/doc/ntp4/html/poll.html
-share/doc/ntp4/html/pps.html
-share/doc/ntp4/html/prefer.html
-share/doc/ntp4/html/quick.html
-share/doc/ntp4/html/rate.html
-share/doc/ntp4/html/rdebug.html
-share/doc/ntp4/html/refclock.html
-share/doc/ntp4/html/release.html
-share/doc/ntp4/html/scripts/accopt.txt
-share/doc/ntp4/html/scripts/audio.txt
-share/doc/ntp4/html/scripts/authopt.txt
-share/doc/ntp4/html/scripts/clockopt.txt
-share/doc/ntp4/html/scripts/command.txt
-share/doc/ntp4/html/scripts/config.txt
-share/doc/ntp4/html/scripts/confopt.txt
-share/doc/ntp4/html/scripts/external.txt
-share/doc/ntp4/html/scripts/footer.txt
-share/doc/ntp4/html/scripts/hand.txt
-share/doc/ntp4/html/scripts/install.txt
-share/doc/ntp4/html/scripts/manual.txt
-share/doc/ntp4/html/scripts/misc.txt
-share/doc/ntp4/html/scripts/miscopt.txt
-share/doc/ntp4/html/scripts/monopt.txt
-share/doc/ntp4/html/scripts/refclock.txt
-share/doc/ntp4/html/scripts/special.txt
-share/doc/ntp4/html/scripts/style.css
-share/doc/ntp4/html/select.html
-share/doc/ntp4/html/sitemap.html
-share/doc/ntp4/html/sntp.html
-share/doc/ntp4/html/stats.html
-share/doc/ntp4/html/tickadj.html
-share/doc/ntp4/html/warp.html
-share/doc/ntp4/html/xleave.html
-share/doc/ntp4/huffpuff.html
-share/doc/ntp4/icons/home.gif
-share/doc/ntp4/icons/mail2.gif
-share/doc/ntp4/icons/sitemap.png
-share/doc/ntp4/index.html
-share/doc/ntp4/kern.html
-share/doc/ntp4/kernpps.html
-share/doc/ntp4/keygen.html
-share/doc/ntp4/leap.html
-share/doc/ntp4/miscopt.html
-share/doc/ntp4/monopt.html
-share/doc/ntp4/msyslog.html
-share/doc/ntp4/ntp-keygen.html
-share/doc/ntp4/ntp-wait.html
-share/doc/ntp4/ntp.conf.html
-share/doc/ntp4/ntp.keys.html
-share/doc/ntp4/ntp_conf.html
-share/doc/ntp4/ntpd.html
-share/doc/ntp4/ntpdate.html
-share/doc/ntp4/ntpdc.html
-share/doc/ntp4/ntpdsim.html
-share/doc/ntp4/ntpdsim_new.html
-share/doc/ntp4/ntpq.html
-share/doc/ntp4/ntpsnmpd.html
-share/doc/ntp4/ntpsweep.html
-share/doc/ntp4/ntptime.html
-share/doc/ntp4/ntptrace.html
-share/doc/ntp4/orphan.html
-share/doc/ntp4/parsedata.html
-share/doc/ntp4/parsenew.html
-share/doc/ntp4/pic/9400n.jpg
-share/doc/ntp4/pic/alice11.gif
-share/doc/ntp4/pic/alice13.gif
-share/doc/ntp4/pic/alice15.gif
-share/doc/ntp4/pic/alice23.gif
-share/doc/ntp4/pic/alice31.gif
-share/doc/ntp4/pic/alice32.gif
-share/doc/ntp4/pic/alice35.gif
-share/doc/ntp4/pic/alice38.gif
-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/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/broad.gif
-share/doc/ntp4/pic/bustardfly.gif
-share/doc/ntp4/pic/c51.jpg
-share/doc/ntp4/pic/description.jpg
-share/doc/ntp4/pic/discipline.gif
-share/doc/ntp4/pic/dogsnake.gif
-share/doc/ntp4/pic/driver29.gif
-share/doc/ntp4/pic/driver43_1.gif
-share/doc/ntp4/pic/driver43_2.jpg
-share/doc/ntp4/pic/fg6021.gif
-share/doc/ntp4/pic/fg6039.jpg
-share/doc/ntp4/pic/fig_3_1.gif
-share/doc/ntp4/pic/flatheads.gif
-share/doc/ntp4/pic/flt1.gif
-share/doc/ntp4/pic/flt2.gif
-share/doc/ntp4/pic/flt3.gif
-share/doc/ntp4/pic/flt4.gif
-share/doc/ntp4/pic/flt5.gif
-share/doc/ntp4/pic/flt6.gif
-share/doc/ntp4/pic/flt7.gif
-share/doc/ntp4/pic/flt8.gif
-share/doc/ntp4/pic/flt9.gif
-share/doc/ntp4/pic/freq1211.gif
-share/doc/ntp4/pic/gadget.jpg
-share/doc/ntp4/pic/gps167.jpg
-share/doc/ntp4/pic/group.gif
-share/doc/ntp4/pic/hornraba.gif
-share/doc/ntp4/pic/igclock.gif
-share/doc/ntp4/pic/neoclock4x.gif
-share/doc/ntp4/pic/offset1211.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/peer.gif
-share/doc/ntp4/pic/pogo.gif
-share/doc/ntp4/pic/pogo1a.gif
-share/doc/ntp4/pic/pogo3a.gif
-share/doc/ntp4/pic/pogo4.gif
-share/doc/ntp4/pic/pogo5.gif
-share/doc/ntp4/pic/pogo6.gif
-share/doc/ntp4/pic/pogo7.gif
-share/doc/ntp4/pic/pogo8.gif
-share/doc/ntp4/pic/pzf509.jpg
-share/doc/ntp4/pic/pzf511.jpg
-share/doc/ntp4/pic/rabbit.gif
-share/doc/ntp4/pic/radio2.jpg
-share/doc/ntp4/pic/sheepb.jpg
-share/doc/ntp4/pic/stack1a.jpg
-share/doc/ntp4/pic/stats.gif
-share/doc/ntp4/pic/sx5.gif
-share/doc/ntp4/pic/thunderbolt.jpg
-share/doc/ntp4/pic/time1.gif
-share/doc/ntp4/pic/tonea.gif
-share/doc/ntp4/pic/tribeb.gif
-share/doc/ntp4/pic/wingdorothy.gif
-share/doc/ntp4/poll.html
-share/doc/ntp4/pps.html
-share/doc/ntp4/prefer.html
-share/doc/ntp4/quick.html
-share/doc/ntp4/rate.html
-share/doc/ntp4/rdebug.html
-share/doc/ntp4/refclock.html
-share/doc/ntp4/release.html
-share/doc/ntp4/scripts/accopt.txt
-share/doc/ntp4/scripts/audio.txt
-share/doc/ntp4/scripts/authopt.txt
-share/doc/ntp4/scripts/clockopt.txt
-share/doc/ntp4/scripts/command.txt
-share/doc/ntp4/scripts/config.txt
-share/doc/ntp4/scripts/confopt.txt
-share/doc/ntp4/scripts/external.txt
-share/doc/ntp4/scripts/footer.txt
-share/doc/ntp4/scripts/hand.txt
-share/doc/ntp4/scripts/install.txt
-share/doc/ntp4/scripts/manual.txt
-share/doc/ntp4/scripts/misc.txt
-share/doc/ntp4/scripts/miscopt.txt
-share/doc/ntp4/scripts/monopt.txt
-share/doc/ntp4/scripts/refclock.txt
-share/doc/ntp4/scripts/special.txt
-share/doc/ntp4/scripts/style.css
-share/doc/ntp4/select.html
-share/doc/ntp4/sitemap.html
-share/doc/ntp4/sntp.html
-share/doc/ntp4/stats.html
-share/doc/ntp4/tickadj.html
-share/doc/ntp4/warp.html
-share/doc/ntp4/xleave.html
+share/doc/ntp/access.html
+share/doc/ntp/accopt.html
+share/doc/ntp/assoc.html
+share/doc/ntp/audio.html
+share/doc/ntp/authentic.html
+share/doc/ntp/authopt.html
+share/doc/ntp/autokey.html
+share/doc/ntp/bugs.html
+share/doc/ntp/build.html
+share/doc/ntp/clock.html
+share/doc/ntp/clockopt.html
+share/doc/ntp/cluster.html
+share/doc/ntp/comdex.html
+share/doc/ntp/config.html
+share/doc/ntp/confopt.html
+share/doc/ntp/copyright.html
+share/doc/ntp/debug.html
+share/doc/ntp/decode.html
+share/doc/ntp/discipline.html
+share/doc/ntp/discover.html
+share/doc/ntp/drivers/driver1.html
+share/doc/ntp/drivers/driver10.html
+share/doc/ntp/drivers/driver11.html
+share/doc/ntp/drivers/driver12.html
+share/doc/ntp/drivers/driver16.html
+share/doc/ntp/drivers/driver18.html
+share/doc/ntp/drivers/driver19.html
+share/doc/ntp/drivers/driver20.html
+share/doc/ntp/drivers/driver22.html
+share/doc/ntp/drivers/driver26.html
+share/doc/ntp/drivers/driver27.html
+share/doc/ntp/drivers/driver28.html
+share/doc/ntp/drivers/driver29.html
+share/doc/ntp/drivers/driver3.html
+share/doc/ntp/drivers/driver30.html
+share/doc/ntp/drivers/driver31.html
+share/doc/ntp/drivers/driver32.html
+share/doc/ntp/drivers/driver33.html
+share/doc/ntp/drivers/driver34.html
+share/doc/ntp/drivers/driver35.html
+share/doc/ntp/drivers/driver36.html
+share/doc/ntp/drivers/driver37.html
+share/doc/ntp/drivers/driver38.html
+share/doc/ntp/drivers/driver39.html
+share/doc/ntp/drivers/driver4.html
+share/doc/ntp/drivers/driver40.html
+share/doc/ntp/drivers/driver42.html
+share/doc/ntp/drivers/driver43.html
+share/doc/ntp/drivers/driver44.html
+share/doc/ntp/drivers/driver45.html
+share/doc/ntp/drivers/driver46.html
+share/doc/ntp/drivers/driver5.html
+share/doc/ntp/drivers/driver6.html
+share/doc/ntp/drivers/driver7.html
+share/doc/ntp/drivers/driver8.html
+share/doc/ntp/drivers/driver9.html
+share/doc/ntp/drivers/icons/home.gif
+share/doc/ntp/drivers/icons/mail2.gif
+share/doc/ntp/drivers/mx4200data.html
+share/doc/ntp/drivers/oncore-shmem.html
+share/doc/ntp/drivers/scripts/footer.txt
+share/doc/ntp/drivers/scripts/style.css
+share/doc/ntp/drivers/tf582_4.html
+share/doc/ntp/extern.html
+share/doc/ntp/filter.html
+share/doc/ntp/hints.html
+share/doc/ntp/hints/a-ux
+share/doc/ntp/hints/aix
+share/doc/ntp/hints/bsdi
+share/doc/ntp/hints/changes
+share/doc/ntp/hints/decosf1
+share/doc/ntp/hints/decosf2
+share/doc/ntp/hints/freebsd
+share/doc/ntp/hints/hpux
+share/doc/ntp/hints/linux
+share/doc/ntp/hints/mpeix
+share/doc/ntp/hints/notes-xntp-v3
+share/doc/ntp/hints/parse
+share/doc/ntp/hints/refclocks
+share/doc/ntp/hints/rs6000
+share/doc/ntp/hints/sco.html
+share/doc/ntp/hints/sgi
+share/doc/ntp/hints/solaris-dosynctodr.html
+share/doc/ntp/hints/solaris.html
+share/doc/ntp/hints/solaris.xtra.4023118
+share/doc/ntp/hints/solaris.xtra.4095849
+share/doc/ntp/hints/solaris.xtra.S99ntpd
+share/doc/ntp/hints/solaris.xtra.patchfreq
+share/doc/ntp/hints/sun4
+share/doc/ntp/hints/svr4-dell
+share/doc/ntp/hints/svr4_package
+share/doc/ntp/hints/todo
+share/doc/ntp/hints/vxworks.html
+share/doc/ntp/hints/winnt.html
+share/doc/ntp/history.html
+share/doc/ntp/howto.html
+share/doc/ntp/html/access.html
+share/doc/ntp/html/accopt.html
+share/doc/ntp/html/assoc.html
+share/doc/ntp/html/audio.html
+share/doc/ntp/html/authentic.html
+share/doc/ntp/html/authopt.html
+share/doc/ntp/html/autokey.html
+share/doc/ntp/html/bugs.html
+share/doc/ntp/html/build.html
+share/doc/ntp/html/clock.html
+share/doc/ntp/html/clockopt.html
+share/doc/ntp/html/cluster.html
+share/doc/ntp/html/comdex.html
+share/doc/ntp/html/config.html
+share/doc/ntp/html/confopt.html
+share/doc/ntp/html/copyright.html
+share/doc/ntp/html/debug.html
+share/doc/ntp/html/decode.html
+share/doc/ntp/html/discipline.html
+share/doc/ntp/html/discover.html
+share/doc/ntp/html/drivers/driver1.html
+share/doc/ntp/html/drivers/driver10.html
+share/doc/ntp/html/drivers/driver11.html
+share/doc/ntp/html/drivers/driver12.html
+share/doc/ntp/html/drivers/driver16.html
+share/doc/ntp/html/drivers/driver18.html
+share/doc/ntp/html/drivers/driver19.html
+share/doc/ntp/html/drivers/driver20.html
+share/doc/ntp/html/drivers/driver22.html
+share/doc/ntp/html/drivers/driver26.html
+share/doc/ntp/html/drivers/driver27.html
+share/doc/ntp/html/drivers/driver28.html
+share/doc/ntp/html/drivers/driver29.html
+share/doc/ntp/html/drivers/driver3.html
+share/doc/ntp/html/drivers/driver30.html
+share/doc/ntp/html/drivers/driver31.html
+share/doc/ntp/html/drivers/driver32.html
+share/doc/ntp/html/drivers/driver33.html
+share/doc/ntp/html/drivers/driver34.html
+share/doc/ntp/html/drivers/driver35.html
+share/doc/ntp/html/drivers/driver36.html
+share/doc/ntp/html/drivers/driver37.html
+share/doc/ntp/html/drivers/driver38.html
+share/doc/ntp/html/drivers/driver39.html
+share/doc/ntp/html/drivers/driver4.html
+share/doc/ntp/html/drivers/driver40.html
+share/doc/ntp/html/drivers/driver42.html
+share/doc/ntp/html/drivers/driver43.html
+share/doc/ntp/html/drivers/driver44.html
+share/doc/ntp/html/drivers/driver45.html
+share/doc/ntp/html/drivers/driver46.html
+share/doc/ntp/html/drivers/driver5.html
+share/doc/ntp/html/drivers/driver6.html
+share/doc/ntp/html/drivers/driver7.html
+share/doc/ntp/html/drivers/driver8.html
+share/doc/ntp/html/drivers/driver9.html
+share/doc/ntp/html/drivers/icons/home.gif
+share/doc/ntp/html/drivers/icons/mail2.gif
+share/doc/ntp/html/drivers/mx4200data.html
+share/doc/ntp/html/drivers/oncore-shmem.html
+share/doc/ntp/html/drivers/scripts/footer.txt
+share/doc/ntp/html/drivers/scripts/style.css
+share/doc/ntp/html/drivers/tf582_4.html
+share/doc/ntp/html/extern.html
+share/doc/ntp/html/filter.html
+share/doc/ntp/html/hints.html
+share/doc/ntp/html/hints/a-ux
+share/doc/ntp/html/hints/aix
+share/doc/ntp/html/hints/bsdi
+share/doc/ntp/html/hints/changes
+share/doc/ntp/html/hints/decosf1
+share/doc/ntp/html/hints/decosf2
+share/doc/ntp/html/hints/freebsd
+share/doc/ntp/html/hints/hpux
+share/doc/ntp/html/hints/linux
+share/doc/ntp/html/hints/mpeix
+share/doc/ntp/html/hints/notes-xntp-v3
+share/doc/ntp/html/hints/parse
+share/doc/ntp/html/hints/refclocks
+share/doc/ntp/html/hints/rs6000
+share/doc/ntp/html/hints/sco.html
+share/doc/ntp/html/hints/sgi
+share/doc/ntp/html/hints/solaris-dosynctodr.html
+share/doc/ntp/html/hints/solaris.html
+share/doc/ntp/html/hints/solaris.xtra.4023118
+share/doc/ntp/html/hints/solaris.xtra.4095849
+share/doc/ntp/html/hints/solaris.xtra.S99ntpd
+share/doc/ntp/html/hints/solaris.xtra.patchfreq
+share/doc/ntp/html/hints/sun4
+share/doc/ntp/html/hints/svr4-dell
+share/doc/ntp/html/hints/svr4_package
+share/doc/ntp/html/hints/todo
+share/doc/ntp/html/hints/vxworks.html
+share/doc/ntp/html/hints/winnt.html
+share/doc/ntp/html/history.html
+share/doc/ntp/html/howto.html
+share/doc/ntp/html/huffpuff.html
+share/doc/ntp/html/icons/home.gif
+share/doc/ntp/html/icons/mail2.gif
+share/doc/ntp/html/icons/sitemap.png
+share/doc/ntp/html/index.html
+share/doc/ntp/html/kern.html
+share/doc/ntp/html/kernpps.html
+share/doc/ntp/html/keygen.html
+share/doc/ntp/html/leap.html
+share/doc/ntp/html/miscopt.html
+share/doc/ntp/html/monopt.html
+share/doc/ntp/html/msyslog.html
+share/doc/ntp/html/ntp-wait.html
+share/doc/ntp/html/ntp_conf.html
+share/doc/ntp/html/ntpd.html
+share/doc/ntp/html/ntpdate.html
+share/doc/ntp/html/ntpdc.html
+share/doc/ntp/html/ntpdsim.html
+share/doc/ntp/html/ntpdsim_new.html
+share/doc/ntp/html/ntpq.html
+share/doc/ntp/html/ntptime.html
+share/doc/ntp/html/ntptrace.html
+share/doc/ntp/html/orphan.html
+share/doc/ntp/html/parsedata.html
+share/doc/ntp/html/parsenew.html
+share/doc/ntp/html/pic/9400n.jpg
+share/doc/ntp/html/pic/alice11.gif
+share/doc/ntp/html/pic/alice13.gif
+share/doc/ntp/html/pic/alice15.gif
+share/doc/ntp/html/pic/alice23.gif
+share/doc/ntp/html/pic/alice31.gif
+share/doc/ntp/html/pic/alice32.gif
+share/doc/ntp/html/pic/alice35.gif
+share/doc/ntp/html/pic/alice38.gif
+share/doc/ntp/html/pic/alice44.gif
+share/doc/ntp/html/pic/alice47.gif
+share/doc/ntp/html/pic/alice51.gif
+share/doc/ntp/html/pic/alice61.gif
+share/doc/ntp/html/pic/barnstable.gif
+share/doc/ntp/html/pic/beaver.gif
+share/doc/ntp/html/pic/boom3.gif
+share/doc/ntp/html/pic/boom3a.gif
+share/doc/ntp/html/pic/boom4.gif
+share/doc/ntp/html/pic/broad.gif
+share/doc/ntp/html/pic/bustardfly.gif
+share/doc/ntp/html/pic/c51.jpg
+share/doc/ntp/html/pic/description.jpg
+share/doc/ntp/html/pic/discipline.gif
+share/doc/ntp/html/pic/dogsnake.gif
+share/doc/ntp/html/pic/driver29.gif
+share/doc/ntp/html/pic/driver43_1.gif
+share/doc/ntp/html/pic/driver43_2.jpg
+share/doc/ntp/html/pic/fg6021.gif
+share/doc/ntp/html/pic/fg6039.jpg
+share/doc/ntp/html/pic/fig_3_1.gif
+share/doc/ntp/html/pic/flatheads.gif
+share/doc/ntp/html/pic/flt1.gif
+share/doc/ntp/html/pic/flt2.gif
+share/doc/ntp/html/pic/flt3.gif
+share/doc/ntp/html/pic/flt4.gif
+share/doc/ntp/html/pic/flt5.gif
+share/doc/ntp/html/pic/flt6.gif
+share/doc/ntp/html/pic/flt7.gif
+share/doc/ntp/html/pic/flt8.gif
+share/doc/ntp/html/pic/flt9.gif
+share/doc/ntp/html/pic/freq1211.gif
+share/doc/ntp/html/pic/gadget.jpg
+share/doc/ntp/html/pic/gps167.jpg
+share/doc/ntp/html/pic/group.gif
+share/doc/ntp/html/pic/hornraba.gif
+share/doc/ntp/html/pic/igclock.gif
+share/doc/ntp/html/pic/neoclock4x.gif
+share/doc/ntp/html/pic/offset1211.gif
+share/doc/ntp/html/pic/oncore_evalbig.gif
+share/doc/ntp/html/pic/oncore_remoteant.jpg
+share/doc/ntp/html/pic/oncore_utplusbig.gif
+share/doc/ntp/html/pic/oz2.gif
+share/doc/ntp/html/pic/panda.gif
+share/doc/ntp/html/pic/pd_om006.gif
+share/doc/ntp/html/pic/pd_om011.gif
+share/doc/ntp/html/pic/peer.gif
+share/doc/ntp/html/pic/pogo.gif
+share/doc/ntp/html/pic/pogo1a.gif
+share/doc/ntp/html/pic/pogo3a.gif
+share/doc/ntp/html/pic/pogo4.gif
+share/doc/ntp/html/pic/pogo5.gif
+share/doc/ntp/html/pic/pogo6.gif
+share/doc/ntp/html/pic/pogo7.gif
+share/doc/ntp/html/pic/pogo8.gif
+share/doc/ntp/html/pic/pzf509.jpg
+share/doc/ntp/html/pic/pzf511.jpg
+share/doc/ntp/html/pic/rabbit.gif
+share/doc/ntp/html/pic/radio2.jpg
+share/doc/ntp/html/pic/sheepb.jpg
+share/doc/ntp/html/pic/stack1a.jpg
+share/doc/ntp/html/pic/stats.gif
+share/doc/ntp/html/pic/sx5.gif
+share/doc/ntp/html/pic/thunderbolt.jpg
+share/doc/ntp/html/pic/time1.gif
+share/doc/ntp/html/pic/tonea.gif
+share/doc/ntp/html/pic/tribeb.gif
+share/doc/ntp/html/pic/wingdorothy.gif
+share/doc/ntp/html/poll.html
+share/doc/ntp/html/pps.html
+share/doc/ntp/html/prefer.html
+share/doc/ntp/html/quick.html
+share/doc/ntp/html/rate.html
+share/doc/ntp/html/rdebug.html
+share/doc/ntp/html/refclock.html
+share/doc/ntp/html/release.html
+share/doc/ntp/html/scripts/accopt.txt
+share/doc/ntp/html/scripts/audio.txt
+share/doc/ntp/html/scripts/authopt.txt
+share/doc/ntp/html/scripts/clockopt.txt
+share/doc/ntp/html/scripts/command.txt
+share/doc/ntp/html/scripts/config.txt
+share/doc/ntp/html/scripts/confopt.txt
+share/doc/ntp/html/scripts/external.txt
+share/doc/ntp/html/scripts/footer.txt
+share/doc/ntp/html/scripts/hand.txt
+share/doc/ntp/html/scripts/install.txt
+share/doc/ntp/html/scripts/manual.txt
+share/doc/ntp/html/scripts/misc.txt
+share/doc/ntp/html/scripts/miscopt.txt
+share/doc/ntp/html/scripts/monopt.txt
+share/doc/ntp/html/scripts/refclock.txt
+share/doc/ntp/html/scripts/special.txt
+share/doc/ntp/html/scripts/style.css
+share/doc/ntp/html/select.html
+share/doc/ntp/html/sitemap.html
+share/doc/ntp/html/sntp.html
+share/doc/ntp/html/stats.html
+share/doc/ntp/html/tickadj.html
+share/doc/ntp/html/warp.html
+share/doc/ntp/html/xleave.html
+share/doc/ntp/huffpuff.html
+share/doc/ntp/icons/home.gif
+share/doc/ntp/icons/mail2.gif
+share/doc/ntp/icons/sitemap.png
+share/doc/ntp/index.html
+share/doc/ntp/kern.html
+share/doc/ntp/kernpps.html
+share/doc/ntp/keygen.html
+share/doc/ntp/leap.html
+share/doc/ntp/miscopt.html
+share/doc/ntp/monopt.html
+share/doc/ntp/msyslog.html
+share/doc/ntp/ntp-keygen.html
+share/doc/ntp/ntp-wait.html
+share/doc/ntp/ntp.conf.html
+share/doc/ntp/ntp.keys.html
+share/doc/ntp/ntp_conf.html
+share/doc/ntp/ntpd.html
+share/doc/ntp/ntpdate.html
+share/doc/ntp/ntpdc.html
+share/doc/ntp/ntpdsim.html
+share/doc/ntp/ntpdsim_new.html
+share/doc/ntp/ntpq.html
+share/doc/ntp/ntpsnmpd.html
+share/doc/ntp/ntpsweep.html
+share/doc/ntp/ntptime.html
+share/doc/ntp/ntptrace.html
+share/doc/ntp/orphan.html
+share/doc/ntp/parsedata.html
+share/doc/ntp/parsenew.html
+share/doc/ntp/pic/9400n.jpg
+share/doc/ntp/pic/alice11.gif
+share/doc/ntp/pic/alice13.gif
+share/doc/ntp/pic/alice15.gif
+share/doc/ntp/pic/alice23.gif
+share/doc/ntp/pic/alice31.gif
+share/doc/ntp/pic/alice32.gif
+share/doc/ntp/pic/alice35.gif
+share/doc/ntp/pic/alice38.gif
+share/doc/ntp/pic/alice44.gif
+share/doc/ntp/pic/alice47.gif
+share/doc/ntp/pic/alice51.gif
+share/doc/ntp/pic/alice61.gif
+share/doc/ntp/pic/barnstable.gif
+share/doc/ntp/pic/beaver.gif
+share/doc/ntp/pic/boom3.gif
+share/doc/ntp/pic/boom3a.gif
+share/doc/ntp/pic/boom4.gif
+share/doc/ntp/pic/broad.gif
+share/doc/ntp/pic/bustardfly.gif
+share/doc/ntp/pic/c51.jpg
+share/doc/ntp/pic/description.jpg
+share/doc/ntp/pic/discipline.gif
+share/doc/ntp/pic/dogsnake.gif
+share/doc/ntp/pic/driver29.gif
+share/doc/ntp/pic/driver43_1.gif
+share/doc/ntp/pic/driver43_2.jpg
+share/doc/ntp/pic/fg6021.gif
+share/doc/ntp/pic/fg6039.jpg
+share/doc/ntp/pic/fig_3_1.gif
+share/doc/ntp/pic/flatheads.gif
+share/doc/ntp/pic/flt1.gif
+share/doc/ntp/pic/flt2.gif
+share/doc/ntp/pic/flt3.gif
+share/doc/ntp/pic/flt4.gif
+share/doc/ntp/pic/flt5.gif
+share/doc/ntp/pic/flt6.gif
+share/doc/ntp/pic/flt7.gif
+share/doc/ntp/pic/flt8.gif
+share/doc/ntp/pic/flt9.gif
+share/doc/ntp/pic/freq1211.gif
+share/doc/ntp/pic/gadget.jpg
+share/doc/ntp/pic/gps167.jpg
+share/doc/ntp/pic/group.gif
+share/doc/ntp/pic/hornraba.gif
+share/doc/ntp/pic/igclock.gif
+share/doc/ntp/pic/neoclock4x.gif
+share/doc/ntp/pic/offset1211.gif
+share/doc/ntp/pic/oncore_evalbig.gif
+share/doc/ntp/pic/oncore_remoteant.jpg
+share/doc/ntp/pic/oncore_utplusbig.gif
+share/doc/ntp/pic/oz2.gif
+share/doc/ntp/pic/panda.gif
+share/doc/ntp/pic/pd_om006.gif
+share/doc/ntp/pic/pd_om011.gif
+share/doc/ntp/pic/peer.gif
+share/doc/ntp/pic/pogo.gif
+share/doc/ntp/pic/pogo1a.gif
+share/doc/ntp/pic/pogo3a.gif
+share/doc/ntp/pic/pogo4.gif
+share/doc/ntp/pic/pogo5.gif
+share/doc/ntp/pic/pogo6.gif
+share/doc/ntp/pic/pogo7.gif
+share/doc/ntp/pic/pogo8.gif
+share/doc/ntp/pic/pzf509.jpg
+share/doc/ntp/pic/pzf511.jpg
+share/doc/ntp/pic/rabbit.gif
+share/doc/ntp/pic/radio2.jpg
+share/doc/ntp/pic/sheepb.jpg
+share/doc/ntp/pic/stack1a.jpg
+share/doc/ntp/pic/stats.gif
+share/doc/ntp/pic/sx5.gif
+share/doc/ntp/pic/thunderbolt.jpg
+share/doc/ntp/pic/time1.gif
+share/doc/ntp/pic/tonea.gif
+share/doc/ntp/pic/tribeb.gif
+share/doc/ntp/pic/wingdorothy.gif
+share/doc/ntp/poll.html
+share/doc/ntp/pps.html
+share/doc/ntp/prefer.html
+share/doc/ntp/quick.html
+share/doc/ntp/rate.html
+share/doc/ntp/rdebug.html
+share/doc/ntp/refclock.html
+share/doc/ntp/release.html
+share/doc/ntp/scripts/accopt.txt
+share/doc/ntp/scripts/audio.txt
+share/doc/ntp/scripts/authopt.txt
+share/doc/ntp/scripts/clockopt.txt
+share/doc/ntp/scripts/command.txt
+share/doc/ntp/scripts/config.txt
+share/doc/ntp/scripts/confopt.txt
+share/doc/ntp/scripts/external.txt
+share/doc/ntp/scripts/footer.txt
+share/doc/ntp/scripts/hand.txt
+share/doc/ntp/scripts/install.txt
+share/doc/ntp/scripts/manual.txt
+share/doc/ntp/scripts/misc.txt
+share/doc/ntp/scripts/miscopt.txt
+share/doc/ntp/scripts/monopt.txt
+share/doc/ntp/scripts/refclock.txt
+share/doc/ntp/scripts/special.txt
+share/doc/ntp/scripts/style.css
+share/doc/ntp/select.html
+share/doc/ntp/sitemap.html
+share/doc/ntp/sntp.html
+share/doc/ntp/stats.html
+share/doc/ntp/tickadj.html
+share/doc/ntp/warp.html
+share/doc/ntp/xleave.html
 share/doc/sntp/sntp.html
 share/examples/ntp4/README
 share/examples/ntp4/baldwin.conf
diff --git a/net/ntp4/distinfo b/net/ntp4/distinfo
index 45b4e095e31..5ce80597aa8 100644
--- a/net/ntp4/distinfo
+++ b/net/ntp4/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.19 2014/12/20 09:45:46 taca Exp $
+$NetBSD: distinfo,v 1.19.2.1 2015/04/01 18:11:56 hiramatsu Exp $
 
-SHA1 (ntp-4.2.8.tar.gz) = 6d1c017a8a0e97d5cf8bf4e5e38333973ffd22d5
-RMD160 (ntp-4.2.8.tar.gz) = d68edfca4dd65ccca8ccc40a90b0ec1110982dc3
-Size (ntp-4.2.8.tar.gz) = 6750364 bytes
+SHA1 (ntp-4.2.8p1.tar.gz) = 1e6d8894bbd3456bd71aa890b02f802f2e611e86
+RMD160 (ntp-4.2.8p1.tar.gz) = f61569230e876faf9271607aff9dcbd242ea4f69
+Size (ntp-4.2.8p1.tar.gz) = 6791852 bytes
 SHA1 (patch-aa) = b247569339d09a88f2e143e355033ce7635ffe92
 SHA1 (patch-configure) = 21466ffa5d0334957a1a93b2a99087e7edaaa4d5
-SHA1 (patch-ntpd_ntp__io.c) = 261e35988107de1c49d1723eb47de9c50a1642ae
 SHA1 (patch-sntp_configure) = 38357046af0f0c1aeb8b57bb9c653e330d3feadd
 SHA1 (patch-sntp_loc_pkgsrc) = 6e46ffc0cc2afcfdc1d01297cbe04cb80d103575
diff --git a/net/ntp4/patches/patch-ntpd_ntp__io.c b/net/ntp4/patches/patch-ntpd_ntp__io.c
deleted file mode 100644
index ab9db009760..00000000000
--- a/net/ntp4/patches/patch-ntpd_ntp__io.c
+++ /dev/null
@@ -1,204 +0,0 @@
-$NetBSD: patch-ntpd_ntp__io.c,v 1.1 2014/12/20 09:45:46 taca Exp $
-
-Fix from NetBSD base.
-
---- ntpd/ntp_io.c.orig	2014-12-19 11:56:55.000000000 +0000
-+++ ntpd/ntp_io.c
-@@ -217,7 +217,7 @@ static	isc_boolean_t	socket_multicast_di
- #ifdef DEBUG
- static void interface_dump	(const endpt *);
- static void sockaddr_dump	(const sockaddr_u *);
--static void print_interface	(const endpt *, char *, char *);
-+static void print_interface	(const endpt *, const char *, const char *);
- #define DPRINT_INTERFACE(level, args) do { if (debug >= (level)) { print_interface args; } } while (0)
- #else
- #define DPRINT_INTERFACE(level, args) do {} while (0)
-@@ -550,7 +550,7 @@ sockaddr_dump(const sockaddr_u *psau)
-  * print_interface - helper to output debug information
-  */
- static void
--print_interface(const endpt *iface, char *pfx, char *sfx)
-+print_interface(const endpt *iface, const char *pfx, const char *sfx)
- {
- 	printf("%sinterface #%d: fd=%d, bfd=%d, name=%s, flags=0x%x, ifindex=%u, sin=%s",
- 	       pfx,
-@@ -1647,16 +1647,15 @@ set_wildcard_reuse(
- 
- 
- static isc_boolean_t
--is_anycast(
-+check_flags6(
- 	sockaddr_u *psau,
--	const char *name
-+	const char *name,
-+	u_int32 flags6
- 	)
- {
--#if defined(INCLUDE_IPV6_SUPPORT) && defined(SIOCGIFAFLAG_IN6) && \
--    defined(IN6_IFF_ANYCAST)
-+#if defined(INCLUDE_IPV6_SUPPORT) && defined(SIOCGIFAFLAG_IN6)
- 	struct in6_ifreq ifr6;
- 	int fd;
--	u_int32 flags6;
- 
- 	if (psau->sa.sa_family != AF_INET6)
- 		return ISC_FALSE;
-@@ -1670,13 +1669,45 @@ is_anycast(
- 		return ISC_FALSE;
- 	}
- 	close(fd);
--	flags6 = ifr6.ifr_ifru.ifru_flags6;
--	if ((flags6 & IN6_IFF_ANYCAST) != 0)
-+	if ((ifr6.ifr_ifru.ifru_flags6 & flags6) != 0)
- 		return ISC_TRUE;
--#endif	/* INCLUDE_IPV6_SUPPORT && SIOCGIFAFLAG_IN6 && IN6_IFF_ANYCAST */
-+#endif	/* INCLUDE_IPV6_SUPPORT && SIOCGIFAFLAG_IN6 */
- 	return ISC_FALSE;
- }
- 
-+static isc_boolean_t
-+is_anycast(
-+	sockaddr_u *psau,
-+	const char *name
-+	)
-+{
-+#ifdef IN6_IFF_ANYCAST
-+	return check_flags6(psau, name, IN6_IFF_ANYCAST);
-+#else
-+	return ISC_FALSE;
-+#endif
-+}
-+
-+static isc_boolean_t
-+is_valid(
-+	sockaddr_u *psau,
-+	const char *name
-+	)
-+{
-+	u_int32 flags6;
-+
-+	flags6 = 0;
-+#ifdef IN6_IFF_DEPARTED
-+	flags6 |= IN6_IFF_DEPARTED;
-+#endif
-+#ifdef IN6_IFF_DETACHED
-+	flags6 |= IN6_IFF_DETACHED;
-+#endif
-+#ifdef IN6_IFF_TENTATIVE
-+	flags6 |= IN6_IFF_TENTATIVE;
-+#endif
-+	return check_flags6(psau, name, flags6) ? ISC_FALSE : ISC_TRUE;
-+}
- 
- /*
-  * update_interface strategy
-@@ -1810,6 +1841,12 @@ update_interfaces(
- 			continue;
- 
- 		/*
-+		 * skip any address that is an invalid state to be used
-+		 */
-+		if (!is_valid(&enumep.sin, isc_if.name))
-+			continue;
-+
-+		/*
- 		 * map to local *address* in order to map all duplicate
- 		 * interfaces to an endpt structure with the appropriate
- 		 * socket.  Our name space is (ip-address), NOT
-@@ -1969,6 +2006,9 @@ update_interfaces(
- 	if (broadcast_client_enabled)
- 		io_setbclient();
- 
-+	if (sys_bclient)
-+		io_setbclient();
-+
- 	return new_interface_found;
- }
- 
-@@ -2795,7 +2835,6 @@ open_socket(
- {
- 	SOCKET	fd;
- 	int	errval;
--	char	scopetext[16];
- 	/*
- 	 * int is OK for REUSEADR per
- 	 * http://www.kohala.com/start/mcast.api.txt
-@@ -2945,16 +2984,10 @@ open_socket(
- 		    || debug > 1
- #endif
- 		    ) {
--			if (SCOPE(addr))
--				snprintf(scopetext, sizeof(scopetext),
--					 "%%%d", SCOPE(addr));
--			else
--				scopetext[0] = 0;
--
- 			msyslog(LOG_ERR,
--				"bind(%d) AF_INET%s %s%s#%d%s flags 0x%x failed: %m",
-+				"bind(%d) AF_INET%s %s#%d%s flags 0x%x failed: %m",
- 				fd, IS_IPV6(addr) ? "6" : "",
--				stoa(addr), scopetext, SRCPORT(addr),
-+				stoa(addr), SRCPORT(addr),
- 				IS_MCAST(addr) ? " (multicast)" : "",
- 				interf->flags);
- 		}
-@@ -3198,8 +3231,8 @@ read_refclock_packet(
- 	}
- 
- 	i = (rp->datalen == 0
--	     || rp->datalen > sizeof(rb->recv_space))
--		? sizeof(rb->recv_space)
-+	     || rp->datalen > (int)sizeof(rb->recv_space))
-+		? (int)sizeof(rb->recv_space)
- 		: rp->datalen;
- 	do {
- 		buflen = read(fd, (char *)&rb->recv_space, (u_int)i);
-@@ -3321,8 +3354,8 @@ fetch_timestamp(
- 					tvp->tv_usec = (long)(ticks * 1e6 *
- 							      sys_tick);
- 				}
--				DPRINTF(4, ("fetch_timestamp: system usec network time stamp: %ld.%06ld\n",
--					    tvp->tv_sec, tvp->tv_usec));
-+				DPRINTF(4, ("fetch_timestamp: system usec network time stamp: %jd.%06ld\n",
-+					    (intmax_t)tvp->tv_sec, (long)tvp->tv_usec));
- 				nts = tval_stamp_to_lfp(*tvp);
- 				break;
- #endif  /* HAVE_TIMESTAMP */
-@@ -3454,15 +3487,15 @@ read_network_packet(
- 	if (AF_INET6 == itf->family) {
- 		DPRINTF(1, ("Got an IPv6 packet, from <%s> (%d) to <%s> (%d)\n",
- 			stoa(&rb->recv_srcadr),
--			IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr),
-+			IN6_IS_ADDR_LOOPBACK(&SOCK_ADDR6(&rb->recv_srcadr)),
- 			stoa(&itf->sin),
--			!IN6_IS_ADDR_LOOPBACK(&itf->sin)
-+			!IN6_IS_ADDR_LOOPBACK(&SOCK_ADDR6(&itf->sin))
- 			));
- 	}
- 
- 	if (   AF_INET6 == itf->family
--	    && IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr)
--	    && !IN6_IS_ADDR_LOOPBACK(&itf->sin)
-+	    && IN6_IS_ADDR_LOOPBACK(&SOCK_ADDR6(&rb->recv_srcadr))
-+	    && !IN6_IS_ADDR_LOOPBACK(&SOCK_ADDR6(&itf->sin))
- 	   ) {
- 		packets_dropped++;
- 		DPRINTF(1, ("DROPPING that packet\n"));
-@@ -4040,7 +4073,7 @@ calc_addr_distance(
- 
- 	found_greater = FALSE;
- 	a1_greater = FALSE;	/* suppress pot. uninit. warning */
--	for (i = 0; i < sizeof(NSRCADR6(a1)); i++) {
-+	for (i = 0; i < (int)sizeof(NSRCADR6(a1)); i++) {
- 		if (!found_greater &&
- 		    NSRCADR6(a1)[i] != NSRCADR6(a2)[i]) {
- 			found_greater = TRUE;
-@@ -4083,7 +4116,7 @@ cmp_addr_distance(
- 			return 1;
- 	}
- 
--	for (i = 0; i < sizeof(NSRCADR6(d1)); i++) {
-+	for (i = 0; i < (int)sizeof(NSRCADR6(d1)); i++) {
- 		if (NSRCADR6(d1)[i] < NSRCADR6(d2)[i])
- 			return -1;
- 		else if (NSRCADR6(d1)[i] > NSRCADR6(d2)[i])