1 |
commit: f940f574df69cacc323792c4545c65526472188b |
2 |
Author: Sam James (sam_c) <sam <AT> cmpct <DOT> info> |
3 |
AuthorDate: Sun Apr 19 20:50:43 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 2 10:43:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f940f574 |
7 |
|
8 |
net-misc/chrony: Remove broken versions |
9 |
|
10 |
Remove versions that were broken by previous USE=caps changes. |
11 |
|
12 |
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info> |
13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
14 |
|
15 |
net-misc/chrony/chrony-3.5-r3.ebuild | 152 ----------------------------- |
16 |
net-misc/chrony/chrony-4.0_pre1-r1.ebuild | 155 ------------------------------ |
17 |
2 files changed, 307 deletions(-) |
18 |
|
19 |
diff --git a/net-misc/chrony/chrony-3.5-r3.ebuild b/net-misc/chrony/chrony-3.5-r3.ebuild |
20 |
deleted file mode 100644 |
21 |
index a654a6eb489..00000000000 |
22 |
--- a/net-misc/chrony/chrony-3.5-r3.ebuild |
23 |
+++ /dev/null |
24 |
@@ -1,152 +0,0 @@ |
25 |
-# Copyright 1999-2020 Gentoo Authors |
26 |
-# Distributed under the terms of the GNU General Public License v2 |
27 |
- |
28 |
-EAPI=7 |
29 |
-inherit systemd tmpfiles toolchain-funcs |
30 |
- |
31 |
-DESCRIPTION="NTP client and server programs" |
32 |
-HOMEPAGE="https://chrony.tuxfamily.org/" |
33 |
-SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" |
34 |
-LICENSE="GPL-2" |
35 |
-SLOT="0" |
36 |
- |
37 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
38 |
-IUSE=" |
39 |
- +adns +caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc |
40 |
- +seccomp selinux |
41 |
-" |
42 |
-REQUIRED_USE=" |
43 |
- ?? ( libedit readline ) |
44 |
-" |
45 |
- |
46 |
-CDEPEND=" |
47 |
- caps? ( sys-libs/libcap ) |
48 |
- libedit? ( dev-libs/libedit ) |
49 |
- readline? ( >=sys-libs/readline-4.1-r4:= ) |
50 |
- seccomp? ( sys-libs/libseccomp ) |
51 |
-" |
52 |
-DEPEND=" |
53 |
- ${CDEPEND} |
54 |
- caps? ( acct-group/ntp acct-user/ntp ) |
55 |
- html? ( dev-ruby/asciidoctor ) |
56 |
- pps? ( net-misc/pps-tools ) |
57 |
-" |
58 |
-RDEPEND=" |
59 |
- ${CDEPEND} |
60 |
- selinux? ( sec-policy/selinux-chronyd ) |
61 |
-" |
62 |
- |
63 |
-RESTRICT=test |
64 |
- |
65 |
-S="${WORKDIR}/${P/_/-}" |
66 |
- |
67 |
-PATCHES=( |
68 |
- "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch |
69 |
- "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch |
70 |
-) |
71 |
- |
72 |
-src_prepare() { |
73 |
- default |
74 |
- sed -i \ |
75 |
- -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ |
76 |
- doc/* examples/* || die |
77 |
- |
78 |
- # Copy for potential user fixup |
79 |
- cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf |
80 |
- cp examples/chronyd.service "${T}"/chronyd.service |
81 |
- |
82 |
- # Set config for privdrop |
83 |
- if ! use caps; then |
84 |
- sed -i \ |
85 |
- -e 's/-u ntp//' \ |
86 |
- "${T}"/chronyd.conf "${T}"/chronyd.service || die |
87 |
- fi |
88 |
- |
89 |
- if ! use seccomp; then |
90 |
- sed -i \ |
91 |
- -e 's/-F 1//' \ |
92 |
- "${T}"/chronyd.conf "${T}"/chronyd.service || die |
93 |
- fi |
94 |
-} |
95 |
- |
96 |
-src_configure() { |
97 |
- tc-export CC |
98 |
- |
99 |
- local CHRONY_EDITLINE |
100 |
- # ./configure legend: |
101 |
- # --disable-readline : disable line editing entirely |
102 |
- # --without-readline : do not use sys-libs/readline (enabled by default) |
103 |
- # --without-editline : do not use dev-libs/libedit (enabled by default) |
104 |
- if ! use readline && ! use libedit; then |
105 |
- CHRONY_EDITLINE='--disable-readline' |
106 |
- else |
107 |
- CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" |
108 |
- CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" |
109 |
- fi |
110 |
- |
111 |
- # not an autotools generated script |
112 |
- local myconf=( |
113 |
- $(use_enable seccomp scfilter) |
114 |
- $(usex adns '' --disable-asyncdns) |
115 |
- $(usex caps '' --disable-linuxcaps) |
116 |
- $(usex cmdmon '' --disable-cmdmon) |
117 |
- $(usex ipv6 '' --disable-ipv6) |
118 |
- $(usex ntp '' --disable-ntp) |
119 |
- $(usex phc '' --disable-phc) |
120 |
- $(usex pps '' --disable-pps) |
121 |
- $(usex refclock '' --disable-refclock) |
122 |
- $(usex rtc '' --disable-rtc) |
123 |
- ${CHRONY_EDITLINE} |
124 |
- ${EXTRA_ECONF} |
125 |
- --chronysockdir="${EPREFIX}/run/chrony" |
126 |
- --disable-sechash |
127 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}" |
128 |
- --mandir="${EPREFIX}/usr/share/man" |
129 |
- --prefix="${EPREFIX}/usr" |
130 |
- --sysconfdir="${EPREFIX}/etc/chrony" |
131 |
- --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" |
132 |
- --without-nss |
133 |
- --without-tomcrypt |
134 |
- ) |
135 |
- |
136 |
- # print the ./configure call to aid in future debugging |
137 |
- echo bash ./configure "${myconf[@]}" >&2 |
138 |
- bash ./configure "${myconf[@]}" || die |
139 |
-} |
140 |
- |
141 |
-src_compile() { |
142 |
- emake all docs $(usex html '' 'ADOC=true') |
143 |
-} |
144 |
- |
145 |
-src_install() { |
146 |
- default |
147 |
- |
148 |
- newinitd "${FILESDIR}"/chronyd.init-r2 chronyd |
149 |
- newconfd "${T}"/chronyd.conf chronyd |
150 |
- |
151 |
- insinto /etc/${PN} |
152 |
- newins examples/chrony.conf.example1 chrony.conf |
153 |
- |
154 |
- docinto examples |
155 |
- dodoc examples/*.example* |
156 |
- |
157 |
- newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" |
158 |
- |
159 |
- if use html; then |
160 |
- docinto html |
161 |
- dodoc doc/*.html |
162 |
- fi |
163 |
- |
164 |
- keepdir /var/{lib,log}/chrony |
165 |
- |
166 |
- insinto /etc/logrotate.d |
167 |
- newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony |
168 |
- |
169 |
- systemd_dounit "${T}"/chronyd.service |
170 |
- systemd_dounit examples/chrony-wait.service |
171 |
- systemd_enable_ntpunit 50-chrony chronyd.service |
172 |
-} |
173 |
- |
174 |
-pkg_postinst() { |
175 |
- tmpfiles_process chronyd.conf |
176 |
-} |
177 |
|
178 |
diff --git a/net-misc/chrony/chrony-4.0_pre1-r1.ebuild b/net-misc/chrony/chrony-4.0_pre1-r1.ebuild |
179 |
deleted file mode 100644 |
180 |
index 27386df7648..00000000000 |
181 |
--- a/net-misc/chrony/chrony-4.0_pre1-r1.ebuild |
182 |
+++ /dev/null |
183 |
@@ -1,155 +0,0 @@ |
184 |
-# Copyright 1999-2020 Gentoo Authors |
185 |
-# Distributed under the terms of the GNU General Public License v2 |
186 |
- |
187 |
-EAPI=7 |
188 |
-inherit systemd tmpfiles toolchain-funcs |
189 |
- |
190 |
-DESCRIPTION="NTP client and server programs" |
191 |
-HOMEPAGE="https://chrony.tuxfamily.org/" |
192 |
-SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" |
193 |
-LICENSE="GPL-2" |
194 |
-SLOT="0" |
195 |
- |
196 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
197 |
-IUSE=" |
198 |
- +adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc |
199 |
- +seccomp +sechash selinux |
200 |
-" |
201 |
-REQUIRED_USE=" |
202 |
- ?? ( libedit readline ) |
203 |
- sechash? ( nettle ) |
204 |
-" |
205 |
- |
206 |
-CDEPEND=" |
207 |
- caps? ( sys-libs/libcap ) |
208 |
- libedit? ( dev-libs/libedit ) |
209 |
- nettle? ( dev-libs/nettle ) |
210 |
- readline? ( >=sys-libs/readline-4.1-r4:= ) |
211 |
- seccomp? ( sys-libs/libseccomp ) |
212 |
-" |
213 |
-DEPEND=" |
214 |
- ${CDEPEND} |
215 |
- caps? ( acct-group/ntp acct-user/ntp ) |
216 |
- html? ( dev-ruby/asciidoctor ) |
217 |
- pps? ( net-misc/pps-tools ) |
218 |
-" |
219 |
-RDEPEND=" |
220 |
- ${CDEPEND} |
221 |
- selinux? ( sec-policy/selinux-chronyd ) |
222 |
-" |
223 |
- |
224 |
-RESTRICT=test |
225 |
- |
226 |
-S="${WORKDIR}/${P/_/-}" |
227 |
- |
228 |
-PATCHES=( |
229 |
- "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch |
230 |
- "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch |
231 |
-) |
232 |
- |
233 |
-src_prepare() { |
234 |
- default |
235 |
- sed -i \ |
236 |
- -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ |
237 |
- doc/* examples/* || die |
238 |
- |
239 |
- # Copy for potential user fixup |
240 |
- cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf |
241 |
- cp examples/chronyd.service "${T}"/chronyd.service |
242 |
- |
243 |
- # Set config for privdrop |
244 |
- if ! use caps; then |
245 |
- sed -i \ |
246 |
- -e 's/-u ntp//' \ |
247 |
- "${T}"/chronyd.conf "${T}"/chronyd.service || die |
248 |
- fi |
249 |
- |
250 |
- if ! use seccomp; then |
251 |
- sed -i \ |
252 |
- -e 's/-F 1//' \ |
253 |
- "${T}"/chronyd.conf "${T}"/chronyd.service || die |
254 |
- fi |
255 |
-} |
256 |
- |
257 |
-src_configure() { |
258 |
- tc-export CC |
259 |
- |
260 |
- local CHRONY_EDITLINE |
261 |
- # ./configure legend: |
262 |
- # --disable-readline : disable line editing entirely |
263 |
- # --without-readline : do not use sys-libs/readline (enabled by default) |
264 |
- # --without-editline : do not use dev-libs/libedit (enabled by default) |
265 |
- if ! use readline && ! use libedit; then |
266 |
- CHRONY_EDITLINE='--disable-readline' |
267 |
- else |
268 |
- CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" |
269 |
- CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" |
270 |
- fi |
271 |
- |
272 |
- # not an autotools generated script |
273 |
- local myconf=( |
274 |
- $(use_enable seccomp scfilter) |
275 |
- $(usex adns '' --disable-asyncdns) |
276 |
- $(usex caps '' --disable-linuxcaps) |
277 |
- $(usex cmdmon '' --disable-cmdmon) |
278 |
- $(usex ipv6 '' --disable-ipv6) |
279 |
- $(usex nettle '' --without-nettle) |
280 |
- $(usex ntp '' --disable-ntp) |
281 |
- $(usex phc '' --disable-phc) |
282 |
- $(usex pps '' --disable-pps) |
283 |
- $(usex refclock '' --disable-refclock) |
284 |
- $(usex rtc '' --disable-rtc) |
285 |
- $(usex sechash '' --disable-sechash) |
286 |
- ${CHRONY_EDITLINE} |
287 |
- ${EXTRA_ECONF} |
288 |
- --chronysockdir="${EPREFIX}/run/chrony" |
289 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}" |
290 |
- --mandir="${EPREFIX}/usr/share/man" |
291 |
- --prefix="${EPREFIX}/usr" |
292 |
- --sysconfdir="${EPREFIX}/etc/chrony" |
293 |
- --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" |
294 |
- --without-nss |
295 |
- --without-tomcrypt |
296 |
- ) |
297 |
- |
298 |
- # print the ./configure call to aid in future debugging |
299 |
- echo bash ./configure "${myconf[@]}" >&2 |
300 |
- bash ./configure "${myconf[@]}" || die |
301 |
-} |
302 |
- |
303 |
-src_compile() { |
304 |
- emake all docs $(usex html '' 'ADOC=true') |
305 |
-} |
306 |
- |
307 |
-src_install() { |
308 |
- default |
309 |
- |
310 |
- newinitd "${FILESDIR}"/chronyd.init-r2 chronyd |
311 |
- newconfd "${T}"/chronyd.conf chronyd |
312 |
- |
313 |
- insinto /etc/${PN} |
314 |
- newins examples/chrony.conf.example1 chrony.conf |
315 |
- |
316 |
- docinto examples |
317 |
- dodoc examples/*.example* |
318 |
- |
319 |
- newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" |
320 |
- |
321 |
- if use html; then |
322 |
- docinto html |
323 |
- dodoc doc/*.html |
324 |
- fi |
325 |
- |
326 |
- keepdir /var/{lib,log}/chrony |
327 |
- |
328 |
- insinto /etc/logrotate.d |
329 |
- newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony |
330 |
- |
331 |
- systemd_dounit "${T}"/chronyd.service |
332 |
- systemd_dounit examples/chrony-wait.service |
333 |
- systemd_enable_ntpunit 50-chrony chronyd.service |
334 |
-} |
335 |
- |
336 |
-pkg_postinst() { |
337 |
- tmpfiles_process chronyd.conf |
338 |
-} |