diff options
| author |   Sam James <sam@gentoo.org> | 2022-04-07 03:06:57 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-04-07 03:07:09 +0100 |
| commit | 41a34181245776801261388750b72b3418518fd0 (patch) | |
| tree | b6d0ba733eaba38de5aa959cfb02e212e66a464d /net-misc/ntpsec | |
| parent | dev-util/flatpak-builder: add musl patch (diff) | |
| download | gentoo-41a34181245776801261388750b72b3418518fd0.tar.gz gentoo-41a34181245776801261388750b72b3418518fd0.tar.bz2 gentoo-41a34181245776801261388750b72b3418518fd0.zip | |
net-misc/ntpsec: fix seccomp filter w/ glibc 2.35 (rseq)
Closes: https://bugs.gentoo.org/833274
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc/ntpsec')
| -rw-r--r-- | net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch | 25 | ||||
| -rw-r--r-- | net-misc/ntpsec/ntpsec-1.2.1-r2.ebuild (renamed from net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild) | 3 |
2 files changed, 27 insertions, 1 deletions
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 new file mode 100644 index 000000000000..155304148b1f --- /dev/null +++ b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch @@ -0,0 +1,25 @@ +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/ntpsec-1.2.1-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r2.ebuild index 379a375aacd1..80e17ecb6cb5 100644 --- a/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -60,6 +60,7 @@ DEPEND="${CDEPEND} 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" ) WAF_BINARY="${S}/waf" |