Index: head/net/chrony/Makefile =================================================================== --- head/net/chrony/Makefile (revision 454464) +++ head/net/chrony/Makefile (revision 454465) @@ -1,57 +1,58 @@ # Created by: Masaki TAGAWA # $FreeBSD$ PORTNAME= chrony PORTVERSION= 3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://download.tuxfamily.org/chrony/ MAINTAINER= yonas@fizk.net COMMENT= System clock synchronization client and server LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USERS= chronyd GROUPS= chronyd USES= cpe gmake libedit 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 INSTALL_TARGET= install PORTDOCS= FAQ NEWS README PORTEXAMPLES= chrony.conf.example1 chrony.conf.example2 \ 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 ${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 .include Index: head/net/chrony/files/chronyd.in =================================================================== --- head/net/chrony/files/chronyd.in (revision 454464) +++ head/net/chrony/files/chronyd.in (revision 454465) @@ -1,19 +1,20 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: chronyd # REQUIRE: DAEMON # . /etc/rc.subr name=chronyd rcvar=chronyd_enable command=%%PREFIX%%/sbin/${name} +rc_flags="${chronyd_flags}" load_rc_config ${name} : ${chronyd_enable="NO"} run_rc_command "$1" Index: head/net/chrony/files/patch-examples_chrony.conf.example2 =================================================================== --- head/net/chrony/files/patch-examples_chrony.conf.example2 (revision 454464) +++ head/net/chrony/files/patch-examples_chrony.conf.example2 (revision 454465) @@ -1,23 +1,23 @@ --- examples/chrony.conf.example2.orig 2017-01-31 10:22:11 UTC +++ examples/chrony.conf.example2 @@ -1,9 +1,9 @@ # Use public servers from the pool.ntp.org project. # Please consider joining the pool (http://www.pool.ntp.org/join.html). -pool pool.ntp.org iburst +pool 0.freebsd.pool.ntp.org iburst # Record the rate at which the system clock gains/losses time. -driftfile /var/lib/chrony/drift +driftfile /var/db/chrony/drift # Allow the system clock to be stepped in the first three updates # if its offset is larger than 1 second. @@ -26,7 +26,7 @@ rtcsync #local stratum 10 # 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 Index: head/net/chrony/files/patch-examples_chrony.conf.example3 =================================================================== --- head/net/chrony/files/patch-examples_chrony.conf.example3 (revision 454464) +++ head/net/chrony/files/patch-examples_chrony.conf.example3 (revision 454465) @@ -1,66 +1,66 @@ --- examples/chrony.conf.example3.orig 2017-01-31 10:22:11 UTC +++ examples/chrony.conf.example3 @@ -1,7 +1,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,9 @@ ! server bar.example.net iburst ! server baz.example.net iburst -! pool pool.ntp.org iburst +# This is a reasonable default setting to have on in typical cases for +# a workstation with a full-time internet connection: +pool 0.freebsd.pool.ntp.org iburst ####################################################################### ### AVOIDING POTENTIALLY BOGUS CHANGES TO YOUR CLOCK @@ -65,12 +67,12 @@ # immediately so that it doesn't gain or lose any more time. You # generally want this, so it is uncommented. -driftfile /var/lib/chrony/drift +driftfile /var/db/chrony/drift # If you want to enable NTP authentication with symmetric keys, you will need # 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: @@ -88,7 +90,7 @@ driftfile /var/lib/chrony/drift # Enable these two options to use this. ! dumponexit -! dumpdir /var/lib/chrony +! dumpdir /var/db/chrony # chronyd writes its process ID to a file. If you try to start a second # copy of chronyd, it will detect that the process named in the file is @@ -117,6 +119,10 @@ driftfile /var/lib/chrony/drift # only need this if you really enjoy looking at the logs, you want to # produce some graphs of your system's timekeeping performance, or you # need help in debugging a problem. +# +# If you enable logging, you may want to add an entry to a log rotation +# utility's configuration (e.g., newsyslog(8)). 'chronyc cyclelogs' +# should be used to signal chronyd that a log file has been renamed. ! logdir /var/log/chrony ! log measurements statistics tracking @@ -253,7 +259,7 @@ driftfile /var/lib/chrony/drift # You need to have 'enhanced RTC support' compiled into your Linux # kernel. (Note, these options apply only to Linux.) -! rtcfile /var/lib/chrony/rtc +! rtcfile /var/db/chrony/rtc # Your RTC can be set to keep Universal Coordinated Time (UTC) or local # time. (Local time means UTC +/- the effect of your timezone.) If you