| 1 |
vapier 12/04/30 22:47:40 |
| 2 |
|
| 3 |
Added: openssh-6.0_p1-hpn-progressmeter.patch |
| 4 |
openssh-6.0_p1-x509-hpn-glue.patch |
| 5 |
openssh-6.0_p1-x509-glue.patch |
| 6 |
Log: |
| 7 |
Version bump with work from Robin #414071 by Michael Weber. |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 net-misc/openssh/files/openssh-6.0_p1-hpn-progressmeter.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.0_p1-hpn-progressmeter.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.0_p1-hpn-progressmeter.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: openssh-6.0_p1-hpn-progressmeter.patch |
| 18 |
=================================================================== |
| 19 |
don't go reading random stack values |
| 20 |
|
| 21 |
already e-mailed to upstream hpn devs |
| 22 |
|
| 23 |
--- progressmeter.c |
| 24 |
+++ progressmeter.c |
| 25 |
@@ -183,7 +183,7 @@ |
| 26 |
percent = ((float)cur_pos / end_pos) * 100; |
| 27 |
else |
| 28 |
percent = 100; |
| 29 |
- snprintf(buf + strlen(buf), win_size - strlen(buf-8), |
| 30 |
+ snprintf(buf + strlen(buf), win_size - strlen(buf) - 8, |
| 31 |
" %3d%% ", percent); |
| 32 |
|
| 33 |
/* amount transferred */ |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.1 net-misc/openssh/files/openssh-6.0_p1-x509-hpn-glue.patch |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.0_p1-x509-hpn-glue.patch?rev=1.1&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.0_p1-x509-hpn-glue.patch?rev=1.1&content-type=text/plain |
| 41 |
|
| 42 |
Index: openssh-6.0_p1-x509-hpn-glue.patch |
| 43 |
=================================================================== |
| 44 |
diff --git a/Makefile.in b/Makefile.in |
| 45 |
index ecb45cd..7834fb1 100644 |
| 46 |
--- a/Makefile.in |
| 47 |
+++ b/Makefile.in |
| 48 |
@@ -45,12 +45,13 @@ FIPSLD_CC=@FIPSLD_CC@ |
| 49 |
CC=@CC@ |
| 50 |
LD=@LD@ |
| 51 |
CFLAGS=@CFLAGS@ |
| 52 |
-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ |
| 53 |
+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
| 54 |
LIBS=@LIBS@ |
| 55 |
SSHLIBS=@SSHLIBS@ |
| 56 |
SSHDLIBS=@SSHDLIBS@ |
| 57 |
LIBEDIT=@LIBEDIT@ |
| 58 |
LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@ |
| 59 |
+CPPFLAGS+=@LDAP_CPPFLAGS@ |
| 60 |
AR=@AR@ |
| 61 |
AWK=@AWK@ |
| 62 |
RANLIB=@RANLIB@ |
| 63 |
diff --git a/sshconnect.c b/sshconnect.c |
| 64 |
index 19a2b06..dd75f78 100644 |
| 65 |
--- a/sshconnect.c |
| 66 |
+++ b/sshconnect.c |
| 67 |
@@ -580,7 +580,7 @@ ssh_exchange_identification(int timeout_ms) |
| 68 |
snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", |
| 69 |
compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1, |
| 70 |
compat20 ? PROTOCOL_MINOR_2 : minor1, |
| 71 |
- SSH_VERSION, compat20 ? " PKIX\r\n" : "\n"); |
| 72 |
+ SSH_VERSION, compat20 ? "\r\n" : "\n"); |
| 73 |
if (roaming_atomicio(vwrite, connection_out, buf, strlen(buf)) |
| 74 |
!= strlen(buf)) |
| 75 |
fatal("write: %.100s", strerror(errno)); |
| 76 |
diff --git a/sshd.c b/sshd.c |
| 77 |
index a5c437d..a1105a0 100644 |
| 78 |
--- a/sshd.c |
| 79 |
+++ b/sshd.c |
| 80 |
@@ -428,8 +428,8 @@ sshd_exchange_identification(int sock_in, int sock_out) |
| 81 |
minor = PROTOCOL_MINOR_1; |
| 82 |
comment = ""; |
| 83 |
} |
| 84 |
- snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s%s", major, minor, |
| 85 |
- SSH_VERSION, comment, newline); |
| 86 |
+ snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor, |
| 87 |
+ SSH_VERSION, newline); |
| 88 |
server_version_string = xstrdup(buf); |
| 89 |
|
| 90 |
/* Send our protocol version identification. */ |
| 91 |
diff --git a/version.h b/version.h |
| 92 |
index 78983d9..ec1746d 100644 |
| 93 |
--- a/version.h |
| 94 |
+++ b/version.h |
| 95 |
@@ -3,4 +3,5 @@ |
| 96 |
#define SSH_VERSION "OpenSSH_6.0" |
| 97 |
|
| 98 |
#define SSH_PORTABLE "p1" |
| 99 |
+#define SSH_X509 " PKIX" |
| 100 |
#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
1.1 net-misc/openssh/files/openssh-6.0_p1-x509-glue.patch |
| 105 |
|
| 106 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.0_p1-x509-glue.patch?rev=1.1&view=markup |
| 107 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.0_p1-x509-glue.patch?rev=1.1&content-type=text/plain |
| 108 |
|
| 109 |
Index: openssh-6.0_p1-x509-glue.patch |
| 110 |
=================================================================== |
| 111 |
make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch |
| 112 |
|
| 113 |
--- openssh-6.0p1+x509-7.1.diff |
| 114 |
+++ openssh-6.0p1+x509-7.1.diff |
| 115 |
@@ -13502,9 +13502,9 @@ |
| 116 |
Specifies whether challenge-response authentication is allowed (e.g. via |
| 117 |
PAM or though authentication styles supported in |
| 118 |
@@ -430,6 +507,16 @@ |
| 119 |
+ This facility is provided to assist with operation on multi homed machines. |
| 120 |
The default is |
| 121 |
.Dq yes . |
| 122 |
- Note that this option applies to protocol version 2 only. |
| 123 |
+.It Cm HostbasedAlgorithms |
| 124 |
+Specifies the protocol version 2 algorithms used in |
| 125 |
+.Dq hostbased |
Archives