summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2018-01-22 16:19:05 -0800
committerPatrick McLean <chutzpah@gentoo.org>2018-01-22 17:42:39 -0800
commit4c8c40a4f54c9ec9632cf4ce424c629482541ee5 (patch)
tree9a1df7d2ecbb517044551b4bdc787a70b482a6ee /net-misc/openssh/files
parentprofiles: Mask >=net-misc/openssh-7.6_p1[hpn] (bug #634594) (diff)
downloadgentoo-4c8c40a4f54c9ec9632cf4ce424c629482541ee5.tar.gz
gentoo-4c8c40a4f54c9ec9632cf4ce424c629482541ee5.tar.bz2
gentoo-4c8c40a4f54c9ec9632cf4ce424c629482541ee5.zip
net-misc/openssh: Revision bump, bump X509 patch to 11.1
Also re-enable hpn USE flag (disabled by default) since it has now been package.use.mask-ed in the base profile. Bug: https://bugs.gentoo.org/634594 Package-Manager: Portage-2.3.20, Repoman-2.3.6
Diffstat (limited to 'net-misc/openssh/files')
-rw-r--r--net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch50
1 files changed, 50 insertions, 0 deletions
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
new file mode 100644
index 000000000000..d55656aae974
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch
@@ -0,0 +1,50 @@
+--- 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
+