svn commit: r384189 - in branches/2015Q2/net: ntp ntp-devel

[Xin LI]

Author: delphij
Date: Fri Apr 17 21:32:23 2015
New Revision: 384189
URL: https://svnweb.freebsd.org/changeset/ports/384189

Log:
  MFH r383554: ntp 4.2.8p2 (security update).
  
  Approved by:	ports-secteam (self)

Modified:
  branches/2015Q2/net/ntp-devel/Makefile
  branches/2015Q2/net/ntp-devel/distinfo
  branches/2015Q2/net/ntp/Makefile
  branches/2015Q2/net/ntp/distinfo
  branches/2015Q2/net/ntp/pkg-plist
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/net/ntp-devel/Makefile
==============================================================================
--- branches/2015Q2/net/ntp-devel/Makefile	Fri Apr 17 21:02:31 2015	(r384188)
+++ branches/2015Q2/net/ntp-devel/Makefile	Fri Apr 17 21:32:23 2015	(r384189)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ntp
-PORTVERSION=	4.3.11
+PORTVERSION=	4.3.14
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \
 		http://archive.ntp.org/ntp4/ntp-dev/
@@ -12,12 +12,14 @@ DISTNAME=	${PORTNAME}-dev-${PORTVERSION:
 MAINTAINER=	cy at FreeBSD.org
 COMMENT=	The Network Time Protocol Distribution
 
+CONFLICTS=	ntp-[0-9].* ntp-rc-*
+
 GNU_CONFIGURE=	yes
 OPTIONS_SUB=	yes
 USES=		pathfix shebangfix libtool
 LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
-NTP_SHEBANG_FILES=	sbin/ntp-wait sbin/ntptrace
+NTP_SHEBANG_FILES=	sbin/ntp-wait sbin/ntptrace sbin/update-leap
 
 .include "Makefile.inc"
 

Modified: branches/2015Q2/net/ntp-devel/distinfo
==============================================================================
--- branches/2015Q2/net/ntp-devel/distinfo	Fri Apr 17 21:02:31 2015	(r384188)
+++ branches/2015Q2/net/ntp-devel/distinfo	Fri Apr 17 21:32:23 2015	(r384189)
@@ -1,2 +1,2 @@
-SHA256 (ntp-dev-4.3.11.tar.gz) = 6656bbf55a07b0cea460fd02d35ebec49548bde62ddf5ef408f155125b1b38e2
-SIZE (ntp-dev-4.3.11.tar.gz) = 6613141
+SHA256 (ntp-dev-4.3.14.tar.gz) = c7027bc024ab7d3706db60772e34d6240a21045fb19328d80f3446c278ee241d
+SIZE (ntp-dev-4.3.14.tar.gz) = 6622328

Modified: branches/2015Q2/net/ntp/Makefile
==============================================================================
--- branches/2015Q2/net/ntp/Makefile	Fri Apr 17 21:02:31 2015	(r384188)
+++ branches/2015Q2/net/ntp/Makefile	Fri Apr 17 21:32:23 2015	(r384189)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ntp
-PORTVERSION=	4.2.8p1
+PORTVERSION=	4.2.8p2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
 		http://archive.ntp.org/ntp4/ntp-4.2/ \
@@ -17,7 +17,7 @@ OPTIONS_SUB=	yes
 USES=		pathfix shebangfix libtool
 LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
-NTP_SHEBANG_FILES=	sbin/ntp-wait sbin/ntptrace
+NTP_SHEBANG_FILES=	sbin/ntp-wait sbin/ntptrace sbin/update-leap
 
 .include "Makefile.inc"
 

Modified: branches/2015Q2/net/ntp/distinfo
==============================================================================
--- branches/2015Q2/net/ntp/distinfo	Fri Apr 17 21:02:31 2015	(r384188)
+++ branches/2015Q2/net/ntp/distinfo	Fri Apr 17 21:32:23 2015	(r384189)
@@ -1,2 +1,2 @@
-SHA256 (ntp-4.2.8p1.tar.gz) = 948274b88f1ed002d867ced6aaefdfd0999668b11285ac2b3a67ff2629d59d88
-SIZE (ntp-4.2.8p1.tar.gz) = 6791852
+SHA256 (ntp-4.2.8p2.tar.gz) = 0d69bc0e95caad43ea04fdad410e756bae1a71e67b1c2bd799b76b55e04c9b31
+SIZE (ntp-4.2.8p2.tar.gz) = 6820869

Modified: branches/2015Q2/net/ntp/pkg-plist
==============================================================================
--- branches/2015Q2/net/ntp/pkg-plist	Fri Apr 17 21:02:31 2015	(r384188)
+++ branches/2015Q2/net/ntp/pkg-plist	Fri Apr 17 21:32:23 2015	(r384189)
@@ -8,6 +8,7 @@ man/man8/ntpq.8.gz
 %%PERL_UTILS%%man/man8/ntptrace.8.gz
 %%NTPSNMPD%%man/man8/ntpsnmpd.8.gz
 man/man8/sntp.8.gz
+man/man8/update-leap.8.gz
 %%SSL%%sbin/ntp-keygen
 %%PERL_UTILS%%sbin/ntp-wait
 sbin/ntpd
@@ -18,6 +19,7 @@ sbin/ntpq
 sbin/ntptime
 %%PERL_UTILS%%sbin/ntptrace
 sbin/sntp
+sbin/update-leap
 %%PERL_UTILS%%share/ntp/lib/NTP/Util.pm
 %%PORTDOCS%%%%DOCSDIR%%/access.html
 %%PORTDOCS%%%%DOCSDIR%%/accopt.html
@@ -484,6 +486,7 @@ sbin/sntp
 %%PORTDOCS%%%%DOCSDIR%%/sntp.html
 %%PORTDOCS%%%%DOCSDIR%%/stats.html
 %%PORTDOCS%%%%DOCSDIR%%/tickadj.html
+%%PORTDOCS%%%%DOCSDIR%%/update-leap.html
 %%PORTDOCS%%%%DOCSDIR%%/warp.html
 %%PORTDOCS%%%%DOCSDIR%%/xleave.html
 %%PORTDOCS%%share/doc/sntp/sntp.html