diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2018-02-12 11:24:14 -0800 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2018-02-12 11:24:38 -0800 |
| commit | fadaefcc70b0cf898dbdd403cee4211269605130 (patch) | |
| tree | 90319d3bc06a8a3afc9d7c2e3c1564fba146bfc3 /net-misc/openssh/files | |
| parent | x11-proto/xorgproto: Version bump to 2018.2 (diff) | |
| download | gentoo-fadaefcc70b0cf898dbdd403cee4211269605130.tar.gz gentoo-fadaefcc70b0cf898dbdd403cee4211269605130.tar.bz2 gentoo-fadaefcc70b0cf898dbdd403cee4211269605130.zip | |
net-misc/openssh: Revision bump, update X509 patch to 11.2
Package-Manager: Portage-2.3.24, 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.2-glue.patch | 50 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-7.6_p1-x509-11.2-libressl.patch | 11 |
2 files changed, 61 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.2-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.2-glue.patch new file mode 100644 index 000000000000..2ed6a7b54a66 --- /dev/null +++ b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.2-glue.patch @@ -0,0 +1,50 @@ +--- 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.2-libressl.patch b/net-misc/openssh/files/openssh-7.6_p1-x509-11.2-libressl.patch new file mode 100644 index 000000000000..17bc41e5a761 --- /dev/null +++ b/net-misc/openssh/files/openssh-7.6_p1-x509-11.2-libressl.patch @@ -0,0 +1,11 @@ +--- a/openssh-7.6p1+x509-11.2.diff 2017-11-06 17:16:28.334140140 -0800 ++++ b/openssh-7.6p1+x509-11.2.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)) |