1 |
commit: 8728d886de354b0784996f49c07f1c4ed87f59a9 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 1 01:32:52 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 1 01:32:52 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8728d886 |
7 |
|
8 |
net-misc/ntpsec: Remove old (py3.6) |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
net-misc/ntpsec/Manifest | 2 - |
13 |
net-misc/ntpsec/files/ntpd.service | 15 - |
14 |
...-make-sure-logrotate-config-has-missingok.patch | 28 -- |
15 |
...ternalize-sys_maxclock-fix-for-bug-708522.patch | 23 -- |
16 |
.../ntpsec-1.1.8-fix-asciidoc-version-detect.patch | 372 --------------------- |
17 |
net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild | 159 --------- |
18 |
net-misc/ntpsec/ntpsec-1.1.8.ebuild | 167 --------- |
19 |
7 files changed, 766 deletions(-) |
20 |
|
21 |
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest |
22 |
index d0f3a234207..ce7e422fd68 100644 |
23 |
--- a/net-misc/ntpsec/Manifest |
24 |
+++ b/net-misc/ntpsec/Manifest |
25 |
@@ -1,3 +1 @@ |
26 |
-DIST ntpsec-1.1.7.tar.gz 2534524 BLAKE2B 5777ecca4ceb988632fadc0e7124530993a7758cdf335e8cd90f0ec1a8b643be89b67c0e2bf49d6d7193bf92ded138af0df4b5856c0d113f552ef22dd8a6cadf SHA512 734b12820539e655e504dd5071a58b9d1f80c0b0c3c7458c797ba7ada23d8e446751fbcbddd9832d9151a3ba9464749878db9e77e23cdd5f6215ab9e1d908ae9 |
27 |
-DIST ntpsec-1.1.8.tar.gz 2589363 BLAKE2B e7e11a7d980599ac598f084608160d3f6f6cf8e2aab5fb45cc15cabca30462bd03db7b9ecc140826c5d7b5e26f49b48f7f2b6043bdc2ffa1d73167347fb8123f SHA512 0920f25adf68f1b8ccd1734c5d61ba1c858cd86b342db7b5155dd9b58e538aa96aad3fd4058597f079ec3df63cb51d2900ac8e6d9c84d6f2bd4a3a22cc0c967c |
28 |
DIST ntpsec-1.1.9.tar.gz 2606066 BLAKE2B bbc482333c7f86936fa20751df1b427bc24be159969050caf5751e26724714bbf6491b120986563497f015c96ac9cdbdf0e999c6446a68798aff23076f631ecc SHA512 e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b |
29 |
|
30 |
diff --git a/net-misc/ntpsec/files/ntpd.service b/net-misc/ntpsec/files/ntpd.service |
31 |
deleted file mode 100644 |
32 |
index a551bb7b130..00000000000 |
33 |
--- a/net-misc/ntpsec/files/ntpd.service |
34 |
+++ /dev/null |
35 |
@@ -1,15 +0,0 @@ |
36 |
-[Unit] |
37 |
-Description=Network Time Service |
38 |
-After=network.target nss-lookup.target |
39 |
-Conflicts=systemd-timesyncd.service |
40 |
- |
41 |
-[Service] |
42 |
-Type=forking |
43 |
-PrivateTmp=true |
44 |
-EnvironmentFile=-/etc/conf.d/ntp |
45 |
-ExecStart=/usr/sbin/ntpd ${NTPD_OPTS} |
46 |
-Restart=always |
47 |
-RemainAfterExit=yes |
48 |
- |
49 |
-[Install] |
50 |
-WantedBy=multi-user.target |
51 |
|
52 |
diff --git a/net-misc/ntpsec/files/ntpsec-1.1.7-make-sure-logrotate-config-has-missingok.patch b/net-misc/ntpsec/files/ntpsec-1.1.7-make-sure-logrotate-config-has-missingok.patch |
53 |
deleted file mode 100644 |
54 |
index 4556d7a50f7..00000000000 |
55 |
--- a/net-misc/ntpsec/files/ntpsec-1.1.7-make-sure-logrotate-config-has-missingok.patch |
56 |
+++ /dev/null |
57 |
@@ -1,28 +0,0 @@ |
58 |
-From 252a301aba9a685b5b6df7824c576f52cc19fb81 Mon Sep 17 00:00:00 2001 |
59 |
-From: Stephen Arnold <nerdboy@g.o> |
60 |
-Date: Fri, 8 Nov 2019 16:41:16 -0800 |
61 |
-Subject: [PATCH] etc/logrotate-config.ntpd: make sure it has missingok |
62 |
- |
63 |
-* note master branch does not need this, but all the releases do |
64 |
- |
65 |
-Signed-off-by: Stephen Arnold <nerdboy@g.o> |
66 |
---- |
67 |
- etc/logrotate-config.ntpd | 2 ++ |
68 |
- 1 file changed, 2 insertions(+) |
69 |
- |
70 |
-diff --git a/etc/logrotate-config.ntpd b/etc/logrotate-config.ntpd |
71 |
-index e5d8616bf..a49129d45 100644 |
72 |
---- a/etc/logrotate-config.ntpd |
73 |
-+++ b/etc/logrotate-config.ntpd |
74 |
-@@ -5,6 +5,8 @@ |
75 |
- |
76 |
- /var/log/ntpd.log { |
77 |
- monthly |
78 |
-+ notifempty |
79 |
-+ missingok |
80 |
- postrotate |
81 |
- /usr/bin/killall -HUP ntpd |
82 |
- endscript |
83 |
--- |
84 |
-2.21.0 |
85 |
- |
86 |
|
87 |
diff --git a/net-misc/ntpsec/files/ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch b/net-misc/ntpsec/files/ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch |
88 |
deleted file mode 100644 |
89 |
index caeaf1824cc..00000000000 |
90 |
--- a/net-misc/ntpsec/files/ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch |
91 |
+++ /dev/null |
92 |
@@ -1,23 +0,0 @@ |
93 |
-From ccdd9d4b941b30fc44b301595e42809dbe48628d Mon Sep 17 00:00:00 2001 |
94 |
-From: James Browning <JamesB.fe80@×××××.com> |
95 |
-Date: Sun, 26 Jan 2020 09:58:36 -0800 |
96 |
-Subject: [PATCH] Externalize sys_maxclock from include/ntpd.h ... |
97 |
- |
98 |
-I think this will shut up the Fedora Rawhide runners |
99 |
---- |
100 |
- include/ntpd.h | 2 +- |
101 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
102 |
- |
103 |
-diff --git a/include/ntpd.h b/include/ntpd.h |
104 |
-index c4f9b9e45..ee16678e1 100644 |
105 |
---- a/include/ntpd.h |
106 |
-+++ b/include/ntpd.h |
107 |
-@@ -369,7 +369,7 @@ extern int peer_associations; /* mobilized associations */ |
108 |
- * System variables are declared here. See Section 3.2 of the |
109 |
- * specification. |
110 |
- */ |
111 |
--int sys_maxclock; /* maximum candidates */ |
112 |
-+extern int sys_maxclock; /* maximum candidates */ |
113 |
- struct system_variables { |
114 |
- uint8_t sys_leap; /* system leap indicator */ |
115 |
- uint8_t sys_stratum; /* system stratum */ |
116 |
|
117 |
diff --git a/net-misc/ntpsec/files/ntpsec-1.1.8-fix-asciidoc-version-detect.patch b/net-misc/ntpsec/files/ntpsec-1.1.8-fix-asciidoc-version-detect.patch |
118 |
deleted file mode 100644 |
119 |
index aabd8365433..00000000000 |
120 |
--- a/net-misc/ntpsec/files/ntpsec-1.1.8-fix-asciidoc-version-detect.patch |
121 |
+++ /dev/null |
122 |
@@ -1,372 +0,0 @@ |
123 |
-diff --git a/wafhelpers/asciidoc.py b/wafhelpers/asciidoc.py |
124 |
-index b6aa1f116..a2218bb69 100644 |
125 |
---- a/wafhelpers/asciidoc.py |
126 |
-+++ b/wafhelpers/asciidoc.py |
127 |
-@@ -1,73 +1,173 @@ |
128 |
--import re |
129 |
-- |
130 |
--from waflib import Task |
131 |
--from waflib.TaskGen import extension |
132 |
-- |
133 |
--# asciidoc -b html5 -a linkcss -a stylesdir=/mnt/devel/ntp/commit/docs \ |
134 |
--# -o asd driver32.adoc |
135 |
-- |
136 |
--# Borrowed from waf/docs/book/wscript in the Waf Project. |
137 |
--re_xi = re.compile('''^(include|image)::(.*?.(adoc|\\{PIC\\}))\[''', re.M) |
138 |
-- |
139 |
-- |
140 |
--def ascii_doc_scan(self): |
141 |
-- p = self.inputs[0].parent |
142 |
-- node_lst = [self.inputs[0]] |
143 |
-- seen = [] |
144 |
-- depnodes = [] |
145 |
-- |
146 |
-- while node_lst: |
147 |
-- nd = node_lst.pop(0) |
148 |
-- if nd in seen: |
149 |
-- continue |
150 |
-- seen.append(nd) |
151 |
-- |
152 |
-- code = nd.read() |
153 |
-- for m in re_xi.finditer(code): |
154 |
-- name = m.group(2) |
155 |
-- if m.group(3) == '{PIC}': |
156 |
-- |
157 |
-- ext = '.eps' |
158 |
-- if self.generator.rule.rfind('A2X') > 0: |
159 |
-- ext = '.png' |
160 |
-- |
161 |
-- k = p.find_resource(name.replace('{PIC}', ext)) |
162 |
-- if k: |
163 |
-- depnodes.append(k) |
164 |
-- else: |
165 |
-- k = self.inputs[0].find_resource(name) |
166 |
-- if k: |
167 |
-- depnodes.append(k) |
168 |
-- node_lst.append(k) |
169 |
-- return [depnodes, ()] |
170 |
-+'''Most of the functionality for building HTML and man pages from AsciiDoc.''' |
171 |
- |
172 |
-+import re |
173 |
- |
174 |
--# ASCIIDOC_FLAGS are almost always needed and need to be set by the user. |
175 |
--class asciidoc(Task.Task): |
176 |
-- color = "BLUE" |
177 |
-- run_str = '${BIN_ASCIIDOC} -b html5 -a linkcss ${ASCIIDOC_FLAGS} ' \ |
178 |
-- '-o ${TGT[0].name} ${SRC[0].abspath()}' |
179 |
-- ext_out = ".html" |
180 |
-+from waflib import Task # pylint: disable=import-error |
181 |
-+from waflib.TaskGen import extension # pylint: disable=import-error |
182 |
-+ |
183 |
-+ |
184 |
-+def options(opt): |
185 |
-+ 'Add command line options for AsciiDoc processing.' |
186 |
-+ grp = opt.add_option_group('NTP documentation configure options') |
187 |
-+ grp.add_option('--disable-doc', action='store_true', |
188 |
-+ default=False, help='Disable HTML document building.') |
189 |
-+ grp.add_option('--enable-doc', action='store_true', |
190 |
-+ default=False, help='Enable HTML document building.') |
191 |
-+ grp.add_option('--disable-manpage', action='store_true', |
192 |
-+ default=False, help='Disable manpage building.') |
193 |
-+ grp.add_option('--enable-manpage', action='store_true', |
194 |
-+ default=False, help='Enable manpage building.') |
195 |
-+ |
196 |
-+ |
197 |
-+def configure(ctx): |
198 |
-+ 'Set options from the extended environment and command line arguments.' |
199 |
-+ |
200 |
-+ if ctx.options.disable_doc and ctx.options.enable_doc: |
201 |
-+ ctx.fatal('--disable-doc and --enable-doc conflict.') |
202 |
-+ if ctx.options.disable_manpage and ctx.options.enable_manpage: |
203 |
-+ ctx.fatal('--disable-manpage and --enable-manpage conflict.') |
204 |
-+ |
205 |
-+ ctx.env.BUILD_DOC = False |
206 |
-+ ctx.env.BUILD_MAN = False |
207 |
-+ if ctx.options.disable_doc and ctx.options.disable_manpage: |
208 |
-+ ctx.msg('AsciiDoc processor', 'unnecessary') |
209 |
-+ return |
210 |
-+ |
211 |
-+ # asciidoctor versions < 1.5.8 throw warnings for manpages and driver_shm. |
212 |
-+ # asciidoc versions 8.6.5-8.6.7 throw warnings for warp.adoc and versions |
213 |
-+ # < 8.6.4 have no HTML5 backend. |
214 |
-+ # asciidoc3 versions < 3.0.2 throw errors. |
215 |
-+ adoc_list = [['asciidoctor', (1, 5, 8)], |
216 |
-+ ['asciidoc', (8, 6, 8)], |
217 |
-+ ['asciidoc3', (3, 0, 2)], |
218 |
-+ ] |
219 |
-+ for progname, asciidocminver in adoc_list: |
220 |
-+ if 'BIN_ASCIIDOC' not in ctx.env or ctx.env.BIN_ASCIIDOC == []: |
221 |
-+ # used to make man and HTML pages |
222 |
-+ ctx.find_program(progname, var='BIN_ASCIIDOC', mandatory=False) |
223 |
-+ # make sure asciidoc is new enough. |
224 |
-+ # based on check_python_version() from waf |
225 |
-+ |
226 |
-+ if ctx.env.BIN_ASCIIDOC: |
227 |
-+ # https://lists.ntpsec.org/pipermail/devel/2016-July/001778.html |
228 |
-+ # Get asciidoc version string |
229 |
-+ cmd = ctx.env.BIN_ASCIIDOC + ['--version'] |
230 |
-+ # example output: asciidoc 8.6.9 |
231 |
-+ version_string = ctx.cmd_and_log(cmd).split()[1] |
232 |
-+ match = re.match(r'^(\d+)\.(\d+)\.(\d+)', version_string) |
233 |
-+ if match: |
234 |
-+ version_tuple = tuple(map(int, match.groups())) |
235 |
-+ if version_tuple >= asciidocminver: |
236 |
-+ if progname == 'asciidoc': |
237 |
-+ ctx.find_program('a2x', var='BIN_A2X', mandatory=False) |
238 |
-+ ctx.find_program('xsltproc', var='BIN_XSLTPROC', |
239 |
-+ mandatory=False) |
240 |
-+ elif progname == 'asciidoc3': |
241 |
-+ ctx.find_program('a2x3', var='BIN_A2X', mandatory=False) |
242 |
-+ ctx.find_program('xsltproc', var='BIN_XSLTPROC', |
243 |
-+ mandatory=False) |
244 |
-+ |
245 |
-+ if version_tuple >= asciidocminver: |
246 |
-+ color = 'GREEN' |
247 |
-+ else: |
248 |
-+ color = 'YELLOW' |
249 |
-+ ctx.env.BIN_ASCIIDOC = [] |
250 |
-+ ctx.msg('Checking for %s version >= %s' % |
251 |
-+ (progname, '%d.%d.%d' % asciidocminver), |
252 |
-+ version_string, color=color) |
253 |
-+ |
254 |
-+ if not ctx.env.BIN_ASCIIDOC: |
255 |
-+ if not (ctx.options.enable_doc or ctx.options.enable_manpage): |
256 |
-+ # The user did not require either, so this is fine. |
257 |
-+ return |
258 |
-+ |
259 |
-+ error = 'no AsciiDoc processor qualified' |
260 |
-+ if ctx.options.enable_doc: |
261 |
-+ error += ', remove --enable-doc' |
262 |
-+ if ctx.options.enable_manpage: |
263 |
-+ error += ', remove --enable-manpage' |
264 |
-+ ctx.fatal(error) |
265 |
-+ |
266 |
-+ ctx.env.BUILD_DOC = not ctx.options.disable_doc |
267 |
-+ ctx.env.BUILD_MAN = not ctx.options.disable_manpage |
268 |
-+ |
269 |
-+ if 'asciidoctor' in ctx.env.BIN_ASCIIDOC[0]: |
270 |
-+ ctx.env.ARGS_DOC = [ |
271 |
-+ ctx.env.BIN_ASCIIDOC[0], |
272 |
-+ '-a', 'attribute-missing=warn', |
273 |
-+ # To eliminate compat-mode: |
274 |
-+ # 'italics' needs to be changed to _italics_ |
275 |
-+ # +monospace+ needs to be changed to `monospace` |
276 |
-+ # https://asciidoctor.org/docs/migration/#migration-cheatsheet |
277 |
-+ '-a', 'compat-mode', |
278 |
-+ ] |
279 |
-+ ctx.env.ARGS_MAN = ctx.env.ARGS_DOC + [ |
280 |
-+ '-b', 'manpage', |
281 |
-+ ] |
282 |
-+ ctx.env.ARGS_DOC += [ |
283 |
-+ '-b', 'xhtml5', '-a', 'linkcss', |
284 |
-+ '-a', 'stylesheet=asciidoc.css', |
285 |
-+ ] |
286 |
-+ elif 'asciidoc' in ctx.env.BIN_ASCIIDOC[0]: |
287 |
-+ ctx.env.ARGS_DOC = [ |
288 |
-+ ctx.env.BIN_ASCIIDOC[0], |
289 |
-+ '-a', 'attribute-missing=warn', |
290 |
-+ '-b', 'html5', '-a', 'linkcss', |
291 |
-+ '-a', 'stylesheet=asciidoc.css', |
292 |
-+ ] |
293 |
-+ if ctx.env.BIN_A2X and ctx.env.BIN_XSLTPROC: |
294 |
-+ ctx.env.ARGS_MAN = [ |
295 |
-+ ctx.env.BIN_A2X[0], |
296 |
-+ '-a', 'attribute-missing=warn', |
297 |
-+ '-f', 'manpage', '--no-xmllint', |
298 |
-+ ] |
299 |
-+ else: |
300 |
-+ if ctx.options.enable_manpage: |
301 |
-+ ctx.fatal('a2x/xsltproc not found, remove --enable-manpage') |
302 |
-+ ctx.env.BUILD_MAN = False |
303 |
-+ |
304 |
-+ |
305 |
-+def build(ctx): |
306 |
-+ 'Set processor noise level and set HTML pages to build.' |
307 |
-+ from waflib.Logs import verbose # pylint: disable=import-error |
308 |
-+ if verbose > 1: # Pass verbosity to AsciiDoc toolchain |
309 |
-+ if ctx.env.ARGS_DOC: |
310 |
-+ ctx.env.ARGS_DOC += ['-v'] |
311 |
-+ if ctx.env.ARGS_MAN: |
312 |
-+ ctx.env.ARGS_MAN += ['-v'] |
313 |
-+ if ctx.env.BUILD_DOC and ctx.variant == 'main': |
314 |
-+ ctx.recurse('docs') |
315 |
-+ |
316 |
-+ |
317 |
-+class html(Task.Task): |
318 |
-+ 'Define HTML build process.' |
319 |
-+ # Optional weight to tune the priority for task instances. |
320 |
-+ # The higher, the earlier. The weight only applies to single task objects. |
321 |
-+ weight = 3 # set arbitrarily high to be first as to not slow down later tasks |
322 |
-+ run_str = '${ARGS_DOC} -o ${TGT[0].name} ${SRC[0].abspath()}' |
323 |
-+ ext_out = '.html' |
324 |
-+ |
325 |
-+ |
326 |
-+class man(Task.Task): |
327 |
-+ 'Define manpage build process.' |
328 |
-+ weight = 2 # set arbitrarily high to be second as to not slow down later tasks (Failed) |
329 |
-+ run_str = '${ARGS_MAN} ${SRC[0].abspath()}' |
330 |
- |
331 |
- |
332 |
- @extension('.adoc') |
333 |
--def run_asciidoc(self, node): |
334 |
-- out = node.change_ext(".html") |
335 |
-- tsk = self.create_task("asciidoc", node, [out]) |
336 |
-+def run_html(self, node): |
337 |
-+ 'Add HTML build caller function.' |
338 |
-+ out = node.change_ext('.html') |
339 |
-+ tsk = self.create_task('html', node, [out]) |
340 |
- tsk.cwd = node.parent.get_bld().abspath() |
341 |
- |
342 |
- |
343 |
--class a2x(Task.Task): |
344 |
-- color = "YELLOW" |
345 |
-- shell = True |
346 |
-- run_str = '${BIN_A2X} ${A2X_FLAGS} ${SRC[0].abspath()}' |
347 |
-- scan = ascii_doc_scan |
348 |
-- |
349 |
-- |
350 |
- @extension('.man-tmp') |
351 |
--def run_a2x(self, node): |
352 |
-+def run_manpage(self, node): |
353 |
-+ 'Add manpage build caller function.' |
354 |
- n_file = node.path_from(self.bld.bldnode) |
355 |
-- out = "%s.%s" % (n_file.replace("-man.adoc.man-tmp", ""), self.section) |
356 |
-+ out = '%s.%s' % (n_file.replace('-man.adoc.man-tmp', ''), self.section) |
357 |
- out_n = self.bld.path.find_or_declare(out) |
358 |
-- self.create_task('a2x', node, out_n) |
359 |
-- self.bld.install_files("${MANDIR}/man%s/" % self.section, out_n) |
360 |
-+ self.create_task('man', node, out_n) |
361 |
-+ self.bld.install_files('${MANDIR}/man%s/' % self.section, out_n) |
362 |
-+ weight = 3 |
363 |
-diff --git a/wafhelpers/waf.py b/wafhelpers/waf.py |
364 |
-index 96f753ecb..4f2d562a4 100644 |
365 |
---- a/wafhelpers/waf.py |
366 |
-+++ b/wafhelpers/waf.py |
367 |
-@@ -41,10 +41,7 @@ def manpage_subst_fun(self, code): |
368 |
- @conf |
369 |
- def manpage(ctx, section, source): |
370 |
- |
371 |
-- # ctx.install_files('${MANDIR}' + "/man%s/" % section, |
372 |
-- # source.replace("-man.adoc", ".%s" % section)) |
373 |
-- |
374 |
-- if not ctx.env.ENABLE_DOC or ctx.env.DISABLE_MANPAGE: |
375 |
-+ if not ctx.env.BUILD_MAN: |
376 |
- return |
377 |
- |
378 |
- ctx(features="subst", |
379 |
-diff --git a/wscript b/wscript |
380 |
-index c7c5468b1..601edaacd 100644 |
381 |
---- a/wscript |
382 |
-+++ b/wscript |
383 |
-@@ -55,10 +55,12 @@ Usage: waf <command> |
384 |
- |
385 |
- def options(ctx): |
386 |
- options_cmd(ctx, config) |
387 |
-+ ctx.load('asciidoc', tooldir='wafhelpers/') |
388 |
- ctx.recurse("pylib") |
389 |
- |
390 |
- |
391 |
- def configure(ctx): |
392 |
-+ ctx.load('asciidoc', tooldir='wafhelpers/') |
393 |
- class oc(Build.BuildContext): |
394 |
- cmd = 'oc' |
395 |
- |
396 |
-@@ -93,7 +95,6 @@ def configure(ctx): |
397 |
- ctx.run_build_cls = 'check' |
398 |
- ctx.load('waf', tooldir='wafhelpers/') |
399 |
- ctx.load('waf_unit_test') |
400 |
-- ctx.load('pytest') |
401 |
- ctx.load('gnu_dirs') |
402 |
- |
403 |
- with open("VERSION", "r") as f: |
404 |
-@@ -148,55 +149,6 @@ def configure(ctx): |
405 |
- ctx.find_program("awk", var="BIN_AWK", mandatory=False) |
406 |
- ctx.find_program("sh", var="BIN_SH", mandatory=False) |
407 |
- |
408 |
-- # used to make man and html pages |
409 |
-- ctx.find_program("asciidoc", var="BIN_ASCIIDOC", mandatory=False) |
410 |
-- # make sure asciidoc is new enough. |
411 |
-- # based on check_python_version() from waf |
412 |
-- if ctx.env.BIN_ASCIIDOC: |
413 |
-- # https://lists.ntpsec.org/pipermail/devel/2016-July/001778.html |
414 |
-- asciidocminver = (8, 6, 0) |
415 |
-- # Get asciidoc version string |
416 |
-- cmd = ctx.env.BIN_ASCIIDOC + ['--version'] |
417 |
-- # example output: asciidoc 8.6.9 |
418 |
-- lines = ctx.cmd_and_log(cmd).split()[1].split(".") |
419 |
-- assert len(lines) == 3, "found %r lines, expected 3: %r" \ |
420 |
-- % (len(lines), lines) |
421 |
-- asciidocver_tuple = (int(lines[0]), int(lines[1]), int(lines[2])) |
422 |
-- |
423 |
-- # Compare asciidoc version with the minimum required |
424 |
-- result = (asciidocver_tuple >= asciidocminver) |
425 |
-- |
426 |
-- asciidocver_full = '.'.join(map(str, asciidocver_tuple[:3])) |
427 |
-- asciidocminver_str = '.'.join(map(str, asciidocminver)) |
428 |
-- ctx.msg('Checking for asciidoc version >= %s' % (asciidocminver_str,), |
429 |
-- asciidocver_full, color=result and 'GREEN' or 'YELLOW') |
430 |
-- |
431 |
-- if not result: |
432 |
-- del ctx.env.BIN_ASCIIDOC |
433 |
-- ctx.find_program("a2x", var="BIN_A2X", mandatory=False) |
434 |
-- ctx.find_program("xsltproc", var="BIN_XSLTPROC", mandatory=False) |
435 |
-- |
436 |
-- ctx.env.ENABLE_DOC = False |
437 |
-- if ctx.env.BIN_ASCIIDOC and ctx.env.BIN_XSLTPROC and ctx.env.BIN_A2X: |
438 |
-- ctx.env.ENABLE_DOC = True |
439 |
-- |
440 |
-- if ctx.options.enable_doc and not ctx.env.ENABLE_DOC: |
441 |
-- ctx.fatal("asciidoc and xsltproc are required in order " |
442 |
-- "to build documentation") |
443 |
-- elif ctx.options.enable_doc: |
444 |
-- ctx.env.ASCIIDOC_FLAGS = [] |
445 |
-- ctx.env.ENABLE_DOC_USER = ctx.options.enable_doc |
446 |
-- |
447 |
-- # XXX: conditionally build this with --disable-man? |
448 |
-- # Should it build without docs enabled? |
449 |
-- ctx.env.A2X_FLAGS = ["--format", "manpage"] |
450 |
-- if not ctx.options.enable_a2x_xmllint: |
451 |
-- ctx.env.A2X_FLAGS += ["--no-xmllint"] |
452 |
-- |
453 |
-- # Disable manpages within build() |
454 |
-- if ctx.options.disable_manpage: |
455 |
-- ctx.env.DISABLE_MANPAGE = True |
456 |
-- |
457 |
- ctx.check_cfg( |
458 |
- package='systemd', variables=['systemdsystemunitdir'], |
459 |
- uselib_store='SYSTEMD', mandatory=False, |
460 |
-@@ -662,7 +614,7 @@ int main(int argc, char **argv) { |
461 |
- ('strlcat', ["string.h"]) |
462 |
- ) |
463 |
- for ft in optional_functions: |
464 |
-- probe_function(ctx, function=ft[0], prerequisites=ft[1]) |
465 |
-+ probe_function(ctx, function=ft[0], prerequisites=ft[1]) |
466 |
- |
467 |
- # This area is still work in progress |
468 |
- # Need to disable making symbols |
469 |
-@@ -897,8 +848,8 @@ int main(int argc, char **argv) { |
470 |
- msg_setting("Droproot Support", droproot_type) |
471 |
- msg_setting("Debug Support", yesno(ctx.options.enable_debug)) |
472 |
- msg_setting("Refclocks", ", ".join(sorted(ctx.env.REFCLOCK_LIST))) |
473 |
-- msg_setting("Build Manpages", |
474 |
-- yesno(ctx.env.ENABLE_DOC and not ctx.env.DISABLE_MANPAGE)) |
475 |
-+ msg_setting("Build Docs", yesno(ctx.env.BUILD_DOC)) |
476 |
-+ msg_setting("Build Manpages", yesno(ctx.env.BUILD_MAN)) |
477 |
- |
478 |
- ctx.recurse("pylib") |
479 |
- # Convert the Python directories to absolute paths. |
480 |
-@@ -1035,14 +986,6 @@ def build(ctx): |
481 |
- # the build directory never happens. This is how we foil that. |
482 |
- ctx.add_pre_fun(lambda ctx: ctx.exec_command("rm -f pylib/*.py[co]")) |
483 |
- |
484 |
-- if verbose > 0: # Pass Verbosity to asciidoc and a2x |
485 |
-- ctx.env.A2X_FLAGS += ["-v"] |
486 |
-- ctx.env.ASCIIDOC_FLAGS += ["-v"] |
487 |
-- |
488 |
-- if ctx.env.ENABLE_DOC_USER: |
489 |
-- if ctx.variant != "main": |
490 |
-- ctx.recurse("docs") |
491 |
-- |
492 |
- if ctx.variant == "host": |
493 |
- ctx.recurse("ntpd") |
494 |
- return |
495 |
|
496 |
diff --git a/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild |
497 |
deleted file mode 100644 |
498 |
index c739bc48113..00000000000 |
499 |
--- a/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild |
500 |
+++ /dev/null |
501 |
@@ -1,159 +0,0 @@ |
502 |
-# Copyright 1999-2020 Gentoo Authors |
503 |
-# Distributed under the terms of the GNU General Public License v2 |
504 |
- |
505 |
-EAPI=6 |
506 |
- |
507 |
-PYTHON_COMPAT=( python3_6 ) |
508 |
-PYTHON_REQ_USE='threads(+)' |
509 |
- |
510 |
-inherit flag-o-matic python-r1 waf-utils systemd |
511 |
- |
512 |
-if [[ ${PV} == *9999* ]]; then |
513 |
- inherit git-r3 |
514 |
- EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" |
515 |
- BDEPEND="" |
516 |
-else |
517 |
- SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" |
518 |
- RESTRICT="mirror" |
519 |
- BDEPEND="" |
520 |
- KEYWORDS="amd64 arm arm64 ~x86" |
521 |
-fi |
522 |
- |
523 |
-DESCRIPTION="The NTP reference implementation, refactored" |
524 |
-HOMEPAGE="https://www.ntpsec.org/" |
525 |
- |
526 |
-NTPSEC_REFCLOCK=( |
527 |
- oncore trimble truetime gpsd jjy generic spectracom |
528 |
- shm pps hpgps zyfer arbiter nmea neoclock modem |
529 |
- local) |
530 |
- |
531 |
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} |
532 |
- |
533 |
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" |
534 |
-SLOT="0" |
535 |
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice |
536 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" |
537 |
- |
538 |
-# net-misc/pps-tools oncore,pps |
539 |
-CDEPEND="${PYTHON_DEPS} |
540 |
- ${BDEPEND} |
541 |
- sys-libs/libcap |
542 |
- dev-python/psutil[${PYTHON_USEDEP}] |
543 |
- libbsd? ( dev-libs/libbsd:0= ) |
544 |
- dev-libs/openssl:0= |
545 |
- seccomp? ( sys-libs/libseccomp ) |
546 |
-" |
547 |
-RDEPEND="${CDEPEND} |
548 |
- ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) |
549 |
- !net-misc/ntp |
550 |
- !net-misc/openntpd |
551 |
- acct-group/ntp |
552 |
- acct-user/ntp |
553 |
-" |
554 |
-DEPEND="${CDEPEND} |
555 |
- app-text/asciidoc |
556 |
- dev-libs/libxslt |
557 |
- app-text/docbook-xsl-stylesheets |
558 |
- sys-devel/bison |
559 |
- rclock_oncore? ( net-misc/pps-tools ) |
560 |
- rclock_pps? ( net-misc/pps-tools ) |
561 |
-" |
562 |
- |
563 |
-WAF_BINARY="${S}/waf" |
564 |
- |
565 |
-src_prepare() { |
566 |
- default |
567 |
- # Remove autostripping of binaries |
568 |
- sed -i -e '/Strip binaries/d' wscript |
569 |
- eapply "${FILESDIR}/${P}"-make-sure-logrotate-config-has-missingok.patch |
570 |
- if ! use libbsd ; then |
571 |
- epatch "${FILESDIR}/${PN}-no-bsd.patch" |
572 |
- fi |
573 |
- python_copy_sources |
574 |
-} |
575 |
- |
576 |
-src_configure() { |
577 |
- is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin |
578 |
- |
579 |
- local string_127="" |
580 |
- local rclocks=""; |
581 |
- local CLOCKSTRING="" |
582 |
- |
583 |
- for refclock in ${NTPSEC_REFCLOCK[@]} ; do |
584 |
- if use rclock_${refclock} ; then |
585 |
- string_127+="$refclock," |
586 |
- fi |
587 |
- done |
588 |
- CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" |
589 |
- |
590 |
- local myconf=( |
591 |
- --nopyc |
592 |
- --nopyo |
593 |
- --refclock="${CLOCKSTRING}" |
594 |
- --build-epoch="$(date +%s)" |
595 |
- $(use doc && echo "--enable-doc") |
596 |
- $(use early && echo "--enable-early-droproot") |
597 |
- $(use gdb && echo "--enable-debug-gdb") |
598 |
- $(use samba && echo "--enable-mssntp") |
599 |
- $(use seccomp && echo "--enable-seccomp") |
600 |
- $(use smear && echo "--enable-leap-smear") |
601 |
- $(use tests && echo "--alltests") |
602 |
- $(use debug && echo "--enable-debug") |
603 |
- ) |
604 |
- |
605 |
- python_configure() { |
606 |
- waf-utils_src_configure "${myconf[@]}" |
607 |
- } |
608 |
- python_foreach_impl run_in_build_dir python_configure |
609 |
-} |
610 |
- |
611 |
-src_compile() { |
612 |
- unset MAKEOPTS |
613 |
- python_compile() { |
614 |
- waf-utils_src_compile |
615 |
- } |
616 |
- python_foreach_impl run_in_build_dir python_compile |
617 |
-} |
618 |
- |
619 |
-src_install() { |
620 |
- python_install() { |
621 |
- waf-utils_src_install |
622 |
- } |
623 |
- python_foreach_impl run_in_build_dir python_install |
624 |
- python_foreach_impl python_optimize |
625 |
- |
626 |
- # Install heat generating scripts |
627 |
- use heat && dosbin "${S}"/contrib/ntpheat{,usb} |
628 |
- |
629 |
- # Install the openrc files |
630 |
- newinitd "${FILESDIR}"/ntpd.rc-r2 ntp |
631 |
- newconfd "${FILESDIR}"/ntpd.confd ntp |
632 |
- |
633 |
- # Install the systemd unit file |
634 |
- systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service |
635 |
- |
636 |
- # Prepare a directory for the ntp.drift file |
637 |
- mkdir -pv "${ED}"/var/lib/ntp |
638 |
- chown ntp:ntp "${ED}"/var/lib/ntp |
639 |
- chmod 770 "${ED}"/var/lib/ntp |
640 |
- keepdir /var/lib/ntp |
641 |
- |
642 |
- # Install a log rotate script |
643 |
- mkdir -pv "${ED}"/etc/logrotate.d |
644 |
- cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd |
645 |
- |
646 |
- # Install the configuration file and sample configuration |
647 |
- cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf |
648 |
- cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/ |
649 |
- |
650 |
- # move doc files to /usr/share/doc/"${P}" |
651 |
- use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html |
652 |
-} |
653 |
- |
654 |
-pkg_postinst() { |
655 |
- einfo "If you want to serve time on your local network, then" |
656 |
- einfo "you should disable all the ref_clocks unless you have" |
657 |
- einfo "one and can get stable time from it. Feel free to try" |
658 |
- einfo "it but PPS probably won't work unless you have a UART" |
659 |
- einfo "GPS that actually provides PPS messages." |
660 |
-} |
661 |
|
662 |
diff --git a/net-misc/ntpsec/ntpsec-1.1.8.ebuild b/net-misc/ntpsec/ntpsec-1.1.8.ebuild |
663 |
deleted file mode 100644 |
664 |
index 9c6f4b05b29..00000000000 |
665 |
--- a/net-misc/ntpsec/ntpsec-1.1.8.ebuild |
666 |
+++ /dev/null |
667 |
@@ -1,167 +0,0 @@ |
668 |
-# Copyright 1999-2020 Gentoo Authors |
669 |
-# Distributed under the terms of the GNU General Public License v2 |
670 |
- |
671 |
-EAPI=6 |
672 |
- |
673 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
674 |
-PYTHON_REQ_USE='threads(+)' |
675 |
- |
676 |
-inherit flag-o-matic python-r1 waf-utils systemd |
677 |
- |
678 |
-if [[ ${PV} == *9999* ]]; then |
679 |
- inherit git-r3 |
680 |
- EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" |
681 |
- BDEPEND="" |
682 |
-else |
683 |
- SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" |
684 |
- RESTRICT="mirror" |
685 |
- BDEPEND="" |
686 |
- KEYWORDS="amd64 arm arm64 ~x86" |
687 |
-fi |
688 |
- |
689 |
-DESCRIPTION="The NTP reference implementation, refactored" |
690 |
-HOMEPAGE="https://www.ntpsec.org/" |
691 |
- |
692 |
-NTPSEC_REFCLOCK=( |
693 |
- oncore trimble truetime gpsd jjy generic spectracom |
694 |
- shm pps hpgps zyfer arbiter nmea neoclock modem |
695 |
- local) |
696 |
- |
697 |
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} |
698 |
- |
699 |
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" |
700 |
-SLOT="0" |
701 |
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice |
702 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" |
703 |
- |
704 |
-# net-misc/pps-tools oncore,pps |
705 |
-CDEPEND="${PYTHON_DEPS} |
706 |
- ${BDEPEND} |
707 |
- sys-libs/libcap |
708 |
- dev-python/psutil[${PYTHON_USEDEP}] |
709 |
- libbsd? ( dev-libs/libbsd:0= ) |
710 |
- dev-libs/openssl:0= |
711 |
- seccomp? ( sys-libs/libseccomp ) |
712 |
-" |
713 |
-RDEPEND="${CDEPEND} |
714 |
- ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) |
715 |
- !net-misc/ntp |
716 |
- !net-misc/openntpd |
717 |
- acct-group/ntp |
718 |
- acct-user/ntp |
719 |
-" |
720 |
-DEPEND="${CDEPEND} |
721 |
- app-text/asciidoc |
722 |
- dev-libs/libxslt |
723 |
- app-text/docbook-xsl-stylesheets |
724 |
- sys-devel/bison |
725 |
- rclock_oncore? ( net-misc/pps-tools ) |
726 |
- rclock_pps? ( net-misc/pps-tools ) |
727 |
-" |
728 |
- |
729 |
-WAF_BINARY="${S}/waf" |
730 |
- |
731 |
-PATCHES=( "${FILESDIR}/${P}-externalize-sys_maxclock-fix-for-bug-708522.patch" |
732 |
- "${FILESDIR}/${P}-fix-missing-scmp_sys-on-aarch64.patch" |
733 |
- "${FILESDIR}/${P}-fix-asciidoc-version-detect.patch") |
734 |
- |
735 |
-src_prepare() { |
736 |
- default |
737 |
- # Remove autostripping of binaries |
738 |
- sed -i -e '/Strip binaries/d' wscript |
739 |
- if ! use libbsd ; then |
740 |
- epatch "${FILESDIR}/${PN}-no-bsd.patch" |
741 |
- fi |
742 |
- python_copy_sources |
743 |
-} |
744 |
- |
745 |
-src_configure() { |
746 |
- is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin |
747 |
- |
748 |
- local string_127="" |
749 |
- local rclocks=""; |
750 |
- local CLOCKSTRING="" |
751 |
- |
752 |
- for refclock in ${NTPSEC_REFCLOCK[@]} ; do |
753 |
- if use rclock_${refclock} ; then |
754 |
- string_127+="$refclock," |
755 |
- fi |
756 |
- done |
757 |
- CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" |
758 |
- |
759 |
- local myconf=( |
760 |
- --nopyc |
761 |
- --nopyo |
762 |
- --refclock="${CLOCKSTRING}" |
763 |
- --build-epoch="$(date +%s)" |
764 |
- $(use doc && echo "--enable-doc") |
765 |
- $(use early && echo "--enable-early-droproot") |
766 |
- $(use gdb && echo "--enable-debug-gdb") |
767 |
- $(use samba && echo "--enable-mssntp") |
768 |
- $(use seccomp && echo "--enable-seccomp") |
769 |
- $(use smear && echo "--enable-leap-smear") |
770 |
- $(use tests && echo "--alltests") |
771 |
- $(use debug && echo "--enable-debug") |
772 |
- ) |
773 |
- |
774 |
- python_configure() { |
775 |
- waf-utils_src_configure "${myconf[@]}" |
776 |
- } |
777 |
- python_foreach_impl run_in_build_dir python_configure |
778 |
-} |
779 |
- |
780 |
-src_compile() { |
781 |
- unset MAKEOPTS |
782 |
- python_compile() { |
783 |
- waf-utils_src_compile |
784 |
- } |
785 |
- python_foreach_impl run_in_build_dir python_compile |
786 |
-} |
787 |
- |
788 |
-src_install() { |
789 |
- python_install() { |
790 |
- waf-utils_src_install |
791 |
- } |
792 |
- python_foreach_impl run_in_build_dir python_install |
793 |
- python_foreach_impl python_optimize |
794 |
- |
795 |
- # Install heat generating scripts |
796 |
- use heat && dosbin "${S}"/contrib/ntpheat{,usb} |
797 |
- |
798 |
- # Install the openrc files |
799 |
- newinitd "${FILESDIR}"/ntpd.rc-r2 ntp |
800 |
- newconfd "${FILESDIR}"/ntpd.confd ntp |
801 |
- |
802 |
- # Install the systemd unit file |
803 |
- systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service |
804 |
- |
805 |
- # Prepare a directory for the ntp.drift file |
806 |
- mkdir -pv "${ED}"/var/lib/ntp |
807 |
- chown ntp:ntp "${ED}"/var/lib/ntp |
808 |
- chmod 770 "${ED}"/var/lib/ntp |
809 |
- keepdir /var/lib/ntp |
810 |
- |
811 |
- # Install a log rotate script |
812 |
- mkdir -pv "${ED}"/etc/logrotate.d |
813 |
- cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd |
814 |
- |
815 |
- # Install the configuration file and sample configuration |
816 |
- cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf |
817 |
- cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/ |
818 |
- |
819 |
- # move doc files to /usr/share/doc/"${P}" |
820 |
- if use doc; then |
821 |
- mv -v "${ED}"/usr/share/doc/"${PN}" \ |
822 |
- "${ED}"/usr/share/doc/"${PF}"/html |
823 |
- else |
824 |
- rm -rf "${ED}"/usr/share/doc/"${PN}" |
825 |
- fi |
826 |
-} |
827 |
- |
828 |
-pkg_postinst() { |
829 |
- einfo "If you want to serve time on your local network, then" |
830 |
- einfo "you should disable all the ref_clocks unless you have" |
831 |
- einfo "one and can get stable time from it. Feel free to try" |
832 |
- einfo "it but PPS probably won't work unless you have a UART" |
833 |
- einfo "GPS that actually provides PPS messages." |
834 |
-} |