commit: 1a2b3e289d63dcde02b806711061f3c69626f3f8 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Sun Apr 16 22:14:11 2023 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Sun Apr 16 22:14:11 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a2b3e28
net-misc/ntpsec: Drop old Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> net-misc/ntpsec/Manifest | 1 - .../ntpsec/files/ntpsec-1.2.1-build-notests.patch | 48 ------ .../ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch | 34 ----- .../ntpsec/files/ntpsec-1.2.1-seccomp-rollup.patch | 116 -------------- .../ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch | 25 --- .../ntpsec/files/ntpsec-py3-test-clarify.patch | 34 ----- net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild | 169 --------------------- 7 files changed, 427 deletions(-) diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest index 94c516a50ffe..c72c154eed0a 100644 --- a/net-misc/ntpsec/Manifest +++ b/net-misc/ntpsec/Manifest @@ -1,2 +1 @@ -DIST ntpsec-1.2.1.tar.gz 2681237 BLAKE2B bfb2674131718dcf9f393e93d1148cfb6631591dbcce1ade91746586f261123b80b238393ac2a763fab119cd627f8eae4b006b023ad2b319e752db9eb4b04cc0 SHA512 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277 DIST ntpsec-1.2.2.tar.gz 2710329 BLAKE2B 031412d0fc7ecb5aba73501e63f8d0c416b23fe69114dd32422b03b4827e1ac9c92a4dfeb2e7d074cf6fd410d00cf86632f241dffd22987e4c03b21d21d8693a SHA512 864afb72c4bd8bc439ee06d343893cf92b3893c26c972a7bd1ff2713f0ad1f50704b6d0c6f155e6373c9747efff3ea36097a590be0d53e1a7ea7f429ba409cd1 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 <[email protected]> -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" <[email protected]> -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 <[email protected]> ---- 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 <[email protected]> -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 <[email protected]> ---- - 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 <[email protected]> -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 <[email protected]> ---- 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 <[email protected]> -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.1-r6.ebuild deleted file mode 100644 index e40e8e17271c..000000000000 --- a/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) -PYTHON_REQ_USE='threads(+)' -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 flag-o-matic waf-utils systemd - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - 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" -fi - -DESCRIPTION="The NTP reference implementation, refactored" -HOMEPAGE="https://www.ntpsec.org/"; - -NTPSEC_REFCLOCK=( - oncore trimble truetime gpsd jjy generic spectracom - shm pps hpgps zyfer arbiter nmea modem local -) - -IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} - -LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" -SLOT="0" -IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice -REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" - -# net-misc/pps-tools oncore,pps -DEPEND="${PYTHON_DEPS} - <dev-libs/openssl-3:= - dev-python/psutil[${PYTHON_USEDEP}] - sys-libs/libcap - libbsd? ( dev-libs/libbsd:0= ) - seccomp? ( sys-libs/libseccomp ) - rclock_oncore? ( net-misc/pps-tools ) - rclock_pps? ( net-misc/pps-tools )" -RDEPEND="${DEPEND} - !net-misc/ntp - !net-misc/openntpd - acct-group/ntp - acct-user/ntp - ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )" -BDEPEND=">=app-text/asciidoc-8.6.8 - dev-libs/libxslt - app-text/docbook-xsl-stylesheets - sys-devel/bison" - -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" -) - -WAF_BINARY="${S}/waf" - -src_prepare() { - default - - # Remove autostripping of binaries - sed -i -e '/Strip binaries/d' wscript || die - if ! use libbsd ; then - eapply "${FILESDIR}/${PN}-no-bsd.patch" - fi - # remove extra default pool servers - sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die - - python_copy_sources -} - -src_configure() { - is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin - - local string_127="" - local rclocks=""; - local CLOCKSTRING="" - - for refclock in ${NTPSEC_REFCLOCK[@]} ; do - if use rclock_${refclock} ; then - string_127+="$refclock," - fi - done - CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" - - myconf=( - --notests - --nopyc - --nopyo - --enable-pylib ext - --refclock="${CLOCKSTRING}" - #--build-epoch="$(date +%s)" - $(use doc || echo "--disable-doc") - $(use early && echo "--enable-early-droproot") - $(use gdb && echo "--enable-debug-gdb") - $(use samba && echo "--enable-mssntp") - $(use seccomp && echo "--enable-seccomp") - $(use smear && echo "--enable-leap-smear") - $(use debug && echo "--enable-debug") - ) - - distutils-r1_src_configure -} - -python_configure() { - waf-utils_src_configure "${myconf[@]}" -} - -python_compile() { - unset MAKEOPTS - waf-utils_src_compile --notests -} - -python_test() { - waf-utils_src_compile check -} - -src_install() { - distutils-r1_src_install - - # Install heat generating scripts - use heat && dosbin "${S}"/contrib/ntpheat{,usb} - - # Install the openrc files - newinitd "${FILESDIR}"/ntpd.rc-r3 ntp - newconfd "${FILESDIR}"/ntpd.confd ntp - - # Install the systemd unit file - systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service - - # Prepare a directory for the ntp.drift file - mkdir -pv "${ED}"/var/lib/ntp - chown ntp:ntp "${ED}"/var/lib/ntp - chmod 770 "${ED}"/var/lib/ntp - keepdir /var/lib/ntp - - # Install a log rotate script - mkdir -pv "${ED}"/etc/logrotate.d - cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd - - # Install the configuration file and sample configuration - cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf - cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/ - - # move doc files to /usr/share/doc/"${P}" - use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html -} - -python_install() { - waf-utils_src_install --notests - python_fix_shebang "${ED}" - python_optimize -} - -pkg_postinst() { - einfo "If you want to serve time on your local network, then" - einfo "you should disable all the ref_clocks unless you have" - einfo "one and can get stable time from it. Feel free to try" - einfo "it but PPS probably won't work unless you have a UART" - einfo "GPS that actually provides PPS messages." -}
