Index: head/net/ntp/Makefile
===================================================================
--- head/net/ntp/Makefile	(revision 370262)
+++ head/net/ntp/Makefile	(revision 370263)
@@ -1,68 +1,67 @@
 # Created by: andreas
 # $FreeBSD$
 
 PORTNAME=	ntp
 PORTVERSION?=	4.2.6p5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ \
 		ftp://ftp.archive.de.uu.net/pub/unix/ntp/ntp4/ \
 		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/ntp/ntp4/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/P/p/:S/.r/-RC/}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The Network Time Protocol Distribution
 
-FORBIDDEN=	CVE-2013-5211 / VU\#348126 - Please use net/ntp-devel, pending upstream stable branch update.
 LATEST_LINK=	${PORTNAME}
 
 USES=		libtool shebangfix
 SHEBANG_FILES=	${WRKSRC}/scripts/ntptrace.in ${WRKSRC}/scripts/ntp-wait.in
 perl_OLD_CMD=	@PATH_PERL@
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake
 OPTIONS_SUB=	yes
 
 .include "Makefile.inc"
 
 NTPSNMPD_PLIST_FILES=	bin/ntpsnmpd
 NTPSNMPD_BUILD_DEPENDS=	${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp
 NTPSNMPD_RUN_DEPENDS=	${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp
 NTPSNMPD_CONFIGURE_OFF=	--without-ntpsnmpd
 
 SSL_USE=		OPENSSL=yes
 SSL_CONFIGURE_OFF=	--without-crypto
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 NTP_SIGND_CONFIGURE_ENABLE=	ntp-signd
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=	--with-openssl-incdir=${OPENSSLINC} \
 			--with-openssl-libdir=${OPENSSLLIB}
 .endif
 
 .for D in ${NTP_DRIVERS}
 .if ${PORT_OPTIONS:M${D}}
 CONFIGURE_ARGS+=	--enable-${D}
 .endif
 .endfor
 
 AUTOTOOLSFILES=	aclocal.m4
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \
 			  ${WRKSRC}/aclocal.m4
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 	@cd ${WRKSRC}/html && ${FIND} . -print | \
 		${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/net/ntp/files/patch-ntpd-ntp_request.c
===================================================================
--- head/net/ntp/files/patch-ntpd-ntp_request.c	(nonexistent)
+++ head/net/ntp/files/patch-ntpd-ntp_request.c	(revision 370263)
@@ -0,0 +1,18 @@
+--- ntpd/ntp_request.c.orig	2011-11-30 18:55:17.000000000 -0800
++++ ntpd/ntp_request.c	2014-10-06 17:07:02.570303970 -0700
+@@ -1956,7 +1956,6 @@
+ 	    printf("wants monitor 0 list\n");
+ #endif
+ 	if (!mon_enabled) {
+-		req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
+ 		return;
+ 	}
+ 	im = (struct info_monitor *)prepare_pkt(srcadr, inter, inpkt,
+@@ -2002,7 +2001,6 @@
+ 	extern int mon_enabled;
+ 
+ 	if (!mon_enabled) {
+-		req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
+ 		return;
+ 	}
+ 	im = (struct info_monitor_1 *)prepare_pkt(srcadr, inter, inpkt,

Property changes on: head/net/ntp/files/patch-ntpd-ntp_request.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/ntp/files/patch-ntpd-ntpd.c
===================================================================
--- head/net/ntp/files/patch-ntpd-ntpd.c	(nonexistent)
+++ head/net/ntp/files/patch-ntpd-ntpd.c	(revision 370263)
@@ -0,0 +1,13 @@
+--- ntpd/ntpd.c.orig	2011-12-24 15:27:15.000000000 -0800
++++ ntpd/ntpd.c	2014-10-06 17:04:57.760219124 -0700
+@@ -853,8 +853,8 @@
+ 	init_proto();		/* Call at high priority */
+ 	init_io();
+ 	init_loopfilter();
+-	mon_start(MON_ON);	/* monitor on by default now	  */
+-				/* turn off in config if unwanted */
++	mon_start(MON_OFF);	/* monitor off by default now	  */
++				/* turn on in config if wanted */
+ 
+ 	/*
+ 	 * Get the configuration.  This is done in a separate module

Property changes on: head/net/ntp/files/patch-ntpd-ntpd.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property