Attachment #163359 for bug #204018




# $FreeBSD: head/net/chrony/Makefile 387180 2015-05-23 18:59:11Z pi $

PORTNAME=	chrony
PORTVERSION=	2.2
CATEGORIES=	net
MASTER_SITES=	http://download.tuxfamily.org/chrony/


USES=		cpe gmake makeinfo readline
CPE_VENDOR=	tuxfamily
HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	--prefix=${PREFIX} \
		--sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \
		--datarootdir=${DATADIR} --docdir=${DOCSDIR}
USE_RC_SUBR=	chronyd

PORTDOCS=	COPYING README chrony.txt

# 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

	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd

post-install:
	${INSTALL_DATA} ${WRKSRC}/examples/chrony.conf.example3 ${STAGEDIR}${PREFIX}/etc/chrony.conf.sample
	${INSTALL_DATA} ${WRKSRC}/examples/chrony.keys.example ${STAGEDIR}${PREFIX}/etc/chrony.keys.sample
.endfor

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)/home/pi/myp/net/chrony/distinfo (-2 / +2 lines)
1	SHA256 (chrony-1.31.1.tar.gz) = 0ba9f4b58e20b2eaae921eb8c798108ef72d8ea6fdcc7eb0167b56690d212348	1	SHA256 (chrony-2.2.tar.gz) = d3fd820fa63badf54ee0e48a649b94ea739df3aac5efa104bd90f89795aa2485
2	SIZE (chrony-1.31.1.tar.gz) = 395797	2	SIZE (chrony-2.2.tar.gz) = 340285




--- examples/chrony.conf.example.orig	2015-04-07 14:35:16 UTC
+++ examples/chrony.conf.example
@@ -42,6 +42,13 @@
 # Failing that, there are a lot of public NTP servers.  There is a list
 # you can access at http://support.ntp.org/bin/view/Servers/WebHome or
 # you can use servers from the pool.ntp.org project.
+#
+# The option `iburst' is used for faster initial synchronization.
+
+server 0.freebsd.pool.ntp.org iburst
+server 1.freebsd.pool.ntp.org iburst
+server 2.freebsd.pool.ntp.org iburst
+#server 3.freebsd.pool.ntp.org iburst
 
 ! server 0.pool.ntp.org iburst
 ! server 1.pool.ntp.org iburst
@@ -98,7 +105,7 @@ driftfile /var/lib/chrony/drift
 # exchanges between cooperating machines.)  Again, this option is
 # assumed by default.
 
-keyfile /etc/chrony.keys
+keyfile /usr/local/etc/chrony.keys
 
 # Tell chronyd which numbered key in the file is used as the password
 # for chronyc. (You can pick any integer up to 2**32-1.  '1' is just a
@@ -132,7 +139,7 @@ generatecommandkey
 # still running and bail out.  If you want to change the path to the PID
 # file, uncomment this line and edit it.  The default path is shown.
 
-! pidfile /var/run/chronyd.pid
+pidfile /var/run/chronyd.pid
 
 #######################################################################
 ### INITIAL CLOCK CORRECTION
@@ -155,8 +162,8 @@ generatecommandkey
 # 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
+logdir /var/log/chrony
+log measurements statistics tracking
 
 # If you have real time clock support enabled (see below), you might want
 # this line instead:




--- examples/chrony.conf.example2.orig	2015-04-07 14:35:16 UTC
+++ examples/chrony.conf.example2
@@ -1,9 +1,17 @@
 # Use public servers from the pool.ntp.org project.
 # Please consider joining the pool (http://www.pool.ntp.org/join.html).
-server 0.pool.ntp.org iburst
-server 1.pool.ntp.org iburst
-server 2.pool.ntp.org iburst
-server 3.pool.ntp.org iburst
+#
+# The option `iburst' is used for faster initial synchronization.
+#
+server 0.freebsd.pool.ntp.org iburst
+server 1.freebsd.pool.ntp.org iburst
+server 2.freebsd.pool.ntp.org iburst
+#server 3.freebsd.pool.ntp.org iburst
+
+#server 0.pool.ntp.org iburst
+#server 1.pool.ntp.org iburst
+#server 2.pool.ntp.org iburst
+#server 3.pool.ntp.org iburst
 
 # Ignore stratum in source selection.
 stratumweight 0
@@ -28,7 +36,7 @@ bindcmdaddress ::1
 # Serve time even if not synchronized to any NTP server.
 #local stratum 10
 
-keyfile /etc/chrony.keys
+keyfile /usr/local/etc/chrony.keys
 
 # Specify the key used as password for chronyc.
 commandkey 1




--- examples/chrony.conf.example3.orig	2015-11-20 20:01:24 UTC
+++ examples/chrony.conf.example3
@@ -43,12 +43,14 @@
 # you can access at http://support.ntp.org/bin/view/Servers/WebHome or
 # you can use servers from the pool.ntp.org project.
 
-! server foo.example.net iburst
-! server bar.example.net iburst
-! server baz.example.net iburst
+#
+# The option `iburst' is used for faster initial synchronization.
+
+server 0.freebsd.pool.ntp.org iburst
+server 1.freebsd.pool.ntp.org iburst
+server 2.freebsd.pool.ntp.org iburst
+#server 3.freebsd.pool.ntp.org iburst
 
-! pool 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
 # chronyc's 'online' command to tell chronyd that these servers have
@@ -98,7 +100,7 @@ driftfile /var/lib/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
+/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:
@@ -123,7 +125,7 @@ driftfile /var/lib/chrony/drift
 # still running and bail out.  If you want to change the path to the PID
 # file, uncomment this line and edit it.  The default path is shown.
 
-! pidfile /var/run/chronyd.pid
+pidfile /var/run/chronyd.pid
 
 #######################################################################
 ### INITIAL CLOCK CORRECTION
@@ -146,8 +148,8 @@ driftfile /var/lib/chrony/drift
 # 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
+logdir /var/log/chrony
+log measurements statistics tracking
 
 # If you have real time clock support enabled (see below), you might want
 # this line instead:

Lines 1-11 Link Here

(-)/home/pi/myp/net/chrony/pkg-plist (-5 / +3 lines)
1	bin/chronyc	1	bin/chronyc
2	etc/chrony.conf.example	2	@sample etc/chrony.conf.sample
3	etc/chrony.conf.example2	3	@sample etc/chrony.keys.sample
4	etc/chrony.keys.example
5	man/man1/chrony.1.gz
6	man/man1/chronyc.1.gz	4	man/man1/chronyc.1.gz
7	man/man5/chrony.conf.5.gz	5	man/man5/chrony.conf.5.gz
8	man/man8/chronyd.8.gz	6	man/man8/chronyd.8.gz
9	@(,,4755) sbin/chronyd	7	sbin/chronyd
10	@dir /var/lib/chrony	8	@dir /var/lib/chrony
11	@dir /var/lib	9	@dir /var/lib

Return to bug 204018

Lines 2-8 Link Here

(-)/home/pi/myp/net/chrony/Makefile (-7 / +5 lines)
2	# $FreeBSD: head/net/chrony/Makefile 387180 2015-05-23 18:59:11Z pi $	2	# $FreeBSD: head/net/chrony/Makefile 387180 2015-05-23 18:59:11Z pi $
3		3
4	PORTNAME= chrony	4	PORTNAME= chrony
5	PORTVERSION= 1.31.1	5	PORTVERSION= 2.2
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 18-29 Link Here
18	USES= cpe gmake makeinfo readline	18	USES= cpe gmake makeinfo readline
19	CPE_VENDOR= tuxfamily	19	CPE_VENDOR= tuxfamily
20	HAS_CONFIGURE= yes	20	HAS_CONFIGURE= yes
21	CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \	21	CONFIGURE_ARGS= --prefix=${PREFIX} \
		22	--sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \
22	--datarootdir=${DATADIR} --docdir=${DOCSDIR}	23	--datarootdir=${DATADIR} --docdir=${DOCSDIR}
23	USE_RC_SUBR= chronyd	24	USE_RC_SUBR= chronyd
24		25
25	PORTDOCS= COPYING README chrony.txt
26
27	# XXX: there are also other potentially useful options worth looking into:	26	# XXX: there are also other potentially useful options worth looking into:
28	# --without-nss Don't use NSS even if it is available	27	# --without-nss Don't use NSS even if it is available
29	# --without-tomcrypt Don't use libtomcrypt even if it is available	28	# --without-tomcrypt Don't use libtomcrypt even if it is available
Lines 39-46 Link Here
39	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd	38	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd
40		39
41	post-install:	40	post-install:
42	.for f in chrony.conf.example chrony.conf.example2 chrony.keys.example	41	${INSTALL_DATA} ${WRKSRC}/examples/chrony.conf.example3 ${STAGEDIR}${PREFIX}/etc/chrony.conf.sample
43	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${PREFIX}/etc	42	${INSTALL_DATA} ${WRKSRC}/examples/chrony.keys.example ${STAGEDIR}${PREFIX}/etc/chrony.keys.sample
44	.endfor
45		43
46	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Lines 1-45 Link Here

(-)/home/pi/myp/net/chrony/files/patch-examples-chrony.conf.example (-45 lines)
1	--- examples/chrony.conf.example.orig 2015-04-07 14:35:16 UTC
2	+++ examples/chrony.conf.example
3	@@ -42,6 +42,13 @@
4	# Failing that, there are a lot of public NTP servers. There is a list
5	# you can access at http://support.ntp.org/bin/view/Servers/WebHome or
6	# you can use servers from the pool.ntp.org project.
7	+#
8	+# The option `iburst' is used for faster initial synchronization.
9	+
10	+server 0.freebsd.pool.ntp.org iburst
11	+server 1.freebsd.pool.ntp.org iburst
12	+server 2.freebsd.pool.ntp.org iburst
13	+#server 3.freebsd.pool.ntp.org iburst
14
15	! server 0.pool.ntp.org iburst
16	! server 1.pool.ntp.org iburst
17	@@ -98,7 +105,7 @@ driftfile /var/lib/chrony/drift
18	# exchanges between cooperating machines.) Again, this option is
19	# assumed by default.
20
21	-keyfile /etc/chrony.keys
22	+keyfile /usr/local/etc/chrony.keys
23
24	# Tell chronyd which numbered key in the file is used as the password
25	# for chronyc. (You can pick any integer up to 2**32-1. '1' is just a
26	@@ -132,7 +139,7 @@ generatecommandkey
27	# still running and bail out. If you want to change the path to the PID
28	# file, uncomment this line and edit it. The default path is shown.
29
30	-! pidfile /var/run/chronyd.pid
31	+pidfile /var/run/chronyd.pid
32
33	#######################################################################
34	### INITIAL CLOCK CORRECTION
35	@@ -155,8 +162,8 @@ generatecommandkey
36	# produce some graphs of your system's timekeeping performance, or you
37	# need help in debugging a problem.
38
39	-! logdir /var/log/chrony
40	-! log measurements statistics tracking
41	+logdir /var/log/chrony
42	+log measurements statistics tracking
43
44	# If you have real time clock support enabled (see below), you might want
45	# this line instead:

Lines 1-33 Link Here

(-)/home/pi/myp/net/chrony/files/patch-examples-chrony.conf.example2 (-33 lines)
1	--- examples/chrony.conf.example2.orig 2015-04-07 14:35:16 UTC
2	+++ examples/chrony.conf.example2
3	@@ -1,9 +1,17 @@
4	# Use public servers from the pool.ntp.org project.
5	# Please consider joining the pool (http://www.pool.ntp.org/join.html).
6	-server 0.pool.ntp.org iburst
7	-server 1.pool.ntp.org iburst
8	-server 2.pool.ntp.org iburst
9	-server 3.pool.ntp.org iburst
10	+#
11	+# The option `iburst' is used for faster initial synchronization.
12	+#
13	+server 0.freebsd.pool.ntp.org iburst
14	+server 1.freebsd.pool.ntp.org iburst
15	+server 2.freebsd.pool.ntp.org iburst
16	+#server 3.freebsd.pool.ntp.org iburst
17	+
18	+#server 0.pool.ntp.org iburst
19	+#server 1.pool.ntp.org iburst
20	+#server 2.pool.ntp.org iburst
21	+#server 3.pool.ntp.org iburst
22
23	# Ignore stratum in source selection.
24	stratumweight 0
25	@@ -28,7 +36,7 @@ bindcmdaddress ::1
26	# Serve time even if not synchronized to any NTP server.
27	#local stratum 10
28
29	-keyfile /etc/chrony.keys
30	+keyfile /usr/local/etc/chrony.keys
31
32	# Specify the key used as password for chronyc.
33	commandkey 1

Line 0 Link Here

(-)/home/pi/myp/net/chrony/files/patch-examples_chrony.conf.example3 (+51 lines)
	1	--- examples/chrony.conf.example3.orig 2015-11-20 20:01:24 UTC
	2	+++ examples/chrony.conf.example3
	3	@@ -43,12 +43,14 @@
	4	# you can access at http://support.ntp.org/bin/view/Servers/WebHome or
	5	# you can use servers from the pool.ntp.org project.
	6
	7	-! server foo.example.net iburst
	8	-! server bar.example.net iburst
	9	-! server baz.example.net iburst
	10	+#
	11	+# The option `iburst' is used for faster initial synchronization.
	12	+
	13	+server 0.freebsd.pool.ntp.org iburst
	14	+server 1.freebsd.pool.ntp.org iburst
	15	+server 2.freebsd.pool.ntp.org iburst
	16	+#server 3.freebsd.pool.ntp.org iburst
	17
	18	-! pool pool.ntp.org iburst
	19	-
	20	# However, for dial-up use you probably want these instead. The word
	21	# 'offline' means that the server is not visible at boot time. Use
	22	# chronyc's 'online' command to tell chronyd that these servers have
	23	@@ -98,7 +100,7 @@ driftfile /var/lib/chrony/drift
	24	# If you want to enable NTP authentication with symmetric keys, you will need
	25	# to uncomment the following line and edit the file to set up the keys.
	26
	27	-! keyfile /etc/chrony.keys
	28	+/usr/local/etc/chrony.keys
	29
	30	# chronyd can save the measurement history for the servers to files when
	31	# it it exits. This is useful in 2 situations:
	32	@@ -123,7 +125,7 @@ driftfile /var/lib/chrony/drift
	33	# still running and bail out. If you want to change the path to the PID
	34	# file, uncomment this line and edit it. The default path is shown.
	35
	36	-! pidfile /var/run/chronyd.pid
	37	+pidfile /var/run/chronyd.pid
	38
	39	#######################################################################
	40	### INITIAL CLOCK CORRECTION
	41	@@ -146,8 +148,8 @@ driftfile /var/lib/chrony/drift
	42	# produce some graphs of your system's timekeeping performance, or you
	43	# need help in debugging a problem.
	44
	45	-! logdir /var/log/chrony
	46	-! log measurements statistics tracking
	47	+logdir /var/log/chrony
	48	+log measurements statistics tracking
	49
	50	# If you have real time clock support enabled (see below), you might want
	51	# this line instead: