[gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/files/, net-misc/chrony/

[Thomas Deutschmann]

commit:     c3d88f854528be87d8bb689c5dc456a3aab2d64f
Author:     Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Sun Apr 19 20:54:06 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat May  2 10:43:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d88f85

net-misc/chrony: Fix paths to config file

OpenRC only; systemd unaffected by issue.
New "capsified" versions will use new config file, current stable
chrony now has a fixed file.

Revbump is complicated here given -r3, ..., already exists.
This should not have affected many users so this seems like
the simplest solution.

Closes: https://bugs.gentoo.org/719876
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-misc/chrony/chrony-3.5-r4.ebuild                    | 2 +-
 net-misc/chrony/chrony-4.0_pre1-r2.ebuild               | 2 +-
 net-misc/chrony/chrony-4.0_pre2-r1.ebuild               | 2 +-
 net-misc/chrony/chrony-9999.ebuild                      | 2 +-
 net-misc/chrony/files/chronyd.conf                      | 2 +-
 net-misc/chrony/files/{chronyd.conf => chronyd.conf-r1} | 0
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-misc/chrony/chrony-3.5-r4.ebuild b/net-misc/chrony/chrony-3.5-r4.ebuild
index ae752af2fb5..a7a99b957db 100644
--- a/net-misc/chrony/chrony-3.5-r4.ebuild
+++ b/net-misc/chrony/chrony-3.5-r4.ebuild
@@ -51,7 +51,7 @@ src_prepare() {
 		doc/* examples/* || die
 
 	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf
+	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
 	cp examples/chronyd.service "${T}"/chronyd.service
 
 	# Set config for privdrop

diff --git a/net-misc/chrony/chrony-4.0_pre1-r2.ebuild b/net-misc/chrony/chrony-4.0_pre1-r2.ebuild
index c4c8a13c29a..7cc61849d3d 100644
--- a/net-misc/chrony/chrony-4.0_pre1-r2.ebuild
+++ b/net-misc/chrony/chrony-4.0_pre1-r2.ebuild
@@ -53,7 +53,7 @@ src_prepare() {
 		doc/* examples/* || die
 
 	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf
+	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
 	cp examples/chronyd.service "${T}"/chronyd.service
 
 	# Set config for privdrop

diff --git a/net-misc/chrony/chrony-4.0_pre2-r1.ebuild b/net-misc/chrony/chrony-4.0_pre2-r1.ebuild
index 07017bb6772..503840b2754 100644
--- a/net-misc/chrony/chrony-4.0_pre2-r1.ebuild
+++ b/net-misc/chrony/chrony-4.0_pre2-r1.ebuild
@@ -53,7 +53,7 @@ src_prepare() {
 		doc/* examples/* || die
 
 	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf
+	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
 	cp examples/chronyd.service "${T}"/chronyd.service
 
 	# Set config for privdrop

diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 543cabf61d5..8d8758fa5c6 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -50,7 +50,7 @@ src_prepare() {
 		doc/* examples/* || die
 
 	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf
+	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
 	cp examples/chronyd.service "${T}"/chronyd.service
 
 	# Set config for privdrop

diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf
index c04f3525f0b..fc43a95c40f 100644
--- a/net-misc/chrony/files/chronyd.conf
+++ b/net-misc/chrony/files/chronyd.conf
@@ -9,4 +9,4 @@ CFGFILE="/etc/chrony/chrony.conf"
 # The combination of "-s -r" allows chronyd to perform long term averaging of
 # the gain or loss rate across system reboots and shutdowns.
 
-ARGS="-u ntp -F 1"
+ARGS=""

diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf-r1
similarity index 100%
copy from net-misc/chrony/files/chronyd.conf
copy to net-misc/chrony/files/chronyd.conf-r1