Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 May 2018 03:01:58 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r469426 - head/net/chrony
Message-ID:  <201805090301.w4931wG2037289@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Wed May  9 03:01:58 2018
New Revision: 469426
URL: https://svnweb.freebsd.org/changeset/ports/469426

Log:
  net/chrony: Update to 3.3
  
  - Add explicit DOCS, EXAMPLES options
  - Replace %%PREFIX%% in sample files
  - Make sure chronyc is really linked with libedit from ports
  - Add support for security/nettle and use it by default since chrony crashes
    on startup when built with NSS. [1]
  
  PR:		227779, 223840 [1]
  Submitted by:	takefu@airport.fm
  Approved by:	maintainer

Modified:
  head/net/chrony/Makefile
  head/net/chrony/distinfo

Modified: head/net/chrony/Makefile
==============================================================================
--- head/net/chrony/Makefile	Wed May  9 02:56:53 2018	(r469425)
+++ head/net/chrony/Makefile	Wed May  9 03:01:58 2018	(r469426)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chrony
-PORTVERSION=	3.1
-PORTREVISION=	3
+PORTVERSION=	3.3
 CATEGORIES=	net
 MASTER_SITES=	http://download.tuxfamily.org/chrony/
 
@@ -23,6 +22,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--chronyvardir=/var/db/${PORTNAME} \
 		--sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \
 		--datarootdir=${DATADIR} --docdir=${DOCSDIR} \
+		--with-readline-library=${LOCALBASE}/lib \
 		--with-user=chronyd --without-tomcrypt
 USE_RC_SUBR=	chronyd
 
@@ -34,26 +34,38 @@ PORTEXAMPLES=	chrony.conf.example1 chrony.conf.example
 
 # XXX: there are also other potentially useful options worth looking into:
 #  --disable-pps        Disable PPS API support
-OPTIONS_DEFINE=		IPV6 NSS
-OPTIONS_DEFAULT=	NSS
+OPTIONS_DEFINE=		DOCS EXAMPLES IPV6 NETTLE NSS
+OPTIONS_DEFAULT=	IPV6 NETTLE
 
+NETTLE_DESC=		Nettle crypto library support
+NSS_DESC=		Add support for more hashing algorithms
+
 IPV6_CATEGORIES=	ipv6
 IPV6_CONFIGURE_OFF=	--disable-ipv6
-
-NSS_DESC=		Add support for more hashing algorithms
+NETTLE_CONFIGURE_OFF=	--without-nettle
+NETTLE_LIB_DEPENDS=	libnettle.so:security/nettle
+NSS_BROKEN=		Crashes on startup with NSS. See https://bugs.freebsd.org/223840
 NSS_CONFIGURE_OFF=	--without-nss
 NSS_LIB_DEPENDS=	libfreebl3.so:security/nss
 NSS_USES=		pkgconfig
 
+post-patch:
+	@cd ${WRKSRC}/examples && \
+		${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${PORTEXAMPLES}
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/examples/,} \
-		${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/chrony.conf.example3 \
 		${STAGEDIR}${PREFIX}/etc/chrony.conf.sample
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/examples && \
+		${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/net/chrony/distinfo
==============================================================================
--- head/net/chrony/distinfo	Wed May  9 02:56:53 2018	(r469425)
+++ head/net/chrony/distinfo	Wed May  9 03:01:58 2018	(r469426)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488375273
-SHA256 (chrony-3.1.tar.gz) = 9d9107dcdb7768a03dc129d33b2a7a25f1eea2f5620bc85eb00cfea07c1b6075
-SIZE (chrony-3.1.tar.gz) = 424109
+TIMESTAMP = 1524659947
+SHA256 (chrony-3.3.tar.gz) = 0d1fb2d5875032f2d5a86f3770374c87ee4c941916f64171e81f7684f2a73128
+SIZE (chrony-3.3.tar.gz) = 443571



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805090301.w4931wG2037289>