commit: f7179379b3d676aab1cd6eceafd28145bfed2ae1 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Wed Sep 2 15:50:50 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Wed Sep 2 15:51:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7179379
net-misc/chrony: Simplify setting systemd default options Package-Manager: Portage-3.0.5, Repoman-3.0.1 Bug: https://bugs.gentoo.org/show_bug.cgi?id=739714 Fixes: 6fbce4846282a2d77a9a8094e3d2fcd7176afcd6 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-misc/chrony/chrony-3.5.1-r1.ebuild | 14 +++++--------- net-misc/chrony/chrony-4.0_pre3.ebuild | 14 +++++--------- net-misc/chrony/chrony-9999.ebuild | 14 +++++--------- net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch | 2 +- 4 files changed, 16 insertions(+), 28 deletions(-) diff --git a/net-misc/chrony/chrony-3.5.1-r1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild index 38d6c2500b7..38bd1ccc1f0 100644 --- a/net-misc/chrony/chrony-3.5.1-r1.ebuild +++ b/net-misc/chrony/chrony-3.5.1-r1.ebuild @@ -68,24 +68,20 @@ src_prepare() { -e 's|pkg-config|${PKG_CONFIG}|g' \ configure || die - sed \ - -e 's/-F 1/-F 0/' \ - examples/chronyd.service > "${T}"/chronyd.service || die - cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die } src_configure() { if ! use caps; then sed -i \ - -e 's/-u ntp//' \ - "${T}"/chronyd.conf "${T}"/chronyd.service || die + -e 's/ -u ntp//' \ + "${T}"/chronyd.conf examples/chronyd.service || die fi if ! use seccomp; then sed -i \ - -e 's/-F 0//' \ - "${T}"/chronyd.conf "${T}"/chronyd.service || die + -e 's/ -F 0//' \ + "${T}"/chronyd.conf examples/chronyd.service || die fi tc-export CC PKG_CONFIG @@ -176,7 +172,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - systemd_dounit "${T}"/chronyd.service + systemd_dounit examples/chronyd.service systemd_dounit examples/chrony-wait.service systemd_enable_ntpunit 50-chrony chronyd.service } diff --git a/net-misc/chrony/chrony-4.0_pre3.ebuild b/net-misc/chrony/chrony-4.0_pre3.ebuild index 8ff387f448e..25ae917e91e 100644 --- a/net-misc/chrony/chrony-4.0_pre3.ebuild +++ b/net-misc/chrony/chrony-4.0_pre3.ebuild @@ -68,24 +68,20 @@ src_prepare() { -e 's|pkg-config|${PKG_CONFIG}|g' \ configure || die - sed \ - -e 's/-F 1/-F 0/' \ - examples/chronyd.service > "${T}"/chronyd.service || die - cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die } src_configure() { if ! use caps; then sed -i \ - -e 's/-u ntp//' \ - "${T}"/chronyd.conf "${T}"/chronyd.service || die + -e 's/ -u ntp//' \ + "${T}"/chronyd.conf examples/chronyd.service || die fi if ! use seccomp; then sed -i \ - -e 's/-F 0//' \ - "${T}"/chronyd.conf "${T}"/chronyd.service || die + -e 's/ -F 0//' \ + "${T}"/chronyd.conf examples/chronyd.service || die fi tc-export CC PKG_CONFIG @@ -176,7 +172,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - systemd_dounit "${T}"/chronyd.service + systemd_dounit examples/chronyd.service systemd_dounit examples/chrony-wait.service systemd_enable_ntpunit 50-chrony chronyd.service } diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 8ff387f448e..25ae917e91e 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -68,24 +68,20 @@ src_prepare() { -e 's|pkg-config|${PKG_CONFIG}|g' \ configure || die - sed \ - -e 's/-F 1/-F 0/' \ - examples/chronyd.service > "${T}"/chronyd.service || die - cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die } src_configure() { if ! use caps; then sed -i \ - -e 's/-u ntp//' \ - "${T}"/chronyd.conf "${T}"/chronyd.service || die + -e 's/ -u ntp//' \ + "${T}"/chronyd.conf examples/chronyd.service || die fi if ! use seccomp; then sed -i \ - -e 's/-F 0//' \ - "${T}"/chronyd.conf "${T}"/chronyd.service || die + -e 's/ -F 0//' \ + "${T}"/chronyd.conf examples/chronyd.service || die fi tc-export CC PKG_CONFIG @@ -176,7 +172,7 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - systemd_dounit "${T}"/chronyd.service + systemd_dounit examples/chronyd.service systemd_dounit examples/chrony-wait.service systemd_enable_ntpunit 50-chrony chronyd.service } diff --git a/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch b/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch index 0ea3c921980..a3a2962ddd1 100644 --- a/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch +++ b/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch @@ -6,7 +6,7 @@ PIDFile=/run/chrony/chronyd.pid -EnvironmentFile=-/etc/sysconfig/chronyd -ExecStart=/usr/sbin/chronyd $OPTIONS -+ExecStart=/usr/sbin/chronyd -u ntp -F 1 ++ExecStart=/usr/sbin/chronyd -u ntp -F 0 PrivateTmp=yes ProtectHome=yes ProtectSystem=full
