Index: head/net/chrony/Makefile =================================================================== --- head/net/chrony/Makefile (revision 435516) +++ head/net/chrony/Makefile (revision 435517) @@ -1,58 +1,56 @@ # Created by: Masaki TAGAWA # $FreeBSD$ PORTNAME= chrony -PORTVERSION= 3.0 +PORTVERSION= 3.1 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 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 IPV6_CATEGORIES= ipv6 IPV6_CONFIGURE_OFF= --disable-ipv6 - -BROKEN_aarch64= Fails to compile: invalid operands to binary expression (double and double) 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/distinfo =================================================================== --- head/net/chrony/distinfo (revision 435516) +++ head/net/chrony/distinfo (revision 435517) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484669147 -SHA256 (chrony-3.0.tar.gz) = a0387b91a20f047856a56d6541a1cf920c91b53b32f74c123bcb70f1a5d2cd6d -SIZE (chrony-3.0.tar.gz) = 421433 +TIMESTAMP = 1488375273 +SHA256 (chrony-3.1.tar.gz) = 9d9107dcdb7768a03dc129d33b2a7a25f1eea2f5620bc85eb00cfea07c1b6075 +SIZE (chrony-3.1.tar.gz) = 424109 Index: head/net/chrony/files/patch-examples_chrony.conf.example1 =================================================================== --- head/net/chrony/files/patch-examples_chrony.conf.example1 (revision 435516) +++ head/net/chrony/files/patch-examples_chrony.conf.example1 (revision 435517) @@ -1,13 +1,13 @@ ---- examples/chrony.conf.example1.orig 2015-10-19 09:18:37 UTC +--- examples/chrony.conf.example1.orig 2017-01-31 10:22:11 UTC +++ examples/chrony.conf.example1 @@ -1,8 +1,8 @@ # Use public NTP servers from the pool.ntp.org project. -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 - # In first three updates step the system clock instead of slew - # if the adjustment is larger than 1 second. + # Allow the system clock to be stepped in the first three updates + # if its offset is larger than 1 second. Index: head/net/chrony/files/patch-examples_chrony.conf.example2 =================================================================== --- head/net/chrony/files/patch-examples_chrony.conf.example2 (revision 435516) +++ head/net/chrony/files/patch-examples_chrony.conf.example2 (revision 435517) @@ -1,23 +1,23 @@ ---- examples/chrony.conf.example2.orig 2015-10-19 09:18:37 UTC +--- 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 - # In first three updates step the system clock instead of slew - # if the adjustment is larger than 1 second. -@@ -19,7 +19,7 @@ rtcsync + # 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 - # Disable logging of client accesses. - noclientlog + # 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 435516) +++ head/net/chrony/files/patch-examples_chrony.conf.example3 (revision 435517) @@ -1,75 +1,66 @@ ---- examples/chrony.conf.example3.orig 2015-10-19 09:18:37 UTC +--- 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 # want to enable. The more obscure options are not included. Refer # to the documentation for these. # -@@ -47,7 +47,9 @@ +@@ -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 - # However, for dial-up use you probably want these instead. The word - # 'offline' means that the server is not visible at boot time. Use -@@ -58,7 +60,7 @@ - ! server bar.example.net offline - ! server baz.example.net offline - --! pool pool.ntp.org offline -+! pool 0.freebsd.pool.ntp.org offline - - # You may want to specify NTP 'peers' instead. If you run a network - # with a lot of computers and want several computers running chrony to -@@ -93,12 +95,12 @@ + ####################################################################### + ### 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 # chronyd can save the measurement history for the servers to files when # it it exits. This is useful in 2 situations: -@@ -116,7 +118,7 @@ driftfile /var/lib/chrony/drift +@@ -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 -@@ -145,6 +147,10 @@ driftfile /var/lib/chrony/drift +@@ -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 -@@ -259,7 +265,7 @@ driftfile /var/lib/chrony/drift +@@ -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 Index: head/net/chrony/files/patch-util.c =================================================================== --- head/net/chrony/files/patch-util.c (nonexistent) +++ head/net/chrony/files/patch-util.c (revision 435517) @@ -0,0 +1,11 @@ +--- util.c.orig 2017-01-31 10:22:11 UTC ++++ util.c +@@ -738,7 +738,7 @@ UTI_TimespecToNtp64(struct timespec *src + hi = lo = 0; + } else { + hi = htonl(sec + JAN_1970); +- lo = htonl(NSEC_PER_NTP64 * nsec); ++ lo = htonl((uint32_t)(NSEC_PER_NTP64 * nsec)); + + /* Add the fuzz */ + if (fuzz) { Property changes on: head/net/chrony/files/patch-util.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property