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

(-)Makefile (-7 / +17 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
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 19-29 Link Here
19
CPE_VENDOR=	tuxfamily
19
CPE_VENDOR=	tuxfamily
20
HAS_CONFIGURE=	yes
20
HAS_CONFIGURE=	yes
21
CONFIGURE_ARGS=	--prefix=${PREFIX} \
21
CONFIGURE_ARGS=	--prefix=${PREFIX} \
22
		--chronyvardir=/var/db/${PORTNAME} \
23
		--infodir=${PREFIX}/info \
22
		--sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \
24
		--sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \
23
		--datarootdir=${DATADIR} --docdir=${DOCSDIR}
25
		--datarootdir=${DATADIR} --docdir=${DOCSDIR}
24
USE_RC_SUBR=	chronyd
26
USE_RC_SUBR=	chronyd
25
27
26
PORTDOCS=	COPYING README chrony.txt
28
ALL_TARGET=	all docs
29
INSTALL_TARGET=	install install-docs
30
INFO=		chrony
31
EXTRAPORTDOCS=	FAQ NEWS README
32
PORTDOCS=	chrony.html chrony.txt ${EXTRAPORTDOCS}
33
PORTEXAMPLES=	chrony.conf.example1 chrony.conf.example2 \
34
	chrony.conf.example3 chrony.keys.example
27
35
28
# XXX: there are also other potentially useful options worth looking into:
36
# XXX: there are also other potentially useful options worth looking into:
29
#  --without-nss        Don't use NSS even if it is available
37
#  --without-nss        Don't use NSS even if it is available
Lines 38-47 Link Here
38
post-stage:
46
post-stage:
39
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
47
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
40
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd
48
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd
49
	cd ${WRKSRC}/${f} && \
50
		${INSTALL_DATA} ${EXTRAPORTDOCS} ${STAGEDIR}${DOCSDIR}
51
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
52
	cd ${WRKSRC}/examples && \
53
		${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
54
	cd ${WRKSRC}/examples && \
55
		${INSTALL_DATA} chrony.conf.example3 ${STAGEDIR}${PREFIX}/etc/chrony.conf.sample
41
56
42
post-install:
43
.for f in chrony.conf.example chrony.conf.example2 chrony.keys.example
44
	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${PREFIX}/etc
45
.endfor
46
47
.include <bsd.port.mk>
57
.include <bsd.port.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
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
(-)files/patch-examples-chrony.conf.example (-45 lines)
Lines 1-45 Link Here
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:
(-)files/patch-examples-chrony.conf.example2 (-33 lines)
Lines 1-33 Link Here
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
(-)files/patch-examples_chrony.conf.example1 (+13 lines)
Line 0 Link Here
1
--- examples/chrony.conf.example1.orig	2015-10-19 09:18:37 UTC
2
+++ examples/chrony.conf.example1
3
@@ -1,8 +1,8 @@
4
 # Use public NTP servers from the pool.ntp.org project.
5
-pool pool.ntp.org iburst
6
+pool 0.freebsd.pool.ntp.org iburst
7
 
8
 # Record the rate at which the system clock gains/losses time.
9
-driftfile /var/lib/chrony/drift
10
+driftfile /var/db/chrony/drift
11
 
12
 # In first three updates step the system clock instead of slew
13
 # if the adjustment is larger than 1 second.
(-)files/patch-examples_chrony.conf.example2 (+23 lines)
Line 0 Link Here
1
--- examples/chrony.conf.example2.orig	2015-10-19 09:18:37 UTC
2
+++ examples/chrony.conf.example2
3
@@ -1,9 +1,9 @@
4
 # Use public servers from the pool.ntp.org project.
5
 # Please consider joining the pool (http://www.pool.ntp.org/join.html).
6
-pool pool.ntp.org iburst
7
+pool 0.freebsd.pool.ntp.org iburst
8
 
9
 # Record the rate at which the system clock gains/losses time.
10
-driftfile /var/lib/chrony/drift
11
+driftfile /var/db/chrony/drift
12
 
13
 # In first three updates step the system clock instead of slew
14
 # if the adjustment is larger than 1 second.
15
@@ -19,7 +19,7 @@ rtcsync
16
 #local stratum 10
17
 
18
 # Specify file containing keys for NTP authentication.
19
-#keyfile /etc/chrony.keys
20
+#keyfile /usr/local/etc/chrony.keys
21
 
22
 # Disable logging of client accesses.
23
 noclientlog
(-)files/patch-examples_chrony.conf.example3 (+75 lines)
Line 0 Link Here
1
--- examples/chrony.conf.example3.orig	2015-10-19 09:18:37 UTC
2
+++ examples/chrony.conf.example3
3
@@ -1,7 +1,7 @@
4
 #######################################################################
5
 #
6
 # This is an example chrony configuration file.  You should copy it to
7
-# /etc/chrony.conf after uncommenting and editing the options that you
8
+# /usr/local/etc/chrony.conf after uncommenting and editing the options that you
9
 # want to enable.  The more obscure options are not included.  Refer
10
 # to the documentation for these.
11
 #
12
@@ -47,7 +47,9 @@
13
 ! server bar.example.net iburst
14
 ! server baz.example.net iburst
15
 
16
-! pool pool.ntp.org iburst
17
+# This is a reasonable default setting to have on in typical cases for
18
+# a workstation with a full-time internet connection:
19
+pool 0.freebsd.pool.ntp.org iburst
20
  
21
 # However, for dial-up use you probably want these instead.  The word
22
 # 'offline' means that the server is not visible at boot time.  Use
23
@@ -58,7 +60,7 @@
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
34
 # generally want this, so it is uncommented.
35
 
36
-driftfile /var/lib/chrony/drift
37
+driftfile /var/db/chrony/drift
38
 
39
 # If you want to enable NTP authentication with symmetric keys, you will need
40
 # to uncomment the following line and edit the file to set up the keys.
41
 
42
-! keyfile /etc/chrony.keys
43
+! keyfile /usr/local/etc/chrony.keys
44
 
45
 # chronyd can save the measurement history for the servers to files when
46
 # it it exits.  This is useful in 2 situations:
47
@@ -116,7 +118,7 @@ driftfile /var/lib/chrony/drift
48
 # Enable these two options to use this.
49
 
50
 ! dumponexit
51
-! dumpdir /var/lib/chrony
52
+! dumpdir /var/db/chrony
53
 
54
 # 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
56
@@ -145,6 +147,10 @@ driftfile /var/lib/chrony/drift
57
 # 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
59
 # need help in debugging a problem.
60
+#
61
+# If you enable logging, you may want to add an entry to a log rotation
62
+# utility's configuration (e.g., newsyslog(8)).  'chronyc cyclelogs'
63
+# should be used to signal chronyd that a log file has been renamed.
64
 
65
 ! logdir /var/log/chrony
66
 ! log measurements statistics tracking
67
@@ -259,7 +265,7 @@ driftfile /var/lib/chrony/drift
68
 # You need to have 'enhanced RTC support' compiled into your Linux
69
 # kernel.  (Note, these options apply only to Linux.)
70
 
71
-! rtcfile /var/lib/chrony/rtc
72
+! rtcfile /var/db/chrony/rtc
73
 
74
 # Your RTC can be set to keep Universal Coordinated Time (UTC) or local
75
 # time.  (Local time means UTC +/- the effect of your timezone.)  If you
(-)pkg-plist (-6 / +3 lines)
Lines 1-11 Link Here
1
bin/chronyc
1
bin/chronyc
2
etc/chrony.conf.example
2
@sample etc/chrony.conf.sample
3
etc/chrony.conf.example2
4
etc/chrony.keys.example
5
man/man1/chrony.1.gz
6
man/man1/chronyc.1.gz
3
man/man1/chronyc.1.gz
7
man/man5/chrony.conf.5.gz
4
man/man5/chrony.conf.5.gz
8
man/man8/chronyd.8.gz
5
man/man8/chronyd.8.gz
9
sbin/chronyd
6
sbin/chronyd
10
@dir /var/lib/chrony
7
@dir /var/db/chrony
11
@dir /var/lib
8
@dir /var/db

Return to bug 204817