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