summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-10-13 12:00:39 +0100
committerSam James <sam@gentoo.org>2023-10-13 12:03:50 +0100
commitcd2fe0690ce131cc623a34eb8a9586f50d0737c9 (patch)
tree7d2ecea4c611faf687aa8e4e355c14c4872120d4 /net-misc
parentsys-fs/xfsprogs: add 6.5.0 (diff)
downloadgentoo-cd2fe0690ce131cc623a34eb8a9586f50d0737c9.tar.gz
gentoo-cd2fe0690ce131cc623a34eb8a9586f50d0737c9.tar.bz2
gentoo-cd2fe0690ce131cc623a34eb8a9586f50d0737c9.zip
net-misc/openssh: drop obsolete patch from 9.4, 9.5
This was fixed properly by upstream in 9.4 so the workaround isn't needed; openssh-9.3_p1-openssl-ignore-status.patch applies with fuzz to >=9.4 and does the wrong thing there as it touches the non-OpenSSL 3 case (upstream added a conditional above in >=9.4). Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openssh/openssh-9.4_p1-r1.ebuild (renamed from net-misc/openssh/openssh-9.4_p1.ebuild)1
-rw-r--r--net-misc/openssh/openssh-9.5_p1-r1.ebuild (renamed from net-misc/openssh/openssh-9.5_p1.ebuild)1
2 files changed, 0 insertions, 2 deletions
diff --git a/net-misc/openssh/openssh-9.4_p1.ebuild b/net-misc/openssh/openssh-9.4_p1-r1.ebuild
index d57adca97bd1..edd62d7fd3da 100644
--- a/net-misc/openssh/openssh-9.4_p1.ebuild
+++ b/net-misc/openssh/openssh-9.4_p1-r1.ebuild
@@ -82,7 +82,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-9.3_p1-GSSAPI-dns.patch" #165444 integrated into gsskex
- "${FILESDIR}/${PN}-9.3_p1-openssl-ignore-status.patch"
"${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"
diff --git a/net-misc/openssh/openssh-9.5_p1.ebuild b/net-misc/openssh/openssh-9.5_p1-r1.ebuild
index ec36f3445783..8ab790480184 100644
--- a/net-misc/openssh/openssh-9.5_p1.ebuild
+++ b/net-misc/openssh/openssh-9.5_p1-r1.ebuild
@@ -82,7 +82,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-9.3_p1-GSSAPI-dns.patch" #165444 integrated into gsskex
- "${FILESDIR}/${PN}-9.3_p1-openssl-ignore-status.patch"
"${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"