commit: ea54be30d319e23b38793bfdb1317c70715ff842
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 17 00:45:29 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 17 02:52:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea54be30
net-misc/chrony: add 4.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/chrony/Manifest | 2 ++
net-misc/chrony/{chrony-9999.ebuild => chrony-4.2.ebuild} | 4 ++--
net-misc/chrony/chrony-9999.ebuild | 4 ++--
net-misc/chrony/files/chrony-4.2-systemd-gentoo.patch | 13 +++++++++++++
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index ee8a90b57aad..6fc04ec3c097 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,2 +1,4 @@
DIST chrony-4.1.tar.gz 564648 BLAKE2B
f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef
SHA512
5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f
DIST chrony-4.1.tar.gz.asc 833 BLAKE2B
6d800ae436523f61cd713cdd12cf0246db53e732554433d5ef6cf1a437296ee9d0da3b2e9e72d1ccb0e3a6b1ee1227e5d1626bf031b0491670ee0712e17c57ff
SHA512
82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a
+DIST chrony-4.2.tar.gz 578411 BLAKE2B
6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45
SHA512
7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d
+DIST chrony-4.2.tar.gz.asc 833 BLAKE2B
41cb83f62dd58489313438672d209cc65fdbb5f8f595ea38f990d5e15194f91532d3f3221c6c38581467d62e95d23853a4fc438d32b99606def5f06db0031969
SHA512
d8ae4b540ce3529a5a72e10c14765a33ca6fc41529b6fdc9928fb171f25bd6fb87f930b7783638892f42f4cbcfaab4cb1064c930bae1d5204a71babad72b6e10
diff --git a/net-misc/chrony/chrony-9999.ebuild
b/net-misc/chrony/chrony-4.2.ebuild
similarity index 98%
copy from net-misc/chrony/chrony-9999.ebuild
copy to net-misc/chrony/chrony-4.2.ebuild
index 6051d64c9884..75b4ce68b58a 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-4.2.ebuild
@@ -19,7 +19,7 @@ else
SRC_URI+=" verify-sig? (
https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt ->
${P/_/-}.tar.gz.asc )"
if [[ ${PV} != *_pre* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64
~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64
~riscv ~sparc ~x86"
fi
fi
@@ -75,7 +75,7 @@ fi
PATCHES=(
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
- "${FILESDIR}"/${PN}-4.1-systemd-gentoo.patch
+ "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
)
src_prepare() {
diff --git a/net-misc/chrony/chrony-9999.ebuild
b/net-misc/chrony/chrony-9999.ebuild
index 6051d64c9884..75b4ce68b58a 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -19,7 +19,7 @@ else
SRC_URI+=" verify-sig? (
https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt ->
${P/_/-}.tar.gz.asc )"
if [[ ${PV} != *_pre* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64
~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64
~riscv ~sparc ~x86"
fi
fi
@@ -75,7 +75,7 @@ fi
PATCHES=(
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
- "${FILESDIR}"/${PN}-4.1-systemd-gentoo.patch
+ "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
)
src_prepare() {
diff --git a/net-misc/chrony/files/chrony-4.2-systemd-gentoo.patch
b/net-misc/chrony/files/chrony-4.2-systemd-gentoo.patch
new file mode 100644
index 000000000000..1852cdeb92e9
--- /dev/null
+++ b/net-misc/chrony/files/chrony-4.2-systemd-gentoo.patch
@@ -0,0 +1,13 @@
+diff --git a/examples/chronyd.service b/examples/chronyd.service
+index 4fb930e..8df627a 100644
+--- a/examples/chronyd.service
++++ b/examples/chronyd.service
+@@ -9,7 +9,7 @@ ConditionCapability=CAP_SYS_TIME
+ Type=forking
+ PIDFile=/run/chrony/chronyd.pid
+ EnvironmentFile=-/etc/sysconfig/chronyd
+-ExecStart=/usr/sbin/chronyd $OPTIONS
++ExecStart=/usr/sbin/chronyd $OPTIONS -u ntp -F 2
+
+ CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE
+ CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_KILL CAP_LEASE
CAP_LINUX_IMMUTABLE
