commit:     bb6b4a5247765dda2b422806f39aa02cc0cab2eb
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Mar 13 12:52:12 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 13:20:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb6b4a52

net-misc/openssh: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/7445

 .../files/openssh-7.6_p1-hpn-x509-11.0-glue.patch  | 50 ----------------------
 .../files/openssh-7.6_p1-hpn-x509-11.1-glue.patch  | 50 ----------------------
 .../files/openssh-7.6_p1-x509-11.0-libressl.patch  | 11 -----
 .../files/openssh-7.6_p1-x509-11.1-libressl.patch  | 11 -----
 4 files changed, 122 deletions(-)

diff --git a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.0-glue.patch 
b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.0-glue.patch
deleted file mode 100644
index d55656aae97..00000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.0-glue.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- 
a/openssh-7.6p1-hpnssh14v12/0004-support-dynamically-sized-receive-buffers.patch
   2017-10-11 15:02:11.850912525 -0700
-+++ 
b/openssh-7.6p1-hpnssh14v12/0004-support-dynamically-sized-receive-buffers.patch
   2017-10-11 15:35:06.223424844 -0700
-@@ -907,9 +907,9 @@
- @@ -517,7 +544,7 @@ send_client_banner(int connection_out, int minor1)
-  {
-       /* Send our own protocol version identification. */
--      xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
---         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
--+         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
-+      xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
-+-         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION);
-++         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION);
-       if (atomicio(vwrite, connection_out, client_version_string,
-           strlen(client_version_string)) != strlen(client_version_string))
-               fatal("write: %.100s", strerror(errno));
-@@ -918,11 +918,11 @@
- --- a/sshd.c
- +++ b/sshd.c
- @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int 
sock_in, int sock_out)
--      char remote_version[256];       /* Must be at least as big as buf. */
-+      }
-  
--      xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
---         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
--+         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
-+      xasprintf(&server_version_string, "SSH-%d.%d-%s%s%s%s\r\n",
-+-         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, pkix_comment,
-++         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, pkix_comment,
-           *options.version_addendum == '\0' ? "" : " ",
-           options.version_addendum);
-  
-@@ -982,13 +982,14 @@
- index e093f623..83f0932d 100644
- --- a/version.h
- +++ b/version.h
--@@ -3,4 +3,5 @@
-+@@ -3,3 +3,6 @@
-  #define SSH_VERSION  "OpenSSH_7.6"
-  
-- #define SSH_PORTABLE "p1"
---#define SSH_RELEASE  SSH_VERSION SSH_PORTABLE
-+-#define SSH_RELEASE  PACKAGE_STRING ", " SSH_VERSION "p1"
-++#define SSH_PORTABLE "p1"
- +#define SSH_HPN              "-hpn14v12"
-++#define SSH_X509             "-PKIXSSH-11.0"
--+#define SSH_RELEASE  SSH_VERSION SSH_PORTABLE SSH_HPN
-++#define SSH_RELEASE  PACKAGE_STRING ", " SSH_VERSION "p1" SSH_HPN
- -- 
- 2.14.2
- 

diff --git a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch 
b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch
deleted file mode 100644
index 2ed6a7b54a6..00000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- 
a/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch
        2017-10-11 15:02:11.850912525 -0700
-+++ 
b/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch
        2017-10-11 15:35:06.223424844 -0700
-@@ -907,9 +907,9 @@
- @@ -517,7 +544,7 @@ send_client_banner(int connection_out, int minor1)
-  {
-       /* Send our own protocol version identification. */
--      xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
---         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
--+         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
-+      xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
-+-         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION);
-++         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION);
-       if (atomicio(vwrite, connection_out, client_version_string,
-           strlen(client_version_string)) != strlen(client_version_string))
-               fatal("write: %.100s", strerror(errno));
-@@ -918,11 +918,11 @@
- --- a/sshd.c
- +++ b/sshd.c
- @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int 
sock_in, int sock_out)
--      char remote_version[256];       /* Must be at least as big as buf. */
-+      }
-  
--      xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
---         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
--+         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
-+      xasprintf(&server_version_string, "SSH-%d.%d-%s%s%s%s\r\n",
-+-         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, pkix_comment,
-++         PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, pkix_comment,
-           *options.version_addendum == '\0' ? "" : " ",
-           options.version_addendum);
-  
-@@ -982,13 +982,14 @@
- index e093f623..83f0932d 100644
- --- a/version.h
- +++ b/version.h
--@@ -3,4 +3,5 @@
-+@@ -3,3 +3,6 @@
-  #define SSH_VERSION  "OpenSSH_7.6"
-  
-- #define SSH_PORTABLE "p1"
---#define SSH_RELEASE  SSH_VERSION SSH_PORTABLE
-+-#define SSH_RELEASE  PACKAGE_STRING ", " SSH_VERSION "p1"
-++#define SSH_PORTABLE "p1"
- +#define SSH_HPN              "-hpn14v12"
-++#define SSH_X509             "-PKIXSSH-11.0"
--+#define SSH_RELEASE  SSH_VERSION SSH_PORTABLE SSH_HPN
-++#define SSH_RELEASE  PACKAGE_STRING ", " SSH_VERSION "p1" SSH_HPN
- -- 
- 2.14.2
- 

diff --git a/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch 
b/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch
deleted file mode 100644
index b84ee64e4f7..00000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/openssh-7.6p1+x509-11.0.diff     2017-11-06 17:16:28.334140140 -0800
-+++ b/openssh-7.6p1+x509-11.0.diff     2017-11-06 17:16:55.338223563 -0800
-@@ -54732,7 +54732,7 @@
- +int/*bool*/ ssh_x509store_addlocations(const X509StoreOptions *locations);
- +
- +typedef char SSHXSTOREPATH;
--+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- +DECLARE_STACK_OF(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_new_null() SKM_sk_new_null(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_num(st)    SKM_sk_num(SSHXSTOREPATH, (st))

diff --git a/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch 
b/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch
deleted file mode 100644
index c3b6b4d61a3..00000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/openssh-7.6p1+x509-11.1.diff     2017-11-06 17:16:28.334140140 -0800
-+++ b/openssh-7.6p1+x509-11.1.diff     2017-11-06 17:16:55.338223563 -0800
-@@ -54732,7 +54732,7 @@
- +int/*bool*/ ssh_x509store_addlocations(const X509StoreOptions *locations);
- +
- +typedef char SSHXSTOREPATH;
--+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- +DECLARE_STACK_OF(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_new_null() SKM_sk_new_null(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_num(st)    SKM_sk_num(SSHXSTOREPATH, (st))

Reply via email to