From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/files/, net-misc/chrony/
Date: Sat, 2 May 2020 10:43:40 +0000 (UTC) [thread overview]
Message-ID: <1588416207.c3d88f854528be87d8bb689c5dc456a3aab2d64f.whissi@gentoo> (raw)
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
next reply other threads:[~2020-05-02 10:43 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-02 10:43 Thomas Deutschmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-11-25 6:36 [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/files/, net-misc/chrony/ Sam James
2022-04-17 16:44 Sam James
2022-02-18 0:47 Sam James
2021-11-14 8:49 Sam James
2021-09-04 17:35 David Seifert
2021-05-13 16:15 Sam James
2020-12-20 6:29 Sam James
2020-09-02 15:51 Jeroen Roovers
2020-09-02 15:51 Jeroen Roovers
2020-08-31 8:40 Jeroen Roovers
2020-03-30 18:36 Thomas Deutschmann
2019-05-15 10:07 Jeroen Roovers
2019-05-15 10:07 Jeroen Roovers
2018-09-04 9:32 Jeroen Roovers
2018-03-31 10:55 Jeroen Roovers
2016-06-06 7:25 Tobias Klausmann
2016-05-29 16:25 Tobias Klausmann
2016-01-22 4:44 Jeroen Roovers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1588416207.c3d88f854528be87d8bb689c5dc456a3aab2d64f.whissi@gentoo \
--to=whissi@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox