Here's an update for net/ntp, which should fix a few CVEs.
http://www.kb.cert.org/vuls/id/852879
Basic tests on amd64: add a few minutes to the system clock then watch
ntpd -n -dd sync it.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ntp/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile 9 Feb 2014 21:36:46 -0000 1.59
+++ Makefile 22 Dec 2014 19:38:22 -0000
@@ -6,26 +6,24 @@ COMMENT= Network Time Protocol reference
# to confuse with the ports system's 'pN' convention, so we
# convert it to 'pl' for local use.
-VERSION= 4.2.7p418
-DISTNAME= ntp-dev-${VERSION}
+VERSION= 4.2.8
+DISTNAME= ntp-${VERSION}
PKGNAME= ntp-${VERSION:S/p/pl/}
CATEGORIES= net
-MASTER_SITES= http://archive.ntp.org/ntp4/ntp-dev/
+MASTER_SITES= http://archive.ntp.org/ntp4/ntp-4.2/
HOMEPAGE= http://www.ntp.org/
# modified ISC
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += c crypto edit event_core event_extra event_pthreads
+WANTLIB += c crypto edit event_core event_pthreads
WANTLIB += m pthread ssl termcap
# enabling SEPARATE_BUILD causes the parser to be rebuilt .y -> .c,
# which requires bison
CONFIGURE_STYLE= gnu
-AUTOCONF_VERSION= 2.68
-AUTOMAKE_VERSION= 1.11
CONFIGURE_ARGS= --docdir=${TRUEPREFIX}/share/doc/ntp \
--enable-parse-clocks \
@@ -34,14 +32,9 @@ CONFIGURE_ARGS= --docdir=${TRUEPREFIX}/s
CONFIGURE_ENV= CPPFLAGS='-DCONFIG_FILE="\"${SYSCONFDIR}/ntp.conf\"" \
-DKEYFILE="\"${SYSCONFDIR}/ntp.keys\""'
-BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS} \
- devel/libtool
LIB_DEPENDS= devel/libevent2
post-patch:
- cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./bootstrap
cp ${WRKSRC}/sntp/loc/freebsd ${WRKSRC}/sntp/loc/openbsd
post-install:
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ntp/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 9 Feb 2014 21:36:46 -0000 1.15
+++ distinfo 22 Dec 2014 19:21:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (ntp-dev-4.2.7p418.tar.gz) =
XU7/9TxSsM4e7i+ozM444T456p20RZFEQSspgmzZPBo=
-SIZE (ntp-dev-4.2.7p418.tar.gz) = 6361805
+SHA256 (ntp-4.2.8.tar.gz) = LpIN+LalpBBWenN2f6RYwAx/Cs7DIT5p7QE0QUpQ2O4=
+SIZE (ntp-4.2.8.tar.gz) = 6750364
Index: patches/patch-libparse_info_trimble_c
===================================================================
RCS file: patches/patch-libparse_info_trimble_c
diff -N patches/patch-libparse_info_trimble_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libparse_info_trimble_c 22 Dec 2014 19:26:39 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- libparse/info_trimble.c.orig Mon Dec 22 20:25:32 2014
++++ libparse/info_trimble.c Mon Dec 22 20:25:49 2014
+@@ -2,6 +2,7 @@
+ * Automatically generated - do not modify
+ */
+
++#include <config.h>
+ #include "ntp_types.h"
+ #include "ntpd.h"
+ #include "trimble.h"
Index: patches/patch-ntpd_ntp_io_c
===================================================================
RCS file: patches/patch-ntpd_ntp_io_c
diff -N patches/patch-ntpd_ntp_io_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ntpd_ntp_io_c 22 Dec 2014 19:30:26 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Broken and not needed on OpenBSD.
+
+--- ntpd/ntp_io.c.orig Mon Dec 22 20:27:33 2014
++++ ntpd/ntp_io.c Mon Dec 22 20:29:43 2014
+@@ -3450,7 +3450,7 @@ read_network_packet(
+ */
+
+ // temporary hack...
+-#ifndef HAVE_SOLARIS_PRIVS
++#if 0
+ if (AF_INET6 == itf->family) {
+ DPRINTF(1, ("Got an IPv6 packet, from <%s> (%d) to <%s> (%d)\n",
+ stoa(&rb->recv_srcadr),
Index: patches/patch-sntp_m4_ntp_libevent_m4
===================================================================
RCS file: patches/patch-sntp_m4_ntp_libevent_m4
diff -N patches/patch-sntp_m4_ntp_libevent_m4
--- patches/patch-sntp_m4_ntp_libevent_m4 9 Feb 2014 21:36:46 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-sntp_m4_ntp_libevent_m4,v 1.1 2014/02/09 21:36:46 sthen Exp $
---- sntp/m4/ntp_libevent.m4.orig Thu Feb 6 22:53:35 2014
-+++ sntp/m4/ntp_libevent.m4 Thu Feb 6 22:54:44 2014
-@@ -58,7 +58,7 @@ case "$ntp_use_local_libevent" in
- ntp_use_local_libevent=no
- AC_MSG_NOTICE([Using the installed libevent])
- CPPFLAGS_LIBEVENT=`$PKG_CONFIG --cflags-only-I libevent`
-- LDADD_LIBEVENT=`$PKG_CONFIG --libs libevent | sed 's:-levent::'`
-+ LDADD_LIBEVENT=`$PKG_CONFIG --libs libevent`
- case "$LIBISC_PTHREADS_NOTHREADS" in
- pthreads)
- LDADD_LIBEVENT="$LDADD_LIBEVENT -levent_pthreads"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/ntp/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST 9 Feb 2014 21:36:46 -0000 1.20
+++ pkg/PLIST 22 Dec 2014 19:33:04 -0000
@@ -71,6 +71,7 @@ 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
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
