Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/files/, net-misc/chrony/
Date: Wed, 02 Sep 2020 15:51:46
Message-Id: 1599061897.f7179379b3d676aab1cd6eceafd28145bfed2ae1.jer@gentoo
1 commit: f7179379b3d676aab1cd6eceafd28145bfed2ae1
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 2 15:50:50 2020 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 15:51:37 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7179379
7
8 net-misc/chrony: Simplify setting systemd default options
9
10 Package-Manager: Portage-3.0.5, Repoman-3.0.1
11 Bug: https://bugs.gentoo.org/show_bug.cgi?id=739714
12 Fixes: 6fbce4846282a2d77a9a8094e3d2fcd7176afcd6
13 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
14
15 net-misc/chrony/chrony-3.5.1-r1.ebuild | 14 +++++---------
16 net-misc/chrony/chrony-4.0_pre3.ebuild | 14 +++++---------
17 net-misc/chrony/chrony-9999.ebuild | 14 +++++---------
18 net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch | 2 +-
19 4 files changed, 16 insertions(+), 28 deletions(-)
20
21 diff --git a/net-misc/chrony/chrony-3.5.1-r1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild
22 index 38d6c2500b7..38bd1ccc1f0 100644
23 --- a/net-misc/chrony/chrony-3.5.1-r1.ebuild
24 +++ b/net-misc/chrony/chrony-3.5.1-r1.ebuild
25 @@ -68,24 +68,20 @@ src_prepare() {
26 -e 's|pkg-config|${PKG_CONFIG}|g' \
27 configure || die
28
29 - sed \
30 - -e 's/-F 1/-F 0/' \
31 - examples/chronyd.service > "${T}"/chronyd.service || die
32 -
33 cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die
34 }
35
36 src_configure() {
37 if ! use caps; then
38 sed -i \
39 - -e 's/-u ntp//' \
40 - "${T}"/chronyd.conf "${T}"/chronyd.service || die
41 + -e 's/ -u ntp//' \
42 + "${T}"/chronyd.conf examples/chronyd.service || die
43 fi
44
45 if ! use seccomp; then
46 sed -i \
47 - -e 's/-F 0//' \
48 - "${T}"/chronyd.conf "${T}"/chronyd.service || die
49 + -e 's/ -F 0//' \
50 + "${T}"/chronyd.conf examples/chronyd.service || die
51 fi
52
53 tc-export CC PKG_CONFIG
54 @@ -176,7 +172,7 @@ src_install() {
55 insinto /etc/logrotate.d
56 newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
57
58 - systemd_dounit "${T}"/chronyd.service
59 + systemd_dounit examples/chronyd.service
60 systemd_dounit examples/chrony-wait.service
61 systemd_enable_ntpunit 50-chrony chronyd.service
62 }
63
64 diff --git a/net-misc/chrony/chrony-4.0_pre3.ebuild b/net-misc/chrony/chrony-4.0_pre3.ebuild
65 index 8ff387f448e..25ae917e91e 100644
66 --- a/net-misc/chrony/chrony-4.0_pre3.ebuild
67 +++ b/net-misc/chrony/chrony-4.0_pre3.ebuild
68 @@ -68,24 +68,20 @@ src_prepare() {
69 -e 's|pkg-config|${PKG_CONFIG}|g' \
70 configure || die
71
72 - sed \
73 - -e 's/-F 1/-F 0/' \
74 - examples/chronyd.service > "${T}"/chronyd.service || die
75 -
76 cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die
77 }
78
79 src_configure() {
80 if ! use caps; then
81 sed -i \
82 - -e 's/-u ntp//' \
83 - "${T}"/chronyd.conf "${T}"/chronyd.service || die
84 + -e 's/ -u ntp//' \
85 + "${T}"/chronyd.conf examples/chronyd.service || die
86 fi
87
88 if ! use seccomp; then
89 sed -i \
90 - -e 's/-F 0//' \
91 - "${T}"/chronyd.conf "${T}"/chronyd.service || die
92 + -e 's/ -F 0//' \
93 + "${T}"/chronyd.conf examples/chronyd.service || die
94 fi
95
96 tc-export CC PKG_CONFIG
97 @@ -176,7 +172,7 @@ src_install() {
98 insinto /etc/logrotate.d
99 newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
100
101 - systemd_dounit "${T}"/chronyd.service
102 + systemd_dounit examples/chronyd.service
103 systemd_dounit examples/chrony-wait.service
104 systemd_enable_ntpunit 50-chrony chronyd.service
105 }
106
107 diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
108 index 8ff387f448e..25ae917e91e 100644
109 --- a/net-misc/chrony/chrony-9999.ebuild
110 +++ b/net-misc/chrony/chrony-9999.ebuild
111 @@ -68,24 +68,20 @@ src_prepare() {
112 -e 's|pkg-config|${PKG_CONFIG}|g' \
113 configure || die
114
115 - sed \
116 - -e 's/-F 1/-F 0/' \
117 - examples/chronyd.service > "${T}"/chronyd.service || die
118 -
119 cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die
120 }
121
122 src_configure() {
123 if ! use caps; then
124 sed -i \
125 - -e 's/-u ntp//' \
126 - "${T}"/chronyd.conf "${T}"/chronyd.service || die
127 + -e 's/ -u ntp//' \
128 + "${T}"/chronyd.conf examples/chronyd.service || die
129 fi
130
131 if ! use seccomp; then
132 sed -i \
133 - -e 's/-F 0//' \
134 - "${T}"/chronyd.conf "${T}"/chronyd.service || die
135 + -e 's/ -F 0//' \
136 + "${T}"/chronyd.conf examples/chronyd.service || die
137 fi
138
139 tc-export CC PKG_CONFIG
140 @@ -176,7 +172,7 @@ src_install() {
141 insinto /etc/logrotate.d
142 newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
143
144 - systemd_dounit "${T}"/chronyd.service
145 + systemd_dounit examples/chronyd.service
146 systemd_dounit examples/chrony-wait.service
147 systemd_enable_ntpunit 50-chrony chronyd.service
148 }
149
150 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
151 index 0ea3c921980..a3a2962ddd1 100644
152 --- a/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch
153 +++ b/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch
154 @@ -6,7 +6,7 @@
155 PIDFile=/run/chrony/chronyd.pid
156 -EnvironmentFile=-/etc/sysconfig/chronyd
157 -ExecStart=/usr/sbin/chronyd $OPTIONS
158 -+ExecStart=/usr/sbin/chronyd -u ntp -F 1
159 ++ExecStart=/usr/sbin/chronyd -u ntp -F 0
160 PrivateTmp=yes
161 ProtectHome=yes
162 ProtectSystem=full