sergiotarxz/termux-packages
sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update openssh from 6.8 to 6.9

Browse Source
This commit is contained in:
Fredrik Fornwall 2015-07-11 21:47:52 -04:00
parent 614749cd9e
commit 84443dd26c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/openssh/build.sh
View File

@ -1,6 +1,6 @@
TERMUX_PKG_HOMEPAGE=http://www.openssh.com/ TERMUX_PKG_HOMEPAGE=http://www.openssh.com/
TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine" TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
TERMUX_PKG_VERSION=6.8 TERMUX_PKG_VERSION=6.9
TERMUX_PKG_SRCURL=http://ftp.eu.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}p1.tar.gz TERMUX_PKG_SRCURL=http://ftp.eu.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}p1.tar.gz
TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl" TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl"
# --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries: # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries:

16
packages/openssh/servconf.c.patch
View File

@ -1,16 +1,16 @@
diff -u -r ../openssh-6.6p1/servconf.c ./servconf.c diff -u -r ../openssh-6.9p1/servconf.c ./servconf.c
--- ../openssh-6.6p1/servconf.c 2014-02-04 01:12:57.000000000 +0100 --- ../openssh-6.9p1/servconf.c 2015-06-30 22:35:31.000000000 -0400
+++ ./servconf.c 2014-06-04 13:18:34.672668616 +0200 +++ ./servconf.c 2015-07-11 21:40:29.639988543 -0400
@@ -185,7 +185,7 @@ @@ -208,7 +208,7 @@
} }
/* No certificates by default */ /* No certificates by default */
if (options->num_ports == 0) if (options->num_ports == 0)
- options->ports[options->num_ports++] = SSH_DEFAULT_PORT; - options->ports[options->num_ports++] = SSH_DEFAULT_PORT;
+ options->ports[options->num_ports++] = 8022 /*SSH_DEFAULT_PORT*/; + options->ports[options->num_ports++] = 8022 /*SSH_DEFAULT_PORT*/;
if (options->address_family == -1)
options->address_family = AF_UNSPEC;
if (options->listen_addrs == NULL) if (options->listen_addrs == NULL)
add_listen_addr(options, NULL, 0); @@ -663,7 +663,7 @@
if (options->pid_file == NULL)
@@ -530,7 +530,7 @@
u_int i; u_int i;
if (options->num_ports == 0) if (options->num_ports == 0)
@ -18,4 +18,4 @@ diff -u -r ../openssh-6.6p1/servconf.c ./servconf.c
+ options->ports[options->num_ports++] = 8022 /*SSH_DEFAULT_PORT*/; + options->ports[options->num_ports++] = 8022 /*SSH_DEFAULT_PORT*/;
if (options->address_family == -1) if (options->address_family == -1)
options->address_family = AF_UNSPEC; options->address_family = AF_UNSPEC;
if (port == 0)