summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-03-23 06:01:44 +0000
committerSam James <sam@gentoo.org>2023-03-23 06:01:44 +0000
commitc1bbac96c183b2608224002c0ed24bb325560578 (patch)
treeb43916f11623d58820bad27e4177d7be6dc0d40b /net-misc
parentnet-misc/openssh: drop 9.1_p1-r3, 9.2_p1-r3 (diff)
downloadgentoo-c1bbac96c183b2608224002c0ed24bb325560578.tar.gz
gentoo-c1bbac96c183b2608224002c0ed24bb325560578.tar.bz2
gentoo-c1bbac96c183b2608224002c0ed24bb325560578.zip
net-misc/openssh: restore patch metadata
It was lost in the 9.3_p1 rebase. Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openssh/files/openssh-9.3_p1-openssl-version-compat-check.patch5
1 files changed, 1 insertions, 4 deletions
diff --git a/net-misc/openssh/files/openssh-9.3_p1-openssl-version-compat-check.patch b/net-misc/openssh/files/openssh-9.3_p1-openssl-version-compat-check.patch
index caccfd17c11d..b571ae253fff 100644
--- a/net-misc/openssh/files/openssh-9.3_p1-openssl-version-compat-check.patch
+++ b/net-misc/openssh/files/openssh-9.3_p1-openssl-version-compat-check.patch
@@ -1,5 +1,4 @@
-diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
-index 033f35763..efc387fa7 100644
+https://bugzilla.mindrot.org/show_bug.cgi?id=3548
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -48,19 +48,25 @@ ssh_compatible_openssl(long headerver, long libver)
@@ -37,8 +36,6 @@ index 033f35763..efc387fa7 100644
if ( (headerver & mask) == (libver & mask) && lfix >= hfix)
return 1;
return 0;
-diff --git a/openbsd-compat/regress/opensslvertest.c b/openbsd-compat/regress/opensslvertest.c
-index d50066609..60a8a4e6c 100644
--- a/openbsd-compat/regress/opensslvertest.c
+++ b/openbsd-compat/regress/opensslvertest.c
@@ -31,7 +31,7 @@ struct version_test {