summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2023-04-17 00:14:11 +0200
committerSebastian Pipping <sping@gentoo.org>2023-04-17 00:14:11 +0200
commit1a2b3e289d63dcde02b806711061f3c69626f3f8 (patch)
treef7132d05d240c75ed9d5ddcee947150452b7ec8a /net-misc/ntpsec/files
parentapp-admin/gopass-summon-provider: drop 1.15.3 (diff)
downloadgentoo-1a2b3e289d63dcde02b806711061f3c69626f3f8.tar.gz
gentoo-1a2b3e289d63dcde02b806711061f3c69626f3f8.tar.bz2
gentoo-1a2b3e289d63dcde02b806711061f3c69626f3f8.zip
net-misc/ntpsec: Drop old
Signed-off-by: Sebastian Pipping <sping@gentoo.org>
Diffstat (limited to 'net-misc/ntpsec/files')
-rw-r--r--net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch48
-rw-r--r--net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch34
-rw-r--r--net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rollup.patch116
-rw-r--r--net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch25
-rw-r--r--net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch34
5 files changed, 0 insertions, 257 deletions
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch
deleted file mode 100644
index dab51a97fc0a..000000000000
--- a/net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1a7bb2e3a2749bd709ea4cf10b66b6f6d05aaf9d Mon Sep 17 00:00:00 2001
-From: James Browning <jamesb.fe80@gmail.com>
-Date: Sun, 10 Apr 2022 07:53:37 -0700
-Subject: [PATCH] I: NTPsec build does not repect --notests
-
-STR: (run the following)
-- git clone https://gitlab.com/NTPsec/ntpsec
-- cd ntpsec
-- ./waf configure build --notests -p
-
-AR: NTPsec runs tests despite having a parameter telling it not to
-ER: NTPsec should not run tests when it has been told not to
----
- wscript | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/wscript b/wscript
-index c1d765046..d8a20b82e 100644
---- a/wscript
-+++ b/wscript
-@@ -1131,6 +1131,7 @@ def build(ctx):
- ctx.manpage(8, "ntpclients/ntpsnmpd-man.adoc")
-
- # Skip running unit tests on a cross compile build
-+ from waflib import Options
- if not ctx.env.ENABLE_CROSS:
- # Force re-running of tests. Same as 'waf --alltests'
- if ctx.cmd == "check":
-@@ -1139,6 +1140,8 @@ def build(ctx):
- # Print log if -v is supplied
- if verbose > 0:
- ctx.add_post_fun(test_print_log)
-+ elif Options.options.no_tests:
-+ return
-
- # Test binaries
- ctx.add_post_fun(bin_test)
-@@ -1152,7 +1155,6 @@ def build(ctx):
- ctx.add_post_fun(bin_test_summary)
- else:
- pprint("YELLOW", "Unit test runner skipped on a cross-compiled build.")
-- from waflib import Options
- Options.options.no_tests = True
-
- if ctx.cmd == "build":
---
-2.32.0
-
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch
deleted file mode 100644
index 5b7a4e51374c..000000000000
--- a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://gitlab.com/NTPsec/ntpsec/-/commit/a49d53b7fe1d
-https://bugs.gentoo.org/851531
-
-From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
-Date: Sat, 11 Jun 2022 15:16:15 +0200
-Subject: [PATCH] ntpd/ntp_sandbox.c: allow readv() for glibc nscd
- getaddrinfo() provider
-
-Otherwise, ntpd crashes from time to time with the following stack trace:
-#0 0x00007f5763bfac4d in readv () from /lib64/libc.so.6
-#1 0x00007f5763c48b4c in __readvall () from /lib64/libc.so.6
-#2 0x00007f5763c467ed in nscd_gethst_r () from /lib64/libc.so.6
-#3 0x00007f5763c46c0d in __nscd_gethostbyname2_r () from /lib64/libc.so.6
-#4 0x00007f5763c15a2a in gethostbyname2_r () from /lib64/libc.so.6
-#5 0x00007f5763bed3ca in gaih_inet.constprop () from /lib64/libc.so.6
-#6 0x00007f5763bee225 in getaddrinfo () from /lib64/libc.so.6
-#7 0x000055fcf0ad6544 in open_TCP_socket ()
-#8 0x000055fcf0ad79b4 in nts_probe ()
-#9 0x000055fcf0ac37c4 in dns_lookup ()
-#10 0x00007f5763b8205a in start_thread () from /lib64/libc.so.6
-#11 0x00007f5763c05d1c in clone3 () from /lib64/libc.so.6
-
-Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
---- a/ntpd/ntp_sandbox.c
-+++ b/ntpd/ntp_sandbox.c
-@@ -357,6 +357,7 @@ int scmp_sc[] = {
- SCMP_SYS(poll),
- SCMP_SYS(pselect6),
- SCMP_SYS(read),
-+ SCMP_SYS(readv), /* nscd getaddrinfo() provider */
- SCMP_SYS(recvfrom), /* Comment this out for testing.
- * It will die on the first reply.
- * (Or maybe sooner if a request arrives.)
-GitLab
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rollup.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rollup.patch
deleted file mode 100644
index c9ba3760cce6..000000000000
--- a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rollup.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 9a13c2bd472786472360f1a6465d8a808f6b8311 Mon Sep 17 00:00:00 2001
-From: Stephen L Arnold <nerdboy@gentoo.org>
-Date: Thu, 2 Dec 2021 20:16:18 -0800
-Subject: [PATCH] ntpd/ntp_sandbox.c: seccomp rollup patch for arm, arm64,
- riscv, all
-
-* add renameat2, move newfstatat and faccessat, remove arch dups
-* rollup previous patches, remove cruft
-* includes riscv fixes, previous bugs:
- https://bugs.gentoo.org/705128
- https://bugs.gentoo.org/786228
- https://bugs.gentoo.org/823692
- https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1247
- https://gitlab.com/NTPsec/ntpsec/-/issues/713
-
-Signed-off-by: Stephen L Arnold <nerdboy@gentoo.org>
----
- ntpd/ntp_sandbox.c | 27 +++++++++++++++++++--------
- 1 file changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/ntpd/ntp_sandbox.c b/ntpd/ntp_sandbox.c
-index e66faaa8c..04eaa003a 100644
---- a/ntpd/ntp_sandbox.c
-+++ b/ntpd/ntp_sandbox.c
-@@ -306,8 +306,8 @@ int scmp_sc[] = {
- #endif
- #endif /* ENABLE_EARLY_DROPROOT */
-
-- SCMP_SYS(accept),
-- SCMP_SYS(access),
-+ SCMP_SYS(accept),
-+ SCMP_SYS(access),
- SCMP_SYS(adjtimex),
- SCMP_SYS(bind),
- SCMP_SYS(brk),
-@@ -319,6 +319,9 @@ int scmp_sc[] = {
- SCMP_SYS(connect),
- SCMP_SYS(exit),
- SCMP_SYS(exit_group),
-+#ifdef __NR_faccessat
-+ SCMP_SYS(faccessat), /* riscv and aarch64 */
-+#endif
- SCMP_SYS(fcntl),
- SCMP_SYS(fstat),
- SCMP_SYS(fsync),
-@@ -349,11 +352,13 @@ int scmp_sc[] = {
- SCMP_SYS(lseek),
- SCMP_SYS(membarrier), /* Needed on Alpine 3.11.3 */
- SCMP_SYS(munmap),
-+ SCMP_SYS(newfstatat), /* riscv and aarch64 */
- SCMP_SYS(open),
- #ifdef __NR_openat
- SCMP_SYS(openat), /* SUSE */
- #endif
- SCMP_SYS(poll),
-+ SCMP_SYS(pread64),
- SCMP_SYS(pselect6),
- SCMP_SYS(read),
- SCMP_SYS(recvfrom), /* Comment this out for testing.
-@@ -362,6 +367,9 @@ int scmp_sc[] = {
- */
- SCMP_SYS(recvmsg),
- SCMP_SYS(rename),
-+#ifdef __NR_renameat2
-+ SCMP_SYS(renameat2), /* riscv */
-+#endif
- SCMP_SYS(rt_sigaction),
- SCMP_SYS(rt_sigprocmask),
- SCMP_SYS(rt_sigreturn),
-@@ -401,6 +409,7 @@ int scmp_sc[] = {
- * rather than generate a trap.
- */
- SCMP_SYS(clone), /* threads */
-+ SCMP_SYS(clone3),
- SCMP_SYS(kill), /* generate signal */
- SCMP_SYS(madvise),
- SCMP_SYS(mprotect),
-@@ -415,9 +424,9 @@ int scmp_sc[] = {
- SCMP_SYS(nanosleep),
- #endif
- #ifdef CLOCK_SHM
-- SCMP_SYS(shmget),
-- SCMP_SYS(shmat),
-- SCMP_SYS(shmdt),
-+ SCMP_SYS(shmget),
-+ SCMP_SYS(shmat),
-+ SCMP_SYS(shmdt),
- #endif
-
- SCMP_SYS(fcntl64),
-@@ -450,10 +459,9 @@ int scmp_sc[] = {
- SCMP_SYS(mmap),
- #endif
- #if defined(__aarch64__)
-- SCMP_SYS(faccessat),
-- SCMP_SYS(newfstatat),
-- SCMP_SYS(renameat),
- SCMP_SYS(linkat),
-+ SCMP_SYS(renameat),
-+ SCMP_SYS(syscall),
- SCMP_SYS(unlinkat),
- #endif
- #if defined(__i386__) || defined(__arm__) || defined(__powerpc__)
-@@ -463,6 +471,9 @@ int scmp_sc[] = {
- SCMP_SYS(send),
- SCMP_SYS(stat64),
- #endif
-+#if defined(__arm__)
-+ SCMP_SYS(statx),
-+#endif
- };
- {
- for (unsigned int i = 0; i < COUNTOF(scmp_sc); i++) {
---
-2.32.0
-
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch
deleted file mode 100644
index 155304148b1f..000000000000
--- a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1262
-https://bugs.gentoo.org/833274
-
-From 75970342391b0b1fad422e6ca3dc89dd76dcf607 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 7 Apr 2022 03:02:22 +0100
-Subject: [PATCH] ntpd/ntp_sandbox.c: allow rseq for glibc-2.35 in seccomp
- filter
-
-Fixes: https://gitlab.com/NTPsec/ntpsec/-/issues/728
-Bug: https://bugs.gentoo.org/833274
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/ntpd/ntp_sandbox.c
-+++ b/ntpd/ntp_sandbox.c
-@@ -366,6 +366,9 @@ int scmp_sc[] = {
- SCMP_SYS(rt_sigaction),
- SCMP_SYS(rt_sigprocmask),
- SCMP_SYS(rt_sigreturn),
-+#ifdef __NR_rseq
-+ SCMP_SYS(rseq), /* needed by glibc-2.35+ for resumable sequences */
-+#endif
- SCMP_SYS(sigaction),
- SCMP_SYS(sigprocmask),
- SCMP_SYS(sigreturn),
-GitLab
diff --git a/net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch b/net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch
deleted file mode 100644
index 027c3df18ad2..000000000000
--- a/net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f360741dec76a9c9d831f0b547596891ea321599 Mon Sep 17 00:00:00 2001
-From: James Browning <jamesb.fe80@gmail.com>
-Date: Sun, 10 Apr 2022 16:23:34 -0700
-Subject: [PATCH] clean test output up in Python 3
-
----
- wafhelpers/test.py | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/wafhelpers/test.py b/wafhelpers/test.py
-index 9351a5675..6bba34881 100644
---- a/wafhelpers/test.py
-+++ b/wafhelpers/test.py
-@@ -31,12 +31,13 @@ def test_print_log(ctx):
- pprint("YELLOW", "RETURN VALUE:", retval)
- print("")
-
-- if retval or error:
-+ if retval:
- pprint("RED", "****** ERROR ******\n")
-
-- print(error or lines)
-+ print(polystr(error) or polystr(lines))
-
-- if (not retval) and (not error):
-- pprint("GREEN", "****** LOG ******\n", lines)
-+ else:
-+ pprint("GREEN", "****** LOG ******\n",
-+ polystr(lines), polystr(error))
-
- print("")
---
-2.32.0
-