From owner-svn-ports-head@FreeBSD.ORG Tue Oct 7 00:21:54 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 41B95F86; Tue, 7 Oct 2014 00:21:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2467B13E; Tue, 7 Oct 2014 00:21:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s970Lrvw007656; Tue, 7 Oct 2014 00:21:53 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s970Lq0U007653; Tue, 7 Oct 2014 00:21:52 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201410070021.s970Lq0U007653@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Tue, 7 Oct 2014 00:21:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370263 - in head/net/ntp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Oct 2014 00:21:54 -0000 Author: cy Date: Tue Oct 7 00:21:52 2014 New Revision: 370263 URL: https://svnweb.freebsd.org/changeset/ports/370263 QAT: https://qat.redports.org/buildarchive/r370263/ Log: Apply upstream recommended patch for CVE-2013-5211 and unforbid. Submitted by: Harlan Stenn - ntp.org upline Also Obtained from: ntp in base (r265465) Added: head/net/ntp/files/patch-ntpd-ntp_request.c (contents, props changed) head/net/ntp/files/patch-ntpd-ntpd.c (contents, props changed) Modified: head/net/ntp/Makefile Modified: head/net/ntp/Makefile ============================================================================== --- head/net/ntp/Makefile Mon Oct 6 23:40:52 2014 (r370262) +++ head/net/ntp/Makefile Tue Oct 7 00:21:52 2014 (r370263) @@ -3,7 +3,7 @@ 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/ \ @@ -14,7 +14,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/P/ 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 Added: head/net/ntp/files/patch-ntpd-ntp_request.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntp/files/patch-ntpd-ntp_request.c Tue Oct 7 00:21:52 2014 (r370263) @@ -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, Added: head/net/ntp/files/patch-ntpd-ntpd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntp/files/patch-ntpd-ntpd.c Tue Oct 7 00:21:52 2014 (r370263) @@ -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