svn commit: r454465 - in head/net/chrony: . files
Rodrigo Osorio
rodrigo at FreeBSD.org
Sat Nov 18 22:41:35 UTC 2017
Author: rodrigo
Date: Sat Nov 18 22:41:34 2017
New Revision: 454465
URL: https://svnweb.freebsd.org/changeset/ports/454465
Log:
Makes the NSS dependency explicit, and perform cleanup
Bump PORTREVISION
Before this patch if nss is installed when crony is built, there's a silent lib
dependency on nss, and if nss is subsequently uninstalled chrony breaks.
NSS is now turned on by default adding support for a number of more modern
hashing algorithms than md5.
Cleanup:
- --infodir is not a valid configure option (since 2.3 I think)
- USES=localbase instead of LDFLAGS
- add explicit --without-tomcrypt [1]
- add support for passing chronyd_flags to chronyd in rc.d script
- fix some hard-coded /usr/local in examples
PR: 217691
Submitted by: John Hein <z7dr6ut7gs at snkmail.com>
Approved by: Yonas Yanfa <yonas at fizk.net> (maintainer)
Modified:
head/net/chrony/Makefile
head/net/chrony/files/chronyd.in
head/net/chrony/files/patch-examples_chrony.conf.example2
head/net/chrony/files/patch-examples_chrony.conf.example3
Modified: head/net/chrony/Makefile
==============================================================================
--- head/net/chrony/Makefile Sat Nov 18 21:57:55 2017 (r454464)
+++ head/net/chrony/Makefile Sat Nov 18 22:41:34 2017 (r454465)
@@ -3,7 +3,7 @@
PORTNAME= chrony
PORTVERSION= 3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://download.tuxfamily.org/chrony/
@@ -21,11 +21,9 @@ CPE_VENDOR= tuxfamily
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
--chronyvardir=/var/db/${PORTNAME} \
- --infodir=${PREFIX}/info \
--sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \
--datarootdir=${DATADIR} --docdir=${DOCSDIR} \
- --with-user=chronyd
-LDFLAGS+= -L${LOCALBASE}/lib
+ --with-user=chronyd --without-tomcrypt
USE_RC_SUBR= chronyd
ALL_TARGET= all
@@ -35,13 +33,16 @@ PORTEXAMPLES= chrony.conf.example1 chrony.conf.example
chrony.conf.example3 chrony.keys.example
# XXX: there are also other potentially useful options worth looking into:
-# --without-nss Don't use NSS even if it is available
-# --without-tomcrypt Don't use libtomcrypt even if it is available
# --disable-pps Disable PPS API support
-OPTIONS_DEFINE= IPV6
+OPTIONS_DEFINE= IPV6 NSS
+OPTIONS_DEFAULT= NSS
IPV6_CATEGORIES= ipv6
IPV6_CONFIGURE_OFF= --disable-ipv6
+
+NSS_DESC= Add support for more hashing algorithms
+NSS_CONFIGURE_OFF= --without-nss
+NSS_USES= pkgconfig
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
Modified: head/net/chrony/files/chronyd.in
==============================================================================
--- head/net/chrony/files/chronyd.in Sat Nov 18 21:57:55 2017 (r454464)
+++ head/net/chrony/files/chronyd.in Sat Nov 18 22:41:34 2017 (r454465)
@@ -11,6 +11,7 @@
name=chronyd
rcvar=chronyd_enable
command=%%PREFIX%%/sbin/${name}
+rc_flags="${chronyd_flags}"
load_rc_config ${name}
Modified: head/net/chrony/files/patch-examples_chrony.conf.example2
==============================================================================
--- head/net/chrony/files/patch-examples_chrony.conf.example2 Sat Nov 18 21:57:55 2017 (r454464)
+++ head/net/chrony/files/patch-examples_chrony.conf.example2 Sat Nov 18 22:41:34 2017 (r454465)
@@ -17,7 +17,7 @@
# Specify file containing keys for NTP authentication.
-#keyfile /etc/chrony.keys
-+#keyfile /usr/local/etc/chrony.keys
++#keyfile %%PREFIX%%/etc/chrony.keys
# Specify directory for log files.
logdir /var/log/chrony
Modified: head/net/chrony/files/patch-examples_chrony.conf.example3
==============================================================================
--- head/net/chrony/files/patch-examples_chrony.conf.example3 Sat Nov 18 21:57:55 2017 (r454464)
+++ head/net/chrony/files/patch-examples_chrony.conf.example3 Sat Nov 18 22:41:34 2017 (r454465)
@@ -5,7 +5,7 @@
#
# This is an example chrony configuration file. You should copy it to
-# /etc/chrony.conf after uncommenting and editing the options that you
-+# /usr/local/etc/chrony.conf after uncommenting and editing the options that you
++# %%PREFIX%%/etc/chrony.conf after uncommenting and editing the options that you
# want to enable. The more obscure options are not included. Refer
# to the documentation for these.
#
@@ -31,7 +31,7 @@
# to uncomment the following line and edit the file to set up the keys.
-! keyfile /etc/chrony.keys
-+! keyfile /usr/local/etc/chrony.keys
++! keyfile %%PREFIX%%/etc/chrony.keys
# chronyd can save the measurement history for the servers to files when
# it it exits. This is useful in 2 situations:
More information about the svn-ports-head
mailing list