svn commit: r387976 - in branches/2015Q2/net/chrony: . files

[Kurt Jaeger]

Author: pi
Date: Sat May 30 17:55:04 2015
New Revision: 387976
URL: https://svnweb.freebsd.org/changeset/ports/387976

Log:
  net/chrony: Security update to 1.31.1
  
  MFH: r387180
  
  PR:		199508
  Security:	CVE-2015-1799, CVE-2015-1821, CVE-2015-1822
  Approved by:	ports-secteam

Modified:
  branches/2015Q2/net/chrony/Makefile
  branches/2015Q2/net/chrony/distinfo
  branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example
  branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example2

Modified: branches/2015Q2/net/chrony/Makefile
==============================================================================
--- branches/2015Q2/net/chrony/Makefile	Sat May 30 17:52:07 2015	(r387975)
+++ branches/2015Q2/net/chrony/Makefile	Sat May 30 17:55:04 2015	(r387976)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chrony
-PORTVERSION=	1.31
+PORTVERSION=	1.31.1
 CATEGORIES=	net
 MASTER_SITES=	http://download.tuxfamily.org/chrony/
 
@@ -15,7 +15,8 @@ LICENSE=	GPLv2
 # with ``Could not open any NTP socket'' message on startup :(
 ONLY_FOR_ARCHS=	i386 amd64
 
-USES=		gmake makeinfo readline
+USES=		cpe gmake makeinfo readline
+CPE_VENDOR=	tuxfamily
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \
 		--datarootdir=${DATADIR} --docdir=${DOCSDIR}
@@ -33,6 +34,10 @@ OPTIONS_DEFAULT=	IPV6
 IPV6_CATEGORIES=	ipv6
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 
+post-stage:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd
+
 post-install:
 .for f in chrony.conf.example chrony.conf.example2 chrony.keys.example
 	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${PREFIX}/etc

Modified: branches/2015Q2/net/chrony/distinfo
==============================================================================
--- branches/2015Q2/net/chrony/distinfo	Sat May 30 17:52:07 2015	(r387975)
+++ branches/2015Q2/net/chrony/distinfo	Sat May 30 17:55:04 2015	(r387976)
@@ -1,2 +1,2 @@
-SHA256 (chrony-1.31.tar.gz) = a35e1cae46ecbe14af2023bb47a72a03d79591b2ff65f0072b3400153224996d
-SIZE (chrony-1.31.tar.gz) = 395742
+SHA256 (chrony-1.31.1.tar.gz) = 0ba9f4b58e20b2eaae921eb8c798108ef72d8ea6fdcc7eb0167b56690d212348
+SIZE (chrony-1.31.1.tar.gz) = 395797

Modified: branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example
==============================================================================
--- branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example	Sat May 30 17:52:07 2015	(r387975)
+++ branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example	Sat May 30 17:55:04 2015	(r387976)
@@ -1,4 +1,4 @@
---- examples/chrony.conf.example.orig	2014-01-31 20:12:59 +0800
+--- examples/chrony.conf.example.orig	2015-04-07 14:35:16 UTC
 +++ examples/chrony.conf.example
 @@ -42,6 +42,13 @@
  # Failing that, there are a lot of public NTP servers.  There is a list
@@ -23,7 +23,7 @@
  
  # Tell chronyd which numbered key in the file is used as the password
  # for chronyc. (You can pick any integer up to 2**32-1.  '1' is just a
-@@ -129,7 +136,7 @@ commandkey 1
+@@ -132,7 +139,7 @@ generatecommandkey
  # still running and bail out.  If you want to change the path to the PID
  # file, uncomment this line and edit it.  The default path is shown.
  
@@ -32,7 +32,7 @@
  
  #######################################################################
  ### INITIAL CLOCK CORRECTION
-@@ -152,8 +159,8 @@ commandkey 1
+@@ -155,8 +162,8 @@ generatecommandkey
  # produce some graphs of your system's timekeeping performance, or you
  # need help in debugging a problem.
  

Modified: branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example2
==============================================================================
--- branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example2	Sat May 30 17:52:07 2015	(r387975)
+++ branches/2015Q2/net/chrony/files/patch-examples-chrony.conf.example2	Sat May 30 17:55:04 2015	(r387976)
@@ -1,4 +1,4 @@
---- examples/chrony.conf.example2.orig	2014-01-31 20:12:59 +0800
+--- examples/chrony.conf.example2.orig	2015-04-07 14:35:16 UTC
 +++ examples/chrony.conf.example2
 @@ -1,9 +1,17 @@
  # Use public servers from the pool.ntp.org project.