Attachment #180553 for bug #217573

View | Details | Raw Unified | Return to bug 217573
Collapse All | Expand All

Lines 2-8 Link Here

(-)b/net/chrony/Makefile (-3 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= chrony	4	PORTNAME= chrony
5	PORTVERSION= 3.0	5	PORTVERSION= 3.1
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://download.tuxfamily.org/chrony/	7	MASTER_SITES= http://download.tuxfamily.org/chrony/
8		8
Lines 42-49 OPTIONS_DEFINE= IPV6 Link Here
42	IPV6_CATEGORIES= ipv6	42	IPV6_CATEGORIES= ipv6
43	IPV6_CONFIGURE_OFF= --disable-ipv6	43	IPV6_CONFIGURE_OFF= --disable-ipv6
44		44
45	BROKEN_aarch64= Fails to compile: invalid operands to binary expression (double and double)
46
47	post-install:	45	post-install:
48	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc	46	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
49	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd	47	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd

Lines 1-3 Link Here

(-)b/net/chrony/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1484669147	1	TIMESTAMP = 1488375273
2	SHA256 (chrony-3.0.tar.gz) = a0387b91a20f047856a56d6541a1cf920c91b53b32f74c123bcb70f1a5d2cd6d	2	SHA256 (chrony-3.1.tar.gz) = 9d9107dcdb7768a03dc129d33b2a7a25f1eea2f5620bc85eb00cfea07c1b6075
3	SIZE (chrony-3.0.tar.gz) = 421433	3	SIZE (chrony-3.1.tar.gz) = 424109

Lines 1-4 Link Here

(-)b/net/chrony/files/patch-examples_chrony.conf.example1 (-3 / +3 lines)
1	--- examples/chrony.conf.example1.orig 2015-10-19 09:18:37 UTC	1	--- examples/chrony.conf.example1.orig 2017-01-31 10:22:11 UTC
2	+++ examples/chrony.conf.example1	2	+++ examples/chrony.conf.example1
3	@@ -1,8 +1,8 @@	3	@@ -1,8 +1,8 @@
4	# Use public NTP servers from the pool.ntp.org project.	4	# Use public NTP servers from the pool.ntp.org project.
Lines 9-13 Link Here
9	-driftfile /var/lib/chrony/drift	9	-driftfile /var/lib/chrony/drift
10	+driftfile /var/db/chrony/drift	10	+driftfile /var/db/chrony/drift
11		11
12	# In first three updates step the system clock instead of slew	12	# Allow the system clock to be stepped in the first three updates
13	# if the adjustment is larger than 1 second.	13	# if its offset is larger than 1 second.




--- 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.

-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
 
 # Specify directory for log files.
 logdir /var/log/chrony




--- examples/chrony.conf.example3.orig	2017-01-31 10:22:11 UTC
+++ examples/chrony.conf.example3
@@ -1,7 +1,7 @@
 #######################################################################

 # 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
 

+# 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 @@
 ! 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 @@
 # immediately so that it doesn't gain or lose any more time.  You
 # generally want this, so it is uncommented.
 

 
 # 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

 
 # 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.

 
 ! 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.)
 

Added Link Here

(-)b/net/chrony/files/patch-util.c (+11 lines)
1	--- util.c.orig 2017-01-31 10:22:11 UTC
2	+++ util.c
3	@@ -738,7 +738,7 @@ UTI_TimespecToNtp64(struct timespec *src
4	hi = lo = 0;
5	} else {
6	hi = htonl(sec + JAN_1970);
7	- lo = htonl(NSEC_PER_NTP64 * nsec);
8	+ lo = htonl((uint32_t)(NSEC_PER_NTP64 * nsec));
9
10	/* Add the fuzz */
11	if (fuzz) {

Return to bug 217573

Lines 1-4 Link Here

(-)b/net/chrony/files/patch-examples_chrony.conf.example2 (-6 / +6 lines)
1	--- examples/chrony.conf.example2.orig 2015-10-19 09:18:37 UTC	1	--- examples/chrony.conf.example2.orig 2017-01-31 10:22:11 UTC
2	+++ examples/chrony.conf.example2	2	+++ examples/chrony.conf.example2
3	@@ -1,9 +1,9 @@	3	@@ -1,9 +1,9 @@
4	# Use public servers from the pool.ntp.org project.	4	# Use public servers from the pool.ntp.org project.
Lines 10-23 Link Here
10	-driftfile /var/lib/chrony/drift	10	-driftfile /var/lib/chrony/drift
11	+driftfile /var/db/chrony/drift	11	+driftfile /var/db/chrony/drift
12		12
13	# In first three updates step the system clock instead of slew	13	# Allow the system clock to be stepped in the first three updates
14	# if the adjustment is larger than 1 second.	14	# if its offset is larger than 1 second.
15	@@ -19,7 +19,7 @@ rtcsync	15	@@ -26,7 +26,7 @@ rtcsync
16	#local stratum 10	16	#local stratum 10
17		17
18	# Specify file containing keys for NTP authentication.	18	# Specify file containing keys for NTP authentication.
19	-#keyfile /etc/chrony.keys	19	-#keyfile /etc/chrony.keys
20	+#keyfile /usr/local/etc/chrony.keys	20	+#keyfile /usr/local/etc/chrony.keys
21		21
22	# Disable logging of client accesses.	22	# Specify directory for log files.
23	noclientlog	23	logdir /var/log/chrony

Lines 1-4 Link Here

(-)b/net/chrony/files/patch-examples_chrony.conf.example3 (-17 / +8 lines)
1	--- examples/chrony.conf.example3.orig 2015-10-19 09:18:37 UTC	1	--- examples/chrony.conf.example3.orig 2017-01-31 10:22:11 UTC
2	+++ examples/chrony.conf.example3	2	+++ examples/chrony.conf.example3
3	@@ -1,7 +1,7 @@	3	@@ -1,7 +1,7 @@
4	#######################################################################	4	#######################################################################
Lines 9-15 Link Here
9	# want to enable. The more obscure options are not included. Refer	9	# want to enable. The more obscure options are not included. Refer
10	# to the documentation for these.	10	# to the documentation for these.
11	#	11	#
12	@@ -47,7 +47,9 @@	12	@@ -31,7 +31,9 @@
13	! server bar.example.net iburst	13	! server bar.example.net iburst
14	! server baz.example.net iburst	14	! server baz.example.net iburst
15		15
Lines 18-35 Link Here
18	+# a workstation with a full-time internet connection:	18	+# a workstation with a full-time internet connection:
19	+pool 0.freebsd.pool.ntp.org iburst	19	+pool 0.freebsd.pool.ntp.org iburst
20		20
21	# However, for dial-up use you probably want these instead. The word	21	#######################################################################
22	# 'offline' means that the server is not visible at boot time. Use	22	### AVOIDING POTENTIALLY BOGUS CHANGES TO YOUR CLOCK
23	@@ -58,7 +60,7 @@	23	@@ -65,12 +67,12 @@
24	! server bar.example.net offline
25	! server baz.example.net offline
26
27	-! pool pool.ntp.org offline
28	+! pool 0.freebsd.pool.ntp.org offline
29
30	# You may want to specify NTP 'peers' instead. If you run a network
31	# with a lot of computers and want several computers running chrony to
32	@@ -93,12 +95,12 @@
33	# immediately so that it doesn't gain or lose any more time. You	24	# immediately so that it doesn't gain or lose any more time. You
34	# generally want this, so it is uncommented.	25	# generally want this, so it is uncommented.
35		26
Lines 44-50 Link Here
44		35
45	# chronyd can save the measurement history for the servers to files when	36	# chronyd can save the measurement history for the servers to files when
46	# it it exits. This is useful in 2 situations:	37	# it it exits. This is useful in 2 situations:
47	@@ -116,7 +118,7 @@ driftfile /var/lib/chrony/drift	38	@@ -88,7 +90,7 @@ driftfile /var/lib/chrony/drift
48	# Enable these two options to use this.	39	# Enable these two options to use this.
49		40
50	! dumponexit	41	! dumponexit
Lines 53-59 Link Here
53		44
54	# chronyd writes its process ID to a file. If you try to start a second	45	# chronyd writes its process ID to a file. If you try to start a second
55	# copy of chronyd, it will detect that the process named in the file is	46	# copy of chronyd, it will detect that the process named in the file is
56	@@ -145,6 +147,10 @@ driftfile /var/lib/chrony/drift	47	@@ -117,6 +119,10 @@ driftfile /var/lib/chrony/drift
57	# only need this if you really enjoy looking at the logs, you want to	48	# only need this if you really enjoy looking at the logs, you want to
58	# produce some graphs of your system's timekeeping performance, or you	49	# produce some graphs of your system's timekeeping performance, or you
59	# need help in debugging a problem.	50	# need help in debugging a problem.
Lines 64-70 Link Here
64		55
65	! logdir /var/log/chrony	56	! logdir /var/log/chrony
66	! log measurements statistics tracking	57	! log measurements statistics tracking
67	@@ -259,7 +265,7 @@ driftfile /var/lib/chrony/drift	58	@@ -253,7 +259,7 @@ driftfile /var/lib/chrony/drift
68	# You need to have 'enhanced RTC support' compiled into your Linux	59	# You need to have 'enhanced RTC support' compiled into your Linux
69	# kernel. (Note, these options apply only to Linux.)	60	# kernel. (Note, these options apply only to Linux.)
70		61