diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2013-03-30 04:29:29 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2013-03-30 04:29:29 +0000 |
| commit | 4884d95ac2d1649cfe89387495187ec9fe04c6d4 (patch) | |
| tree | 76d51d27a04ec1d36ffdad0fe3d8ffa82370852f /net-misc/openssh/files | |
| parent | version bump, improve LINGUAS handling (diff) | |
| download | historical-4884d95ac2d1649cfe89387495187ec9fe04c6d4.tar.gz historical-4884d95ac2d1649cfe89387495187ec9fe04c6d4.tar.bz2 historical-4884d95ac2d1649cfe89387495187ec9fe04c6d4.zip | |
Update glue patches for X509 support.
Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3
Diffstat (limited to 'net-misc/openssh/files')
| -rw-r--r-- | net-misc/openssh/files/openssh-6.2_p1-x509-glue.patch | 16 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-6.2_p1-x509-hpn-glue.patch | 51 |
2 files changed, 67 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-6.2_p1-x509-glue.patch b/net-misc/openssh/files/openssh-6.2_p1-x509-glue.patch new file mode 100644 index 000000000000..2c174298d881 --- /dev/null +++ b/net-misc/openssh/files/openssh-6.2_p1-x509-glue.patch @@ -0,0 +1,16 @@ +make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch + +--- openssh-6.2p1+x509-7.4.1.diff ++++ openssh-6.2p1+x509-7.4.1.diff +@@ -14571,10 +14571,9 @@ + .It Cm ChallengeResponseAuthentication + Specifies whether challenge-response authentication is allowed (e.g. via + PAM or though authentication styles supported in +-@@ -487,6 +564,16 @@ ++@@ -487,5 +564,15 @@ + The default is + .Dq yes . +- Note that this option applies to protocol version 2 only. + +.It Cm HostbasedAlgorithms + +Specifies the protocol version 2 algorithms used in + +.Dq hostbased diff --git a/net-misc/openssh/files/openssh-6.2_p1-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-6.2_p1-x509-hpn-glue.patch new file mode 100644 index 000000000000..22b9764a4d59 --- /dev/null +++ b/net-misc/openssh/files/openssh-6.2_p1-x509-hpn-glue.patch @@ -0,0 +1,51 @@ +--- openssh-6.2p1/Makefile.in ++++ openssh-6.2p1/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-6.2p1/sshconnect.c ++++ openssh-6.2p1/sshconnect.c +@@ -458,7 +458,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-6.2p1/sshd.c ++++ openssh-6.2p1/sshd.c +@@ -466,8 +466,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-6.2p1/version.h ++++ openssh-6.2p1/version.h +@@ -3,4 +3,5 @@ + #define SSH_VERSION "OpenSSH_6.2" + + #define SSH_PORTABLE "p1" ++#define SSH_X509 " PKIX" + #define SSH_RELEASE SSH_VERSION SSH_PORTABLE |