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