summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbsiegert <bsiegert>2015-10-27 19:07:02 +0000
committerbsiegert <bsiegert>2015-10-27 19:07:02 +0000
commit27a0469a521f011ca559dd496c135c8d9532ec01 (patch)
tree1c5c60cc27af8ea20444cd738b785b24b237968d
parent8215e4c2fac2ecfe153467bd7d934b492952f9c0 (diff)
downloadpkgsrc-27a0469a521f011ca559dd496c135c8d9532ec01.tar.gz
Pullup ticket #4846 - requested by taca
net/ntp4: security fix Revisions pulled up: - net/ntp4/Makefile 1.88 - net/ntp4/PLIST 1.20 - net/ntp4/distinfo 1.23 - net/ntp4/patches/patch-configure deleted - net/ntp4/patches/patch-sntp_configure deleted --- Module Name: pkgsrc Committed By: taca Date: Fri Oct 23 03:43:31 UTC 2015 Modified Files: pkgsrc/net/ntp4: Makefile PLIST distinfo Removed Files: pkgsrc/net/ntp4/patches: patch-configure patch-sntp_configure Log Message: Update ntp4 to 4.2.8p4. pkgsrc change: * Remove duplicated HTML documents. * Install some addtional documents. Changes are too many to write here, please refer NEWS files and this release fixes security problems. October 2015 NTP Security Vulnerability Announcement (Medium) NTF's NTP Project has been notified of the following 13 low- and medium-severity vulnerabilities that are fixed in ntp-4.2.8p4, released on Wednesday, 21 October 2015: * Bug 2941 CVE-2015-7871 NAK to the Future: Symmetric association authentication bypass via crypto-NAK (Cisco ASIG) * Bug 2922 CVE-2015-7855 decodenetnum() will ASSERT botch instead of returning FAIL on some bogus values (IDA) * Bug 2921 CVE-2015-7854 Password Length Memory Corruption Vulnerability. (Cisco TALOS) * Bug 2920 CVE-2015-7853 Invalid length data provided by a custom refclock driver could cause a buffer overflow. (Cisco TALOS) * Bug 2919 CVE-2015-7852 ntpq atoascii() Memory Corruption Vulnerability. (Cisco TALOS) * Bug 2918 CVE-2015-7851 saveconfig Directory Traversal Vulnerability. (OpenVMS) (Cisco TALOS) * Bug 2917 CVE-2015-7850 remote config logfile-keyfile. (Cisco TALOS) * Bug 2916 CVE-2015-7849 trusted key use-after-free. (Cisco TALOS) * Bug 2913 CVE-2015-7848 mode 7 loop counter underrun. (Cisco TALOS) * Bug 2909 CVE-2015-7701 Slow memory leak in CRYPTO_ASSOC. (Tenable) * Bug 2902 : CVE-2015-7703 configuration directives "pidfile" and "driftfile" should only be allowed locally. (RedHat) * Bug 2901 : CVE-2015-7704, CVE-2015-7705 Clients that receive a KoD should validate the origin timestamp field. (Boston University) * Bug 2899 : CVE-2015-7691, CVE-2015-7692, CVE-2015-7702 Incomplete autokey data packet length checks. (Tenable) The only generally-exploitable bug in the above list is the crypto-NAK bug, which has a CVSS2 score of 6.4. Additionally, three bugs that have already been fixed in ntp-4.2.8 but were not fixed in ntp-4.2.6 as it was EOL'd have a security component, but are all below 1.8 CVSS score, so we're reporting them here: * Bug 2382 : Peer precision < -31 gives division by zero * Bug 1774 : Segfaults if cryptostats enabled when built without OpenSSL * Bug 1593 : ntpd abort in free() with logconfig syntax error
-rw-r--r--net/ntp4/Makefile19
-rw-r--r--net/ntp4/PLIST241
-rw-r--r--net/ntp4/distinfo9
-rw-r--r--net/ntp4/patches/patch-configure15
-rw-r--r--net/ntp4/patches/patch-sntp_configure15
5 files changed, 27 insertions, 272 deletions
diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index c837a4e3136..8b560d4fc4b 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2015/06/30 16:08:21 taca Exp $
+# $NetBSD: Makefile,v 1.87.2.1 2015/10/27 19:07:02 bsiegert Exp $
#
-DISTNAME= ntp-4.2.8p3
+DISTNAME= ntp-4.2.8p4
PKGNAME= ${DISTNAME:S/-dev-/-/}
CATEGORIES= net time
MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/
@@ -22,17 +22,18 @@ CONFIGURE_ENV+= PATH_PERL=${PERL5}
OVERRIDE_DIRDEPTH= 4
-DOCDIR= ${DESTDIR}${PREFIX}/share/doc/ntp
-EXAMPLESDIR= ${DESTDIR}${PREFIX}/share/examples/ntp4
-ALL_NTP_DOCS= ${DOCDIR} ${EXAMPLESDIR}
+DOCS+= COPYRIGHT ChangeLog NEWS README* TODO
+DOCDIR= share/doc/ntp
+EXAMPLESDIR= share/examples/ntp4
+ALL_NTP_DOCS= ${DESTDIR}${PREFIX}/${DOCDIR} ${DESTDIR}${PREFIX}/${EXAMPLESDIR}
+
+INSTALLATION_DIRS= ${DOCDIR} ${EXAMPLESDIR}
RCD_SCRIPTS= ntpd ntpdate
post-install:
- ${MKDIR} ${DOCDIR}
- ${MKDIR} ${EXAMPLESDIR}
- cd ${WRKSRC}/html && pax -rw -pm . ${DOCDIR}
- cd ${WRKSRC}/conf && pax -rw -pm . ${EXAMPLESDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DESTDIR}${PREFIX}/${DOCDIR}
+ cd ${WRKSRC}/conf && pax -rw -pm . ${DESTDIR}${PREFIX}/${EXAMPLESDIR}
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${ALL_NTP_DOCS}
${FIND} ${ALL_NTP_DOCS} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
${FIND} ${ALL_NTP_DOCS} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
diff --git a/net/ntp4/PLIST b/net/ntp4/PLIST
index 5df213613d9..1245ed74943 100644
--- a/net/ntp4/PLIST
+++ b/net/ntp4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2015/06/30 16:08:21 taca Exp $
+@comment $NetBSD: PLIST,v 1.19.2.1 2015/10/27 19:07:02 bsiegert Exp $
bin/sntp
man/man1/sntp.1
man/man5/ntp.conf.5
@@ -21,103 +21,17 @@ ${PLIST.ntptime}sbin/ntptime
sbin/ntptrace
${PLIST.tickadj}sbin/tickadj
${PLIST.timetrim}sbin/timetrim
-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-ja.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/COPYRIGHT
+share/doc/ntp/ChangeLog
+share/doc/ntp/NEWS
+share/doc/ntp/README
+share/doc/ntp/README.bk
+share/doc/ntp/README.hackers
+share/doc/ntp/README.leapsmear
+share/doc/ntp/README.patches
+share/doc/ntp/README.refclocks
+share/doc/ntp/README.versions
+share/doc/ntp/TODO
share/doc/ntp/html/access.html
share/doc/ntp/html/accopt.html
share/doc/ntp/html/assoc.html
@@ -350,147 +264,17 @@ 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/update-leap.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
@@ -500,4 +284,3 @@ share/examples/ntp4/malarky.conf
share/examples/ntp4/pogo.conf
share/examples/ntp4/rackety.conf
share/ntp/lib/NTP/Util.pm
-@pkgdir include/event2
diff --git a/net/ntp4/distinfo b/net/ntp4/distinfo
index 916fd936a45..183725e3856 100644
--- a/net/ntp4/distinfo
+++ b/net/ntp4/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.22 2015/06/30 16:08:21 taca Exp $
+$NetBSD: distinfo,v 1.22.2.1 2015/10/27 19:07:02 bsiegert Exp $
-SHA1 (ntp-4.2.8p3.tar.gz) = fc624396f8d9f9bc282da30c8e8e527ade7d420f
-RMD160 (ntp-4.2.8p3.tar.gz) = 86b7156d36462cfa10e57eed45805814cb7e35bd
-Size (ntp-4.2.8p3.tar.gz) = 7099575 bytes
+SHA1 (ntp-4.2.8p4.tar.gz) = a30f61f87b219ab3613def9e27f5c8e91ce38b0a
+RMD160 (ntp-4.2.8p4.tar.gz) = 94ab0e190f37c55700978a1555473a308e7175e6
+SHA512 (ntp-4.2.8p4.tar.gz) = e5ad7b44921e49b5546aa804dc56c320a3a0beb32b0e6fde40c900bf5e3af40b354a0cecc869b4605b59b5ab58219b9940789b50d747e0f5b50b4e73513d9f23
+Size (ntp-4.2.8p4.tar.gz) = 7104852 bytes
SHA1 (patch-aa) = b247569339d09a88f2e143e355033ce7635ffe92
SHA1 (patch-configure) = 21466ffa5d0334957a1a93b2a99087e7edaaa4d5
SHA1 (patch-sntp_configure) = 38357046af0f0c1aeb8b57bb9c653e330d3feadd
diff --git a/net/ntp4/patches/patch-configure b/net/ntp4/patches/patch-configure
deleted file mode 100644
index 6854caef32f..00000000000
--- a/net/ntp4/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2014/12/20 09:45:46 taca Exp $
-
---- configure.orig 2014-12-19 12:42:27.000000000 +0000
-+++ configure
-@@ -26556,8 +26556,8 @@ done
- # thread cancellation fails to load libgcc_s with dlopen().
- # We have to pass this all as linker options to avoid argument
- # reordering by libtool.
-- case "$GCC$with_gnu_ld" in
-- yesyes)
-+ case "$GCC,$with_gnu_ld,$host_os" in
-+ yes,yes,linux)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -lgcc_s" >&5
- $as_echo_n "checking for exit in -lgcc_s... " >&6; }
- if ${ac_cv_lib_gcc_s_exit+:} false; then :
diff --git a/net/ntp4/patches/patch-sntp_configure b/net/ntp4/patches/patch-sntp_configure
deleted file mode 100644
index c067f2e28a3..00000000000
--- a/net/ntp4/patches/patch-sntp_configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-sntp_configure,v 1.2 2014/12/20 09:45:46 taca Exp $
-
---- sntp/configure.orig 2014-12-19 12:40:10.000000000 +0000
-+++ sntp/configure
-@@ -14394,8 +14394,8 @@ done
- # thread cancellation fails to load libgcc_s with dlopen().
- # We have to pass this all as linker options to avoid argument
- # reordering by libtool.
-- case "$GCC$with_gnu_ld" in
-- yesyes)
-+ case "$GCC,$with_gnu_ld,$host_os" in
-+ yes,yes,linux)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -lgcc_s" >&5
- $as_echo_n "checking for exit in -lgcc_s... " >&6; }
- if ${ac_cv_lib_gcc_s_exit+:} false; then :