diff options
Diffstat (limited to 'net-misc/openssh-x/files/openssh-6.1_p1-x509-hpn-glue.patch')
| -rw-r--r-- | net-misc/openssh-x/files/openssh-6.1_p1-x509-hpn-glue.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/net-misc/openssh-x/files/openssh-6.1_p1-x509-hpn-glue.patch b/net-misc/openssh-x/files/openssh-6.1_p1-x509-hpn-glue.patch deleted file mode 100644 index 5d69a50b..00000000 --- a/net-misc/openssh-x/files/openssh-6.1_p1-x509-hpn-glue.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -45,12 +45,13 @@ FIPSLD_CC=@FIPSLD_CC@ - CC=@CC@ - LD=@LD@ - CFLAGS=@CFLAGS@ --CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ -+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ - LIBS=@LIBS@ - SSHLIBS=@SSHLIBS@ - SSHDLIBS=@SSHDLIBS@ - LIBEDIT=@LIBEDIT@ - LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@ -+CPPFLAGS+=@LDAP_CPPFLAGS@ - AR=@AR@ - AWK=@AWK@ - RANLIB=@RANLIB@ ---- a/sshconnect.c -+++ b/sshconnect.c -@@ -580,7 +580,7 @@ ssh_exchange_identification(int timeout_ms) - snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", - compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1, - compat20 ? PROTOCOL_MINOR_2 : minor1, -- SSH_VERSION, compat20 ? " PKIX\r\n" : "\n"); -+ SSH_VERSION, compat20 ? "\r\n" : "\n"); - if (roaming_atomicio(vwrite, connection_out, buf, strlen(buf)) - != strlen(buf)) - fatal("write: %.100s", strerror(errno)); ---- a/sshd.c -+++ b/sshd.c -@@ -428,8 +428,8 @@ sshd_exchange_identification(int sock_in, int sock_out) - comment = ""; - } - -- xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s", -+ xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s", -- major, minor, SSH_VERSION, comment, -+ major, minor, SSH_VERSION, - *options.version_addendum == '\0' ? "" : " ", - options.version_addendum, newline); - ---- a/version.h -+++ b/version.h -@@ -3,4 +3,5 @@ - #define SSH_VERSION "OpenSSH_6.0" - - #define SSH_PORTABLE "p1" -+#define SSH_X509 " PKIX" - #define SSH_RELEASE SSH_VERSION SSH_PORTABLE |