Attachment 163359 Details for Bug 204018 – patch 1.31.1 -> 2.2 (with the fix from this PR)

[patch] patch 1.31.1 -> 2.2 (with the fix from this PR)

chrony.diff (text/plain), 8.12 KB, created by Kurt Jaeger on 2015-11-20 20:09:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2015-11-20 20:09:19 UTC

Size: 8.12 KB

patch

obsolete

>diff -r -u -N net/chrony/Makefile /home/pi/myp/net/chrony/Makefile
>--- net/chrony/Makefile	2015-08-01 00:46:24.707886000 +0200
>+++ /home/pi/myp/net/chrony/Makefile	2015-11-20 21:06:11.347565000 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/net/chrony/Makefile 387180 2015-05-23 18:59:11Z pi $
> 
> PORTNAME=	chrony
>-PORTVERSION=	1.31.1
>+PORTVERSION=	2.2
> CATEGORIES=	net
> MASTER_SITES=	http://download.tuxfamily.org/chrony/
> 
>@@ -18,12 +18,11 @@
> USES=		cpe gmake makeinfo readline
> CPE_VENDOR=	tuxfamily
> HAS_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \
>+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
>@@ -39,8 +38,7 @@
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd
> 
> post-install:
>-.for f in chrony.conf.example chrony.conf.example2 chrony.keys.example
>-	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${PREFIX}/etc
>-.endfor
>+	${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
> 
> .include <bsd.port.mk>
>diff -r -u -N net/chrony/distinfo /home/pi/myp/net/chrony/distinfo
>--- net/chrony/distinfo	2015-08-01 00:46:24.708577000 +0200
>+++ /home/pi/myp/net/chrony/distinfo	2015-11-20 20:55:46.772379000 +0100
>@@ -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
>diff -r -u -N net/chrony/files/patch-examples-chrony.conf.example /home/pi/myp/net/chrony/files/patch-examples-chrony.conf.example
>--- net/chrony/files/patch-examples-chrony.conf.example	2015-08-01 00:46:24.709880000 +0200
>+++ /home/pi/myp/net/chrony/files/patch-examples-chrony.conf.example	1970-01-01 01:00:00.000000000 +0100
>@@ -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:
>diff -r -u -N net/chrony/files/patch-examples-chrony.conf.example2 /home/pi/myp/net/chrony/files/patch-examples-chrony.conf.example2
>--- net/chrony/files/patch-examples-chrony.conf.example2	2015-08-01 00:46:24.711289000 +0200
>+++ /home/pi/myp/net/chrony/files/patch-examples-chrony.conf.example2	1970-01-01 01:00:00.000000000 +0100
>@@ -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
>diff -r -u -N net/chrony/files/patch-examples_chrony.conf.example3 /home/pi/myp/net/chrony/files/patch-examples_chrony.conf.example3
>--- net/chrony/files/patch-examples_chrony.conf.example3	1970-01-01 01:00:00.000000000 +0100
>+++ /home/pi/myp/net/chrony/files/patch-examples_chrony.conf.example3	2015-11-20 21:02:41.532922000 +0100
>@@ -0,0 +1,51 @@
>+--- 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:
>diff -r -u -N net/chrony/pkg-plist /home/pi/myp/net/chrony/pkg-plist
>--- net/chrony/pkg-plist	2015-08-01 00:46:24.707154000 +0200
>+++ /home/pi/myp/net/chrony/pkg-plist	2015-11-20 21:05:31.885530000 +0100
>@@ -1,11 +1,9 @@
> bin/chronyc
>-etc/chrony.conf.example
>-etc/chrony.conf.example2
>-etc/chrony.keys.example
>-man/man1/chrony.1.gz
>+@sample etc/chrony.conf.sample
>+@sample etc/chrony.keys.sample
> man/man1/chronyc.1.gz
> man/man5/chrony.conf.5.gz
> man/man8/chronyd.8.gz
>-@(,,4755) sbin/chronyd
>+sbin/chronyd
> @dir /var/lib/chrony
> @dir /var/lib

Actions: View | Diff

Attachments on bug 204018: 162446 | 162645 | 162659 | 163359