Attachment 163534 Details for Bug 204817 – [patch] update to 2.2 +

[patch] [patch] update to 2.2 +

pr-2.2.diff (text/plain), 10.73 KB, created by John Hein on 2015-11-25 20:22:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2015-11-25 20:22:21 UTC

Size: 10.73 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 402341)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	chrony
>-PORTVERSION=	1.31.1
>+PORTVERSION=	2.2
> CATEGORIES=	net
> MASTER_SITES=	http://download.tuxfamily.org/chrony/
> 
>@@ -19,11 +19,19 @@
> 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}
> USE_RC_SUBR=	chronyd
> 
>-PORTDOCS=	COPYING README chrony.txt
>+ALL_TARGET=	all docs
>+INSTALL_TARGET=	install install-docs
>+INFO=		chrony
>+EXTRAPORTDOCS=	FAQ NEWS README
>+PORTDOCS=	chrony.html chrony.txt ${EXTRAPORTDOCS}
>+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
>@@ -38,10 +46,12 @@
> post-stage:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd
>+	cd ${WRKSRC}/${f} && \
>+		${INSTALL_DATA} ${EXTRAPORTDOCS} ${STAGEDIR}${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	cd ${WRKSRC}/examples && \
>+		${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
>+	cd ${WRKSRC}/examples && \
>+		${INSTALL_DATA} chrony.conf.example3 ${STAGEDIR}${PREFIX}/etc/chrony.conf.sample
> 
>-post-install:
>-.for f in chrony.conf.example chrony.conf.example2 chrony.keys.example
>-	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${PREFIX}/etc
>-.endfor
>-
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 402341)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (chrony-1.31.1.tar.gz) = 0ba9f4b58e20b2eaae921eb8c798108ef72d8ea6fdcc7eb0167b56690d212348
>-SIZE (chrony-1.31.1.tar.gz) = 395797
>+SHA256 (chrony-2.2.tar.gz) = d3fd820fa63badf54ee0e48a649b94ea739df3aac5efa104bd90f89795aa2485
>+SIZE (chrony-2.2.tar.gz) = 340285
>Index: files/patch-examples-chrony.conf.example
>===================================================================
>--- files/patch-examples-chrony.conf.example	(revision 402341)
>+++ files/patch-examples-chrony.conf.example	(working copy)
>@@ -1,45 +0,0 @@
>---- 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:
>Index: files/patch-examples-chrony.conf.example2
>===================================================================
>--- files/patch-examples-chrony.conf.example2	(revision 402341)
>+++ files/patch-examples-chrony.conf.example2	(working copy)
>@@ -1,33 +0,0 @@
>---- 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
>Index: files/patch-examples_chrony.conf.example1
>===================================================================
>--- files/patch-examples_chrony.conf.example1	(revision 0)
>+++ files/patch-examples_chrony.conf.example1	(working copy)
>@@ -0,0 +1,13 @@
>+--- examples/chrony.conf.example1.orig	2015-10-19 09:18:37 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.
>Index: files/patch-examples_chrony.conf.example2
>===================================================================
>--- files/patch-examples_chrony.conf.example2	(revision 0)
>+++ files/patch-examples_chrony.conf.example2	(working copy)
>@@ -0,0 +1,23 @@
>+--- examples/chrony.conf.example2.orig	2015-10-19 09:18:37 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
>+ #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
>Index: files/patch-examples_chrony.conf.example3
>===================================================================
>--- files/patch-examples_chrony.conf.example3	(revision 0)
>+++ files/patch-examples_chrony.conf.example3	(working copy)
>@@ -0,0 +1,75 @@
>+--- examples/chrony.conf.example3.orig	2015-10-19 09:18:37 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 @@
>+ ! 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 @@
>+ # 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
>+ # 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
>+ # 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
>+ # 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: pkg-plist
>===================================================================
>--- pkg-plist	(revision 402341)
>+++ pkg-plist	(working copy)
>@@ -1,11 +1,8 @@
> bin/chronyc
>-etc/chrony.conf.example
>-etc/chrony.conf.example2
>-etc/chrony.keys.example
>-man/man1/chrony.1.gz
>+@sample etc/chrony.conf.sample
> man/man1/chronyc.1.gz
> man/man5/chrony.conf.5.gz
> man/man8/chronyd.8.gz
> sbin/chronyd
>-@dir /var/lib/chrony
>-@dir /var/lib
>+@dir /var/db/chrony
>+@dir /var/db

Actions: View | Diff

Attachments on bug 204817: 163534