[gentoo-commits] gentoo-x86 commit in net-misc/openssh/files: openssh-6.2_p2-x509-hpn-glue.patch openssh-6.2_p2-x509-glue.patch openssh-6.2_p1-x509-hpn-glue.patch openssh-6.2_p1-x509-glue.patch

[gentoo-commits] gentoo-x86 commit in net-misc/openssh/files: openssh-6.2_p2-x509-hpn-glue.patch openssh-6.2_p2-x509-glue.patch openssh-6.2_p1-x509-hpn-glue.patch openssh-6.2_p1-x509-glue.patch

[Mike Frysinger (vapier)]

vapier      13/06/24 16:48:35

  Added:                openssh-6.2_p2-x509-hpn-glue.patch
                        openssh-6.2_p2-x509-glue.patch
  Removed:              openssh-6.2_p1-x509-hpn-glue.patch
                        openssh-6.2_p1-x509-glue.patch
  Log:
  Version bump #470222 by Jason A. Donenfeld.
  
  (Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

Revision  Changes    Path
1.1                  net-misc/openssh/files/openssh-6.2_p2-x509-hpn-glue.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.2_p2-x509-hpn-glue.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.2_p2-x509-hpn-glue.patch?rev=1.1&content-type=text/plain

Index: openssh-6.2_p2-x509-hpn-glue.patch
===================================================================
--- openssh-6.2p2/Makefile.in
+++ openssh-6.2p2/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.2p2/sshconnect.c
+++ openssh-6.2p2/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.2p2/sshd.c
+++ openssh-6.2p2/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.2p2/version.h
+++ openssh-6.2p2/version.h
@@ -3,4 +3,5 @@
 #define SSH_VERSION	"OpenSSH_6.2"
 
 #define SSH_PORTABLE	"p2"
+#define SSH_X509	" PKIX"
 #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE



1.1                  net-misc/openssh/files/openssh-6.2_p2-x509-glue.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.2_p2-x509-glue.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.2_p2-x509-glue.patch?rev=1.1&content-type=text/plain

Index: openssh-6.2_p2-x509-glue.patch
===================================================================
make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch

--- openssh-6.2p2+x509-7.5.diff
+++ openssh-6.2p2+x509-7.5.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