| 1 |
radhermit 13/03/30 04:29:24 |
| 2 |
|
| 3 |
Added: openssh-6.2_p1-x509-hpn-glue.patch |
| 4 |
openssh-6.2_p1-x509-glue.patch |
| 5 |
Log: |
| 6 |
Update glue patches for X509 support. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-misc/openssh/files/openssh-6.2_p1-x509-hpn-glue.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.2_p1-x509-hpn-glue.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.2_p1-x509-hpn-glue.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: openssh-6.2_p1-x509-hpn-glue.patch |
| 17 |
=================================================================== |
| 18 |
--- openssh-6.2p1/Makefile.in |
| 19 |
+++ openssh-6.2p1/Makefile.in |
| 20 |
@@ -45,7 +45,7 @@ |
| 21 |
CC=@CC@ |
| 22 |
LD=@LD@ |
| 23 |
CFLAGS=@CFLAGS@ |
| 24 |
-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ |
| 25 |
+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
| 26 |
LIBS=@LIBS@ |
| 27 |
K5LIBS=@K5LIBS@ |
| 28 |
GSSLIBS=@GSSLIBS@ |
| 29 |
@@ -53,6 +53,7 @@ |
| 30 |
SSHDLIBS=@SSHDLIBS@ |
| 31 |
LIBEDIT=@LIBEDIT@ |
| 32 |
LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@ |
| 33 |
+CPPFLAGS+=@LDAP_CPPFLAGS@ |
| 34 |
AR=@AR@ |
| 35 |
AWK=@AWK@ |
| 36 |
RANLIB=@RANLIB@ |
| 37 |
--- openssh-6.2p1/sshconnect.c |
| 38 |
+++ openssh-6.2p1/sshconnect.c |
| 39 |
@@ -458,7 +458,7 @@ |
| 40 |
{ |
| 41 |
/* Send our own protocol version identification. */ |
| 42 |
if (compat20) { |
| 43 |
- xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX\r\n", |
| 44 |
+ xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", |
| 45 |
PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION); |
| 46 |
} else { |
| 47 |
xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n", |
| 48 |
--- openssh-6.2p1/sshd.c |
| 49 |
+++ openssh-6.2p1/sshd.c |
| 50 |
@@ -466,8 +466,8 @@ |
| 51 |
comment = ""; |
| 52 |
} |
| 53 |
|
| 54 |
- xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s", |
| 55 |
- major, minor, SSH_VERSION, comment, |
| 56 |
+ xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s", |
| 57 |
+ major, minor, SSH_VERSION, |
| 58 |
*options.version_addendum == '\0' ? "" : " ", |
| 59 |
options.version_addendum, newline); |
| 60 |
|
| 61 |
--- openssh-6.2p1/version.h |
| 62 |
+++ openssh-6.2p1/version.h |
| 63 |
@@ -3,4 +3,5 @@ |
| 64 |
#define SSH_VERSION "OpenSSH_6.2" |
| 65 |
|
| 66 |
#define SSH_PORTABLE "p1" |
| 67 |
+#define SSH_X509 " PKIX" |
| 68 |
#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.1 net-misc/openssh/files/openssh-6.2_p1-x509-glue.patch |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.2_p1-x509-glue.patch?rev=1.1&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.2_p1-x509-glue.patch?rev=1.1&content-type=text/plain |
| 76 |
|
| 77 |
Index: openssh-6.2_p1-x509-glue.patch |
| 78 |
=================================================================== |
| 79 |
make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch |
| 80 |
|
| 81 |
--- openssh-6.2p1+x509-7.4.1.diff |
| 82 |
+++ openssh-6.2p1+x509-7.4.1.diff |
| 83 |
@@ -14571,10 +14571,9 @@ |
| 84 |
.It Cm ChallengeResponseAuthentication |
| 85 |
Specifies whether challenge-response authentication is allowed (e.g. via |
| 86 |
PAM or though authentication styles supported in |
| 87 |
-@@ -487,6 +564,16 @@ |
| 88 |
+@@ -487,5 +564,15 @@ |
| 89 |
The default is |
| 90 |
.Dq yes . |
| 91 |
- Note that this option applies to protocol version 2 only. |
| 92 |
+.It Cm HostbasedAlgorithms |
| 93 |
+Specifies the protocol version 2 algorithms used in |
| 94 |
+.Dq hostbased |
Archives