summaryrefslogtreecommitdiff
path: root/net-misc/chrony
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-22 07:31:18 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-22 07:31:18 +0100
commit908778078736bd36f7a60a2d576d415cb8e000fa (patch)
treec6a4796c48b608c14dc7e9674cdbd38f905e3c15 /net-misc/chrony
parent185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
gentoo resync : 22.05.2021
Diffstat (limited to 'net-misc/chrony')
-rw-r--r--net-misc/chrony/Manifest10
-rw-r--r--net-misc/chrony/chrony-4.1-r1.ebuild (renamed from net-misc/chrony/chrony-4.1_pre1.ebuild)51
-rw-r--r--net-misc/chrony/chrony-9999.ebuild51
-rw-r--r--net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch12
-rw-r--r--net-misc/chrony/files/chronyd.conf-r312
5 files changed, 102 insertions, 34 deletions
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 24e585ca3c7f..8754b275dc7d 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,13 +1,15 @@
AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c321544376ff2e48d67ee13bebcf04a8fea56326bf5efe66f568913dc92ff7f16a641ffb39a456e9cdac6004a6c SHA512 e6febb744476be6c83ac086f2054dc2c190b6e1abd2cf20d4187f222b2485817f06c4ad62b8d40fcea3e18a771cf21899fe0a1dafbfb31f5c99da9092d24d79b
AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1e70565a8437f142f317abe81531c31e934af05eda5e3043f7874bc9b4592d44579ae1827ddba06c514b4b8124c899931ed0f SHA512 0a109e1b8367def620f5089b3fcb92d84e592eb1a2fced2b60f6c9295159a605d9605e837a06e118c8ba8095208da68592fb9cd537937a153d6eecfa0eb35eb4
AUX chrony-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 4e441ea854dda077c68f05b420f50d5374436670270eca6ff5cde50c68ac4060ffd752628dc664eac5a1fc6c21ad42c4bae7df07f9a4963d186dfc41a68f3a77 SHA512 0e6c1ef2b346fa2a722e67d8cf1cbc5e4413c65bba8301e3d0d87590fd9b73489a23807e0f17fa365a66ed1dbf03d86d8c617d54d609bf435816b1266f30f170
+AUX chrony-4.1-systemd-gentoo.patch 309 BLAKE2B 4824abf9130c6861f2966c4cdec93313429df499c14cd75897ffebdcc1bb9dd4058aa4889f17e4549ed5d0c581208c316bc3bd28cbed96030303f401a4dd7bff SHA512 ae5d80bcf16554a22b624c2def7ccabc72cc3dba5dc0fc8096eeb7367b388d02ad2d3ce6119980fc12d573ea0803eeb58cb5b409b0c475f70e75c8d112553245
AUX chronyd.conf 390 BLAKE2B a0058c72ae04371aa273d71f01349a00dfc0d66c016e6c2d977b9499e2ded3072942bb21c468ca9263263d55f1cc35cca4a3a72ee058cc31cf982648552bc77d SHA512 6798d40da70921b95430371459a4b276a88c57ec79f99d0efd214770f5fffee5d80d20baf4313f210b6af46c4aafbb038920cd774d6c03ffbb0849229c431bdc
+AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea7106356083cf1a20bdb8fd4b85bd8cce8cf20ce6839e8788fedc1f94e912ec512193988f83283ceef86d6cfc7 SHA512 ab0bbd07c17e391d068c5a37d5f8d9c8fc2c42add2700869217a95784666bd3f23bebd70942cf11b42c124e0947f68c101153998e89bc61ccb71b30a0187cf0c
AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9
DIST chrony-4.0.tar.gz.asc 195 BLAKE2B 1947a73f35eb5c58f91775d76473210a7b5edff5b808e360eb0c3724351c54ac4f187a2aa4450830130da718c6a0c488baa170ca87e7e6eac781d85c67b3773f SHA512 c3156d91f4fdb6f9e2fdbc83b1399afb0ecdfa9b7bc92648c5bce477c3f0f921d2a13aa21ac6c281f18b008c60f08e3db6d82b642b646f064aea1dbe19295c4c
-DIST chrony-4.1-pre1.tar.gz 563277 BLAKE2B 474d27d0e402d83bda52125940b8205119519b93571e6b8df3fea5eeb5f1f3babbcc40bc81db77bc345830d5e9528ad087ff539026a1a585ce220feeb851e978 SHA512 03e28e6651d6aa3c99333b94ee503843c3a69b8c8366bf647c41a3a9e34e987c440e289ec16e5c62c2a7405271bddc533efbd59d6c6ab43712c8908dfb86322e
-DIST chrony-4.1-pre1.tar.gz.asc 195 BLAKE2B 4a06b35be3257a52cc824e2acfdff32b6598d1744bc23418e89291d71d6d9a86c35559eab26034ce2e05c4152ffb691b5ec4104dc339821e93523c33c8cbdd72 SHA512 8eb695c3f85f90d02b22b1202c8766347289a6da1d0658a3d89eed90202799bcfc647b96e5f931fb862011e85feed5f4914b39e45a3e20f01827509fe271a2d7
+DIST chrony-4.1.tar.gz 564648 BLAKE2B f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef SHA512 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f
+DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e732554433d5ef6cf1a437296ee9d0da3b2e9e72d1ccb0e3a6b1ee1227e5d1626bf031b0491670ee0712e17c57ff SHA512 82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a
EBUILD chrony-4.0-r2.ebuild 5467 BLAKE2B 3ce0ad6ccb8e6477b4b7e615e7c19fa8f492253730f185ddf127fffccdf18b9f23b55b2a5acbc06ca19e1deb328d01b477a50a70984f8f4ac968d48f8ab57e08 SHA512 6d7c2c61527da60511bf62a3133fd717faad3a4a970f898687bd14806427229012defc36713fb70b8ae4fedde3b4c9b48eea0c8124003f5866299a3e0717b12d
-EBUILD chrony-4.1_pre1.ebuild 5947 BLAKE2B 41fa23fb7f17ec9d3c6829b22f74bce01dd1c90e9e483e0631b0c8c472a39cbc7ed652faebcb6ee3961ad090a59a1e6cd20af64ee556e658a80f775baa608209 SHA512 811d728b23e25f0e8b30f0689870c0e75295b9a2bb69d2e7678612644ecb652d0cdeb0565d7d437a417272e10bd99e4c1ae211f90b50d2b06f46f985e35a58ee
-EBUILD chrony-9999.ebuild 5947 BLAKE2B 41fa23fb7f17ec9d3c6829b22f74bce01dd1c90e9e483e0631b0c8c472a39cbc7ed652faebcb6ee3961ad090a59a1e6cd20af64ee556e658a80f775baa608209 SHA512 811d728b23e25f0e8b30f0689870c0e75295b9a2bb69d2e7678612644ecb652d0cdeb0565d7d437a417272e10bd99e4c1ae211f90b50d2b06f46f985e35a58ee
+EBUILD chrony-4.1-r1.ebuild 6631 BLAKE2B 93c4b6a53a2c44bcf2508125fe33291c60a37321f32eaaa2c6fb4616bb97378cc50463ec977cd0204e1215c4651d84d79c39adca45285c9ae44e126007cea5a7 SHA512 69c90fa53b76c2a996d466098133a962764f19a54686bbd03c1694eff80b6e4a846bf6c33b1d139bcc0e0076eb51f49a78d45a550f816786785bad00b3fc6075
+EBUILD chrony-9999.ebuild 6631 BLAKE2B 93c4b6a53a2c44bcf2508125fe33291c60a37321f32eaaa2c6fb4616bb97378cc50463ec977cd0204e1215c4651d84d79c39adca45285c9ae44e126007cea5a7 SHA512 69c90fa53b76c2a996d466098133a962764f19a54686bbd03c1694eff80b6e4a846bf6c33b1d139bcc0e0076eb51f49a78d45a550f816786785bad00b3fc6075
MISC metadata.xml 2299 BLAKE2B f5e8667a5fdeb86395d773eaf6e7d80c2133fe945565d7d6005f156a0a4763f1434ba887627fba63dd0f0a15663d7fa194d91699f6961ad21b9afa40576cd1fd SHA512 370e06edf9df22a327ff8b528f8a810c731af4615d740331ac737af8cbc5af265f7592ec22bf844301c5089185bc4f7de102f87378f85cf276d4f550933e519a
diff --git a/net-misc/chrony/chrony-4.1_pre1.ebuild b/net-misc/chrony/chrony-4.1-r1.ebuild
index c615418eb65b..d3e68c8d0126 100644
--- a/net-misc/chrony/chrony-4.1_pre1.ebuild
+++ b/net-misc/chrony/chrony-4.1-r1.ebuild
@@ -70,12 +70,12 @@ if [[ ${PV} == "9999" ]] ; then
REQUIRED_USE+=" html"
BDEPEND+=" virtual/w3m"
else
- BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-mlichvar )"
+ BDEPEND+=" verify-sig? ( >=app-crypt/openpgp-keys-mlichvar-20210513 )"
fi
PATCHES=(
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
- "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
+ "${FILESDIR}"/${PN}-4.1-systemd-gentoo.patch
)
src_prepare() {
@@ -85,7 +85,7 @@ src_prepare() {
-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
doc/* examples/* || die
- cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die
+ cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
}
src_configure() {
@@ -97,7 +97,7 @@ src_configure() {
if ! use seccomp ; then
sed -i \
- -e 's/ -F 0//' \
+ -e 's/ -F 2//' \
"${T}"/chronyd.conf examples/chronyd.service || die
fi
@@ -192,17 +192,24 @@ src_install() {
}
pkg_preinst() {
- HAD_CAPS=false
- HAD_SECCOMP=false
+ HAD_CAPS=0
+ HAD_SECCOMP=0
+ HAD_PRE_NEW_SECCOMP_LEVEL=0
# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
if has_version 'net-misc/chrony[caps]' ; then
- HAD_CAPS=true
+ HAD_CAPS=1
fi
if has_version 'net-misc/chrony[seccomp]' ; then
- HAD_SECCOMP=true
+ HAD_SECCOMP=1
+ fi
+
+ if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
+ # This version introduced a new filter level: -F 2
+ # It's a limited set of seccomp filters designed to be 'bare minimum'
+ HAD_PRE_NEW_SECCOMP_LEVEL=1
fi
}
@@ -210,22 +217,36 @@ pkg_postinst() {
tmpfiles_process chronyd.conf
if [[ -n "${REPLACING_VERSIONS}" ]] ; then
- if use caps && ! ${HAD_CAPS} ; then
+ if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
# bug #719876
ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
ewarn "This is necessary for chrony to drop privileges"
- elif ! use caps && ! ${HAD_CAPS} ; then
+ elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
fi
fi
- # TODO: Will try to re-enable before final release ideally?
- # bug #783915
- if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then
- elog "To enable seccomp in enforcing mode, please modify:"
+ # See bug #783915 for general discussion on enabling seccomp filtering
+ # by default.
+ local show_seccomp_enable_msg=0
+
+ # Was seccomp disabled before and now enabled?
+ if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
+ show_seccomp_enable_msg=1
+ fi
+
+ # Are we coming from an old version without the new 'minimal' filter?
+ # (-F 2)
+ if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
+ show_seccomp_enable_msg=1
+ fi
+
+ if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
+ elog "To enable seccomp in a stricter mode, please modify:"
elog "- /etc/conf.d/chronyd for OpenRC"
elog "- systemctl edit chronyd for systemd"
- elog "to use -F 1 or -F -1 instead of -F 0 (see man chronyd)"
+ elog "By default, we now use -F 2 which is a baseline/minimal filter."
+ elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
fi
}
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index c615418eb65b..d3e68c8d0126 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -70,12 +70,12 @@ if [[ ${PV} == "9999" ]] ; then
REQUIRED_USE+=" html"
BDEPEND+=" virtual/w3m"
else
- BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-mlichvar )"
+ BDEPEND+=" verify-sig? ( >=app-crypt/openpgp-keys-mlichvar-20210513 )"
fi
PATCHES=(
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
- "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
+ "${FILESDIR}"/${PN}-4.1-systemd-gentoo.patch
)
src_prepare() {
@@ -85,7 +85,7 @@ src_prepare() {
-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
doc/* examples/* || die
- cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die
+ cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
}
src_configure() {
@@ -97,7 +97,7 @@ src_configure() {
if ! use seccomp ; then
sed -i \
- -e 's/ -F 0//' \
+ -e 's/ -F 2//' \
"${T}"/chronyd.conf examples/chronyd.service || die
fi
@@ -192,17 +192,24 @@ src_install() {
}
pkg_preinst() {
- HAD_CAPS=false
- HAD_SECCOMP=false
+ HAD_CAPS=0
+ HAD_SECCOMP=0
+ HAD_PRE_NEW_SECCOMP_LEVEL=0
# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
if has_version 'net-misc/chrony[caps]' ; then
- HAD_CAPS=true
+ HAD_CAPS=1
fi
if has_version 'net-misc/chrony[seccomp]' ; then
- HAD_SECCOMP=true
+ HAD_SECCOMP=1
+ fi
+
+ if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
+ # This version introduced a new filter level: -F 2
+ # It's a limited set of seccomp filters designed to be 'bare minimum'
+ HAD_PRE_NEW_SECCOMP_LEVEL=1
fi
}
@@ -210,22 +217,36 @@ pkg_postinst() {
tmpfiles_process chronyd.conf
if [[ -n "${REPLACING_VERSIONS}" ]] ; then
- if use caps && ! ${HAD_CAPS} ; then
+ if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
# bug #719876
ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
ewarn "This is necessary for chrony to drop privileges"
- elif ! use caps && ! ${HAD_CAPS} ; then
+ elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
fi
fi
- # TODO: Will try to re-enable before final release ideally?
- # bug #783915
- if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then
- elog "To enable seccomp in enforcing mode, please modify:"
+ # See bug #783915 for general discussion on enabling seccomp filtering
+ # by default.
+ local show_seccomp_enable_msg=0
+
+ # Was seccomp disabled before and now enabled?
+ if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
+ show_seccomp_enable_msg=1
+ fi
+
+ # Are we coming from an old version without the new 'minimal' filter?
+ # (-F 2)
+ if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
+ show_seccomp_enable_msg=1
+ fi
+
+ if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
+ elog "To enable seccomp in a stricter mode, please modify:"
elog "- /etc/conf.d/chronyd for OpenRC"
elog "- systemctl edit chronyd for systemd"
- elog "to use -F 1 or -F -1 instead of -F 0 (see man chronyd)"
+ elog "By default, we now use -F 2 which is a baseline/minimal filter."
+ elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
fi
}
diff --git a/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch b/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch
new file mode 100644
index 000000000000..ff3b320d1e47
--- /dev/null
+++ b/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch
@@ -0,0 +1,12 @@
+--- a/examples/chronyd.service
++++ b/examples/chronyd.service
+@@ -8,8 +8,7 @@
+ [Service]
+ Type=forking
+ PIDFile=/run/chrony/chronyd.pid
+-EnvironmentFile=-/etc/sysconfig/chronyd
+-ExecStart=/usr/sbin/chronyd $OPTIONS
++ExecStart=/usr/sbin/chronyd -u ntp -F 2
+ PrivateTmp=yes
+ ProtectHome=yes
+ ProtectSystem=full
diff --git a/net-misc/chrony/files/chronyd.conf-r3 b/net-misc/chrony/files/chronyd.conf-r3
new file mode 100644
index 000000000000..25a4758954ea
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.conf-r3
@@ -0,0 +1,12 @@
+# /etc/conf.d/chronyd
+
+CFGFILE="/etc/chrony/chrony.conf"
+
+# Configuration dependant options :
+# -s - Set system time from RTC if rtcfile directive present
+# -r - Reload sample histories if dumponexit directive present
+#
+# 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 2"