summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2024-05-17 16:53:31 +0200
committerDavid Seifert <soap@gentoo.org>2024-05-17 16:53:31 +0200
commit66ae04542020bb05d1cf96ab4bd40fbc721fcbda (patch)
treed1954c122598db00121ec919984936ada91dcc9d
parentdev-python/cycler: Fix variable order (diff)
downloadgentoo-66ae04542020bb05d1cf96ab4bd40fbc721fcbda.tar.gz
gentoo-66ae04542020bb05d1cf96ab4bd40fbc721fcbda.tar.bz2
gentoo-66ae04542020bb05d1cf96ab4bd40fbc721fcbda.zip
net-misc/openssh: remove useless patch
Patch has long been upstreamed: - https://github.com/openssh/openssh-portable/pull/148 - https://github.com/openssh/openssh-portable/commit/3ef92a657444f172b61f92d5da66d94fa8265602 Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--net-misc/openssh/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch18
-rw-r--r--net-misc/openssh/openssh-9.6_p1-r3.ebuild1
-rw-r--r--net-misc/openssh/openssh-9.7_p1-r2.ebuild1
3 files changed, 0 insertions, 20 deletions
diff --git a/net-misc/openssh/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch b/net-misc/openssh/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
deleted file mode 100644
index 7e9334a781d2..000000000000
--- a/net-misc/openssh/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/sandbox-seccomp-filter.c
-+++ b/sandbox-seccomp-filter.c
-@@ -257,6 +257,15 @@ static const struct sock_filter preauth_insns[] = {
- #ifdef __NR_statx
- SC_DENY(__NR_statx, EACCES),
- #endif
-+#ifdef __NR_shmget
-+ SC_DENY(__NR_shmget, EACCES),
-+#endif
-+#ifdef __NR_shmat
-+ SC_DENY(__NR_shmat, EACCES),
-+#endif
-+#ifdef __NR_shmdt
-+ SC_DENY(__NR_shmdt, EACCES),
-+#endif
-
- /* Syscalls to permit */
- #ifdef __NR_brk
diff --git a/net-misc/openssh/openssh-9.6_p1-r3.ebuild b/net-misc/openssh/openssh-9.6_p1-r3.ebuild
index 8156cd96d1b4..c944856ebe5b 100644
--- a/net-misc/openssh/openssh-9.6_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-9.6_p1-r3.ebuild
@@ -78,7 +78,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch"
"${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch"
- "${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"
"${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch"
)
diff --git a/net-misc/openssh/openssh-9.7_p1-r2.ebuild b/net-misc/openssh/openssh-9.7_p1-r2.ebuild
index 3b0c7f2125a0..ce9e1d1a47c2 100644
--- a/net-misc/openssh/openssh-9.7_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-9.7_p1-r2.ebuild
@@ -76,7 +76,6 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"
"${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch"
)