| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364 |
- diff -ur a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch
- --- a/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch 2017-03-27 13:31:01.816551100 -0700
- +++ b/0003-Add-support-for-the-multi-threaded-AES-CTR-cipher.patch 2017-03-27 13:51:03.894805846 -0700
- @@ -40,7 +40,7 @@
- @@ -44,7 +44,7 @@ CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
- - CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
- + CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
- -LIBS=@LIBS@
- +LIBS=@LIBS@ -lpthread
- K5LIBS=@K5LIBS@
- @@ -1023,6 +1023,3 @@
- do_authenticated(authctxt);
-
- /* The connection has been terminated. */
- ---
- -2.12.0
- -
- diff -ur a/0004-support-dynamically-sized-receive-buffers.patch b/0004-support-dynamically-sized-receive-buffers.patch
- --- a/0004-support-dynamically-sized-receive-buffers.patch 2017-03-27 13:31:01.816551100 -0700
- +++ b/0004-support-dynamically-sized-receive-buffers.patch 2017-03-27 13:49:44.513498976 -0700
- @@ -926,9 +926,9 @@
- @@ -526,10 +553,10 @@ send_client_banner(int connection_out, int minor1)
- /* Send our own protocol version identification. */
- if (compat20) {
- - xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
- -- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
- -+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
- + xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
- +- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION);
- ++ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION);
- } else {
- xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
- - PROTOCOL_MAJOR_1, minor1, SSH_VERSION);
- @@ -943,11 +943,11 @@
- @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
- char remote_version[256]; /* Must be at least as big as buf. */
-
- - xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
- -- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
- -+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
- + xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s",
- +- major, minor, SSH_VERSION, comment,
- ++ major, minor, SSH_RELEASE, comment,
- *options.version_addendum == '\0' ? "" : " ",
- - options.version_addendum);
- + options.version_addendum, newline);
-
- @@ -1020,6 +1020,8 @@ server_listen(void)
- int ret, listen_sock, on = 1;
- @@ -1008,10 +1008,6 @@
- @@ -3,4 +3,5 @@
- #define SSH_VERSION "OpenSSH_7.5"
-
- - #define SSH_PORTABLE "p1"
- --#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
- +-#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1"
- +#define SSH_HPN "-hpn14v12"
- +#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN
- ---
- -2.12.0
- -
|
