diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-01-14 15:54:48 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-01-14 15:59:31 -0500 |
| commit | 1239749ed4047fa2c7c8e41b315d2fb85d6bb2b9 (patch) | |
| tree | 5207dd63f4b113bae5bf884c24276634ed020612 /net-misc/openssh/files | |
| parent | net-misc/openssh: fix patch failures when USE="-hpn X509" (diff) | |
| download | gentoo-1239749ed4047fa2c7c8e41b315d2fb85d6bb2b9.tar.gz gentoo-1239749ed4047fa2c7c8e41b315d2fb85d6bb2b9.tar.bz2 gentoo-1239749ed4047fa2c7c8e41b315d2fb85d6bb2b9.zip | |
net-misc/openssh: version bump to 7.1_p2 #571892
Diffstat (limited to 'net-misc/openssh/files')
| -rw-r--r-- | net-misc/openssh/files/openssh-7.1_p2-x509-hpn14v10-glue.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-7.1_p2-x509-hpn14v10-glue.patch b/net-misc/openssh/files/openssh-7.1_p2-x509-hpn14v10-glue.patch new file mode 100644 index 000000000000..512456975bd6 --- /dev/null +++ b/net-misc/openssh/files/openssh-7.1_p2-x509-hpn14v10-glue.patch @@ -0,0 +1,51 @@ +--- openssh-7.1p2/Makefile.in ++++ openssh-7.1p2/Makefile.in +@@ -45,7 +45,7 @@ + CC=@CC@ + LD=@LD@ + CFLAGS=@CFLAGS@ +-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ ++CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ + LIBS=@LIBS@ + K5LIBS=@K5LIBS@ + GSSLIBS=@GSSLIBS@ +@@ -53,6 +53,7 @@ + SSHDLIBS=@SSHDLIBS@ + LIBEDIT=@LIBEDIT@ + LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@ ++CPPFLAGS+=@LDAP_CPPFLAGS@ + AR=@AR@ + AWK=@AWK@ + RANLIB=@RANLIB@ +--- openssh-7.1p2/sshconnect.c ++++ openssh-7.1p2/sshconnect.c +@@ -465,7 +465,7 @@ + { + /* Send our own protocol version identification. */ + if (compat20) { +- xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX\r\n", ++ xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION); + } else { + xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n", +--- openssh-7.1p2/sshd.c ++++ openssh-7.1p2/sshd.c +@@ -472,8 +472,8 @@ + comment = ""; + } + +- xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s", +- major, minor, SSH_VERSION, comment, ++ xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s", ++ major, minor, SSH_VERSION, + *options.version_addendum == '\0' ? "" : " ", + options.version_addendum, newline); + +--- openssh-7.1p2/version.h ++++ openssh-7.1p2/version.h +@@ -3,4 +3,5 @@ + #define SSH_VERSION "OpenSSH_7.1" + + #define SSH_PORTABLE "p2" ++#define SSH_X509 " PKIX" + #define SSH_RELEASE SSH_VERSION SSH_PORTABLE |