commit: 0104890e0756d76bcc03443bc0f35b9833c735bd
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Feb 17 14:35:25 2024 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 14:35:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0104890e
net-misc/openssh-contrib: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch | 18 -------
.../openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch | 13 -----
...enssh-9.3_p1-openssl-version-compat-check.patch | 58 ----------------------
.../files/openssh-9.3_p2-zlib-1.3.patch | 21 --------
4 files changed, 110 deletions(-)
diff --git
a/net-misc/openssh-contrib/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch
b/net-misc/openssh-contrib/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch
deleted file mode 100644
index 7199227589c6..000000000000
--- a/net-misc/openssh-contrib/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -u a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff
b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff
---- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-03-16
10:06:45.020527770 -0700
-+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-03-16
10:07:01.294423665 -0700
-@@ -1414,14 +1414,3 @@
- # Example of overriding settings on a per-user basis
- #Match User anoncvs
- # X11Forwarding no
--diff --git a/version.h b/version.h
--index 6b4fa372..332fb486 100644
----- a/version.h
--+++ b/version.h
--@@ -3,4 +3,5 @@
-- #define SSH_VERSION "OpenSSH_8.5"
--
-- #define SSH_PORTABLE "p1"
---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
--+#define SSH_HPN "-hpn15v2"
--+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN
diff --git
a/net-misc/openssh-contrib/files/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch
b/net-misc/openssh-contrib/files/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch
deleted file mode 100644
index 9e08b2a553c2..000000000000
--- a/net-misc/openssh-contrib/files/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gss-serv.c b/gss-serv.c
-index b5d4bb2d..00e3d118 100644
---- a/gss-serv.c
-+++ b/gss-serv.c
-@@ -105,7 +105,7 @@ ssh_gssapi_acquire_cred(Gssctxt *ctx)
- gss_create_empty_oid_set(&status, &oidset);
- gss_add_oid_set_member(&status, ctx->oid, &oidset);
-
-- if (gethostname(lname, MAXHOSTNAMELEN)) {
-+ if (gethostname(lname, HOST_NAME_MAX)) {
- gss_release_oid_set(&status, &oidset);
- return (-1);
- }
diff --git
a/net-misc/openssh-contrib/files/openssh-9.3_p1-openssl-version-compat-check.patch
b/net-misc/openssh-contrib/files/openssh-9.3_p1-openssl-version-compat-check.patch
deleted file mode 100644
index b571ae253fff..000000000000
---
a/net-misc/openssh-contrib/files/openssh-9.3_p1-openssl-version-compat-check.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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)
- if (headerver == libver)
- return 1;
-
-- /* for versions < 1.0.0, major,minor,fix,status must match */
-- if (headerver < 0x1000000f) {
-- mask = 0xfffff00fL; /* major,minor,fix,status */
-- return (headerver & mask) == (libver & mask);
-+ /*
-+ * For versions < 3.0.0, major,minor,status must match and library
-+ * fix version must be equal to or newer than the header.
-+ */
-+ if (headerver < 0x3000000f) {
-+ mask = 0xfff0000fL; /* major,minor,status */
-+ hfix = (headerver & 0x000ff000) >> 12;
-+ lfix = (libver & 0x000ff000) >> 12;
-+ if ( (headerver & mask) == (libver & mask) && lfix >= hfix)
-+ return 1;
- }
-
- /*
-- * For versions >= 1.0.0, major,minor,status must match and library
-- * fix version must be equal to or newer than the header.
-+ * For versions >= 3.0.0, major must match and minor,status must be
-+ * equal to or greater than the header.
- */
-- mask = 0xfff00000L; /* major,minor,status */
-- hfix = (headerver & 0x000ff000) >> 12;
-- lfix = (libver & 0x000ff000) >> 12;
-+ mask = 0xf000000fL; /* major, status */
-+ hfix = (headerver & 0x0ffffff0L) >> 12;
-+ lfix = (libver & 0x0ffffff0L) >> 12;
- if ( (headerver & mask) == (libver & mask) && lfix >= hfix)
- return 1;
- return 0;
---- a/openbsd-compat/regress/opensslvertest.c
-+++ b/openbsd-compat/regress/opensslvertest.c
-@@ -31,7 +31,7 @@ struct version_test {
- { 0x0090802fL, 0x0090804fL, 1}, /* newer library fix version: ok */
- { 0x0090802fL, 0x0090801fL, 1}, /* older library fix version: ok */
- { 0x0090802fL, 0x0090702fL, 0}, /* older library minor version: NO */
-- { 0x0090802fL, 0x0090902fL, 0}, /* newer library minor version: NO */
-+ { 0x0090802fL, 0x0090902fL, 1}, /* newer library minor version: ok */
- { 0x0090802fL, 0x0080802fL, 0}, /* older library major version: NO */
- { 0x0090802fL, 0x1000100fL, 0}, /* newer library major version: NO */
-
-@@ -41,7 +41,7 @@ struct version_test {
- { 0x1000101fL, 0x1000100fL, 1}, /* older library patch version: ok */
- { 0x1000101fL, 0x1000201fL, 1}, /* newer library fix version: ok */
- { 0x1000101fL, 0x1000001fL, 0}, /* older library fix version: NO */
-- { 0x1000101fL, 0x1010101fL, 0}, /* newer library minor version: NO */
-+ { 0x1000101fL, 0x1010101fL, 1}, /* newer library minor version: ok */
- { 0x1000101fL, 0x0000101fL, 0}, /* older library major version: NO */
- { 0x1000101fL, 0x2000101fL, 0}, /* newer library major version: NO */
- };
diff --git a/net-misc/openssh-contrib/files/openssh-9.3_p2-zlib-1.3.patch
b/net-misc/openssh-contrib/files/openssh-9.3_p2-zlib-1.3.patch
deleted file mode 100644
index f1336bbe0380..000000000000
--- a/net-misc/openssh-contrib/files/openssh-9.3_p2-zlib-1.3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/912766
-https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621
-
-From cb4ed12ffc332d1f72d054ed92655b5f1c38f621 Mon Sep 17 00:00:00 2001
-From: Darren Tucker <dtuc...@dtucker.net>
-Date: Sat, 19 Aug 2023 07:39:08 +1000
-Subject: [PATCH] Fix zlib version check for 1.3 and future version.
-
-bz#3604.
---- a/configure.ac
-+++ b/configure.ac
-@@ -1464,7 +1464,7 @@ else
- [[
- int a=0, b=0, c=0, d=0, n, v;
- n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d);
-- if (n != 3 && n != 4)
-+ if (n < 1)
- exit(1);
- v = a*1000000 + b*10000 + c*100 + d;
- fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v);
-
