diff options
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/Manifest.gz | bin | 53977 -> 53977 bytes | |||
-rw-r--r-- | net-misc/mobile-broadband-provider-info/Manifest | 2 | ||||
-rw-r--r-- | net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20230416.ebuild | 22 | ||||
-rw-r--r-- | net-misc/ntpsec/Manifest | 11 | ||||
-rw-r--r-- | net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch | 48 | ||||
-rw-r--r-- | net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch | 34 | ||||
-rw-r--r-- | net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rollup.patch | 116 | ||||
-rw-r--r-- | net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch | 25 | ||||
-rw-r--r-- | net-misc/ntpsec/files/ntpsec-1.2.2-logrotate.patch | 26 | ||||
-rw-r--r-- | net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch | 34 | ||||
-rw-r--r-- | net-misc/ntpsec/ntpsec-1.2.2-r1.ebuild (renamed from net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild) | 15 | ||||
-rw-r--r-- | net-misc/ntpsec/ntpsec-9999.ebuild | 1 |
12 files changed, 59 insertions, 275 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex b4bd01c378fb..75e0a2d86f28 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest index 5ebfd4184aeb..20cb73f8f1cb 100644 --- a/net-misc/mobile-broadband-provider-info/Manifest +++ b/net-misc/mobile-broadband-provider-info/Manifest @@ -1,3 +1,5 @@ DIST mobile-broadband-provider-info-20221107.tar.xz 85416 BLAKE2B 91772a7f16fbba8d477abd623e4902e1aa2317ba0e226ab493ca8cc94bd6dc4c68ea61fc2f3d8f1f4c6bbfce2d7b27dc9dcfa3d35df6a9c9370b9c4ff277318f SHA512 e72fc1c78dd1bf991fc29ba952757af9c38d11e3e918662ce6380337c75eaa56fe33705f6d1eb78627378e1575b4102dceaa68e5e035c62c02e60570752f3e86 +DIST mobile-broadband-provider-info-20230416.tar.xz 85884 BLAKE2B 51416cbd7e208eca14a5ddf023cad4a76495773794fed7955cfb346950614b1b6d6f9df7d24525c769c2742381eb9d8780575fe9d0bc0de333b17be3d53400d1 SHA512 fd6be1387284b31fa300fe59244a5d2d65c9851037f78b540d8d907c9bedd1ec24a8d23bf66403a30995ddb4791b7cb746952d9438c08c846906f6825c44dd9b EBUILD mobile-broadband-provider-info-20221107.ebuild 488 BLAKE2B 412a87ce704d84c711295ef2eb551d61d7a5228535ccf0127edb5734c234084391fd06cf56d4f74b6e97c6aba73ba285101f50288b57054a05a140bc5f5258a3 SHA512 a12cab7fe9065286e27398e090f48a7cc674cd9f3bab7ae34330ba7b57e036548e8db146701c4a1e513c96f7ec180e7a0157aaf5c6697156a4a535e95682e5bc +EBUILD mobile-broadband-provider-info-20230416.ebuild 495 BLAKE2B 7351e5350821754a82c01db19c37ae720eaf1cbc8d6b6dd88671a288e2f34ce7100843176c1ff7d2dd9a546bb5730bec881ce8142a00ed754a09a3200b10f980 SHA512 41bd5e961042c238fb062c20d4742f0c3173898b102884bff092bbf4fe4d69b73fe9c173dfe31252954ab0f3fe9e7fb5c8103ce7e31f0a853bd0c6c44447edbb MISC metadata.xml 371 BLAKE2B 0bebc02fecc2a73323bb775ef52ccad19b856e70beb7202a588d128d3abc8fd77fa0937cc3ae897596c29dca0d3ce0e0d2ef88b3528ac90a07db4de1e0b97a46 SHA512 3b3eb4caef7124cb52d7a42d4abffcafc7b0f480546a57fd568b7ac98e22b217105f0699c4ab0c9ee3d004e6e392ad1da4213bfb61f0d04440058c717b75917f diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20230416.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20230416.ebuild new file mode 100644 index 000000000000..19ba474ec257 --- /dev/null +++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20230416.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-libs/libxslt + test? ( dev-libs/libxml2 ) +" + +DOCS=( README ) diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest index 700077217487..7a0be757849b 100644 --- a/net-misc/ntpsec/Manifest +++ b/net-misc/ntpsec/Manifest @@ -3,15 +3,10 @@ AUX ntpd-r1.service 613 BLAKE2B 9e0d0fdefa670c2ac25142bfb37880ce4ba0662f70f7cf9a AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fdc0a3ad18c9855b74a70f1a89eb31854bbdad6729753c3a199cddb25b58178a79a0ea0a7050 SHA512 a2fdf88f6f55bcf0a6545db77817e3a740dba50bf56b4fdd80d335e8c909d0880fbd962041754d7f5fb3946ed131d9a739ec72008bacab9f1f47ff82dc74c542 AUX ntpd.rc-r3 491 BLAKE2B e91eb8921b60142d9f827abf7c2a4e4e48be423b3227cbe736433d2423db8f9927d4af34e82e1577ae294e1819ba4313279911288c29248d202fd57675da6fec SHA512 d9d30654842932b5e5d276b2b59c6cf5a95aadbe68f32e818103f576877b4a5e204498cc53a2f9491db2a37378ba176fc3fc1d6ed4b7b4b529b75cc7fec2ae92 AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0dba7f268febd10fa7599ef6b9bee30199ce10529d2d326719f5b376d301aabfef3beacecd4af813bcef1d6a65d61ab00996d72f1240f83ef8e3 SHA512 3e012ad70507f440ed3a4aca4886a96e40d49a0dd7c14572f664633a56139cb7767e07ee1bb5e8295fc32052914364660c928d11369b6f80193ae7e190e5a48e -AUX ntpsec-1.2.1-build-notests.patch 1512 BLAKE2B 16f1b49802c2883866d5ddc862c49ddca994fc530938b53d6059a0f044aa67692180efd528727b91940357562eb4db4a1abaa0a04404b13b912eb11a6a94b9fc SHA512 5b9cf22809a727c687d4a6796a334fd515d1de3883f2e72b5a44e787dd5e1189cc86e5a50c7f693d45e58ac1c5ee0503571fe4aa15cc31f7fc7d3f409128d21e -AUX ntpsec-1.2.1-seccomp-nsd.patch 1469 BLAKE2B a3b0db89c8eff4f184263fdaaaf522718cd8bbc26b67b5bfdbbff3ba4e4c6000702f8e683d4069a2a87b157748025d48ecbd68f6f1634ca2070083a9b9326e2e SHA512 f73989906b24357a99dc5d56ab830c7f5605c992b11d25d75ef35b92242cdcb41cad2bf301963c1df2f3564ffe96ac19bd1836060585187ee282719b6cb2b66a -AUX ntpsec-1.2.1-seccomp-rollup.patch 2987 BLAKE2B 82bd355cdd169133f232f6514f363e87b6876472d49d69d034dd33aefe7179dc3db5e661909774471635dd947761f5e8ab47ecc0dcf8d6c2e62ffdad06044a3f SHA512 34c1941dfd7d7968fa954fb36411aad5e711767f1c0b6aca52cd8f8c839163110af2d4774a7a41b1f3d0daa49af5823b74e9c8a2a9ec12b9a344c72ce505d279 -AUX ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch 785 BLAKE2B df61801e9748e20ce7fa8577c472ea2ed4e31a8d2cb1aef39a245bfe145e482b61b6b30398fc5c2da69685ed872b70ac8399481ec71ea35fc4469df1b83bd195 SHA512 a35ba539aa6a0b8f28079e1dd7a729e7ea21ab045233d7b5e1938a11c03a72aa87907068505e0330c644ebb9b509663a21a24ad9a4cc954a0f03ec7198309c0e +AUX ntpsec-1.2.2-logrotate.patch 663 BLAKE2B c5e8eca739909695b6fd6cf7e507acb8e49a8eb2eebbf2afe83733159b8240f563a22a7389ac58373c10df104ee5dd34c7aec40787200bd3d704e5f0273cfc42 SHA512 ccba1116fac3fcb8dc075c81f2d8ed24399b41b6718ae65ed042b0da8bf19c0a5259650323a9b1d6f0e5c44ae167874ccaca7cbdd50b38955b17a4a49840c863 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302 -AUX ntpsec-py3-test-clarify.patch 993 BLAKE2B 85df81d6301e3f057601bbb2e01590a11cefe338b8a309d37818524896cb694d9a479ab80613763bd2c779680ccecc06526dfca87370409372788ba9254b9003 SHA512 3ac296a2329b2a9dede51499a75f82eeae1870ad5dbd769b7ea1f3d4634ff2512fda8383f7d3adc6fa1a4fd03e035cf0b52157639ca21f458af161fffbf6a0e4 -DIST ntpsec-1.2.1.tar.gz 2681237 BLAKE2B bfb2674131718dcf9f393e93d1148cfb6631591dbcce1ade91746586f261123b80b238393ac2a763fab119cd627f8eae4b006b023ad2b319e752db9eb4b04cc0 SHA512 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277 DIST ntpsec-1.2.2.tar.gz 2710329 BLAKE2B 031412d0fc7ecb5aba73501e63f8d0c416b23fe69114dd32422b03b4827e1ac9c92a4dfeb2e7d074cf6fd410d00cf86632f241dffd22987e4c03b21d21d8693a SHA512 864afb72c4bd8bc439ee06d343893cf92b3893c26c972a7bd1ff2713f0ad1f50704b6d0c6f155e6373c9747efff3ea36097a590be0d53e1a7ea7f429ba409cd1 -EBUILD ntpsec-1.2.1-r6.ebuild 4409 BLAKE2B 3214e5e2ffc5b06ec8b086bc87e6e623c6a929107388a03e1bef2a28f651657dd23267483e94e5acecdf0664a9c349d4b075b833599c971da1062b0877b6de93 SHA512 d28107a05e9e208af20a70473f8cc918a82a04c71fe3e076332c29980ad6364b0cbf77678367816278c5a4cac94754f05d2e3686784f73324bd7a2b1f7ac9dc4 +EBUILD ntpsec-1.2.2-r1.ebuild 4195 BLAKE2B 345e01f1365b81313e63ad25abe980818ac37f19aa478be93054676e3958cb59c91c7d807b0baae042637ee79064df97c0b064bfe0c5db1650ad9f5a9960b880 SHA512 79d3f19de723c4d11e7e7fe91b38b97b7ace66da1f5e6d5708d2ca7ea523c03a688ba0c6f92b6e7cf1e785abb96195368fd3dee3dc84c2c4d00e1fce51181a60 EBUILD ntpsec-1.2.2.ebuild 4149 BLAKE2B d494c97f4ee0630d3e20a5b16513b41386eef9b0d953ee24a5b5e410a8977560740bf31c06a4d83fae56006433d75d1051d906e1901f869f4eecb7bb72a31063 SHA512 62399621ac3b15a9a3cf39811e05be841f80d573c5eb237bb08bafd90e4ed5ff1b7e97e677686bc7b31fafa11ffdeb8f5292017e71d82a2e3c532a0be90d71ce -EBUILD ntpsec-9999.ebuild 4152 BLAKE2B f7f63083a7e86fd4048377d62ba37e9c598743856986191766a0c636b1737cdb7a273c99abbf37e1e174bb6c16d6613882fee55fa157712dd0fb6f6ac378d756 SHA512 42466608a924fa01bba11d7a17f30b4515a70d01b2001aa0c631757825a817a516f606cd5240fb95093af87b860a7e67318277fda1046173aa4b5a6350b5d63d +EBUILD ntpsec-9999.ebuild 4195 BLAKE2B 345e01f1365b81313e63ad25abe980818ac37f19aa478be93054676e3958cb59c91c7d807b0baae042637ee79064df97c0b064bfe0c5db1650ad9f5a9960b880 SHA512 79d3f19de723c4d11e7e7fe91b38b97b7ace66da1f5e6d5708d2ca7ea523c03a688ba0c6f92b6e7cf1e785abb96195368fd3dee3dc84c2c4d00e1fce51181a60 MISC metadata.xml 1777 BLAKE2B e324b32f904e5f076331594aefa32e5174e917a78fb0e1ca0361a2a0cae8f7813637e044d6c351e3f1d07d01733062def59666b89f73d134a507332585f29ae9 SHA512 db03c0268e00fea3701979e30b3bb3b1677de9f2c6692c99eb78cf5a929ca39cb8f379add7ba6786f1ddbb80e1b9263ec46bf459706996c12f3fd38bbc9452ea 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-1.2.2-logrotate.patch b/net-misc/ntpsec/files/ntpsec-1.2.2-logrotate.patch new file mode 100644 index 000000000000..60152bc846c4 --- /dev/null +++ b/net-misc/ntpsec/files/ntpsec-1.2.2-logrotate.patch @@ -0,0 +1,26 @@ +From 4ba53b95a6a45f08f5d3436a4a3ba4f9a97146e2 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Mon, 17 Apr 2023 00:24:32 +0200 +Subject: [PATCH] Give ntpd a chance at re-opening the logfile as ntp:ntp after + rotation + +https://bugs.gentoo.org/873514 +--- + etc/logrotate-config.ntpd | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/etc/logrotate-config.ntpd b/etc/logrotate-config.ntpd +index b64998e..9144e57 100644 +--- a/etc/logrotate-config.ntpd ++++ b/etc/logrotate-config.ntpd +@@ -5,6 +5,7 @@ + + /var/log/ntpd.log { + monthly ++ create 640 ntp root + missingok + postrotate + /usr/bin/killall -HUP ntpd +-- +2.40.0 + 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 - diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild b/net-misc/ntpsec/ntpsec-1.2.2-r1.ebuild index e40e8e17271c..cee0430804e4 100644 --- a/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.2-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE='threads(+)' DISTUTILS_USE_SETUPTOOLS=no @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" else SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi DESCRIPTION="The NTP reference implementation, refactored" @@ -34,7 +34,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" # net-misc/pps-tools oncore,pps DEPEND="${PYTHON_DEPS} - <dev-libs/openssl-3:= + dev-libs/openssl:= dev-python/psutil[${PYTHON_USEDEP}] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) @@ -54,11 +54,7 @@ BDEPEND=">=app-text/asciidoc-8.6.8 PATCHES=( "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" - "${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch" - "${FILESDIR}/${PN}-1.2.1-seccomp-rseq-glibc-2.35.patch" - "${FILESDIR}/${PN}-1.2.1-build-notests.patch" - "${FILESDIR}/${PN}-py3-test-clarify.patch" - "${FILESDIR}/${PN}-1.2.1-seccomp-nsd.patch" + "${FILESDIR}/${PN}-1.2.2-logrotate.patch" ) WAF_BINARY="${S}/waf" @@ -115,7 +111,6 @@ python_configure() { } python_compile() { - unset MAKEOPTS waf-utils_src_compile --notests } diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild index 2fec1857639a..cee0430804e4 100644 --- a/net-misc/ntpsec/ntpsec-9999.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -54,6 +54,7 @@ BDEPEND=">=app-text/asciidoc-8.6.8 PATCHES=( "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" + "${FILESDIR}/${PN}-1.2.2-logrotate.patch" ) WAF_BINARY="${S}/waf" |