From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8D21F138350 for ; Sat, 2 May 2020 10:43:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C00A5E0960; Sat, 2 May 2020 10:43:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D6BCE0960 for ; Sat, 2 May 2020 10:43:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E64A334F12B for ; Sat, 2 May 2020 10:43:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C1531D8 for ; Sat, 2 May 2020 10:43:40 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1588416207.c3d88f854528be87d8bb689c5dc456a3aab2d64f.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/files/, net-misc/chrony/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/chrony/chrony-3.5-r4.ebuild net-misc/chrony/chrony-4.0_pre1-r2.ebuild net-misc/chrony/chrony-4.0_pre2-r1.ebuild net-misc/chrony/chrony-9999.ebuild net-misc/chrony/files/chronyd.conf net-misc/chrony/files/chronyd.conf-r1 X-VCS-Directories: net-misc/chrony/ net-misc/chrony/files/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: c3d88f854528be87d8bb689c5dc456a3aab2d64f X-VCS-Branch: master Date: Sat, 2 May 2020 10:43:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 04caaef3-d53f-45c9-9141-e2b2e4c3e35c X-Archives-Hash: 630259899bb6e65e66ac4212780e8fb7 commit: c3d88f854528be87d8bb689c5dc456a3aab2d64f Author: Sam James (sam_c) cmpct info> AuthorDate: Sun Apr 19 20:54:06 2020 +0000 Commit: Thomas Deutschmann gentoo 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) cmpct.info> Signed-off-by: Thomas Deutschmann 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