diff options
| -rw-r--r-- | net/chrony/Makefile | 4 | ||||
| -rw-r--r-- | net/chrony/distinfo | 6 | ||||
| -rw-r--r-- | net/chrony/files/patch-examples_chrony.conf.example1 | 6 | ||||
| -rw-r--r-- | net/chrony/files/patch-examples_chrony.conf.example2 | 12 | ||||
| -rw-r--r-- | net/chrony/files/patch-examples_chrony.conf.example3 | 25 | ||||
| -rw-r--r-- | net/chrony/files/patch-util.c | 11 |
6 files changed, 32 insertions, 32 deletions
diff --git a/net/chrony/Makefile b/net/chrony/Makefile index bb2d5891b871..916b7d86f4cf 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chrony -PORTVERSION= 3.0 +PORTVERSION= 3.1 CATEGORIES= net MASTER_SITES= http://download.tuxfamily.org/chrony/ @@ -42,8 +42,6 @@ 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 diff --git a/net/chrony/distinfo b/net/chrony/distinfo index 79cf4a79212e..38348f935d6c 100644 --- a/net/chrony/distinfo +++ b/net/chrony/distinfo @@ -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 diff --git a/net/chrony/files/patch-examples_chrony.conf.example1 b/net/chrony/files/patch-examples_chrony.conf.example1 index fc005cd87ba5..d5167768d890 100644 --- a/net/chrony/files/patch-examples_chrony.conf.example1 +++ b/net/chrony/files/patch-examples_chrony.conf.example1 @@ -1,4 +1,4 @@ ---- 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. @@ -9,5 +9,5 @@ -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. diff --git a/net/chrony/files/patch-examples_chrony.conf.example2 b/net/chrony/files/patch-examples_chrony.conf.example2 index 14de65fac959..bbb5bb6dbc14 100644 --- a/net/chrony/files/patch-examples_chrony.conf.example2 +++ b/net/chrony/files/patch-examples_chrony.conf.example2 @@ -1,4 +1,4 @@ ---- 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. @@ -10,14 +10,14 @@ -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 diff --git a/net/chrony/files/patch-examples_chrony.conf.example3 b/net/chrony/files/patch-examples_chrony.conf.example3 index 273e15d75045..707c03dc3da0 100644 --- a/net/chrony/files/patch-examples_chrony.conf.example3 +++ b/net/chrony/files/patch-examples_chrony.conf.example3 @@ -1,4 +1,4 @@ ---- 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 @@ ####################################################################### @@ -9,7 +9,7 @@ # 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 @@ -18,18 +18,9 @@ +# 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. @@ -44,7 +35,7 @@ # 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 @@ -53,7 +44,7 @@ # 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. @@ -64,7 +55,7 @@ ! 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.) diff --git a/net/chrony/files/patch-util.c b/net/chrony/files/patch-util.c new file mode 100644 index 000000000000..abee9f8bbfef --- /dev/null +++ b/net/chrony/files/patch-util.c @@ -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) { |