diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh index ca15a9f38..2a8998a30 100755 --- a/packages/openssh/build.sh +++ b/packages/openssh/build.sh @@ -1,8 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://www.openssh.com/ TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine" -TERMUX_PKG_VERSION=7.2p2 -TERMUX_PKG_BUILD_REVISION=7 -TERMUX_PKG_SRCURL=http://ftp.eu.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_VERSION=7.3p1 +TERMUX_PKG_SRCURL=http://mirrors.mit.edu/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl" # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries: TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-cflags=-Dfd_mask=int --with-ldns --disable-etc-default-login --disable-lastlog --disable-utmp --disable-utmpx --disable-wtmp --disable-wtmpx --disable-libutil --disable-pututline --disable-pututxline --without-stackprotect --with-pid-dir=$TERMUX_PREFIX/var/run --disable-strip --sysconfdir=$TERMUX_PREFIX/etc/ssh --without-ssh1" diff --git a/packages/openssh/openbsd-compat-xcrypt.c.patch b/packages/openssh/openbsd-compat-xcrypt.c.patch new file mode 100644 index 000000000..d3b0d3758 --- /dev/null +++ b/packages/openssh/openbsd-compat-xcrypt.c.patch @@ -0,0 +1,19 @@ +diff -u -r ../openssh-7.3p1/openbsd-compat/xcrypt.c ./openbsd-compat/xcrypt.c +--- ../openssh-7.3p1/openbsd-compat/xcrypt.c 2016-07-27 18:54:27.000000000 -0400 ++++ ./openbsd-compat/xcrypt.c 2016-08-08 14:44:44.488143396 -0400 +@@ -80,6 +80,7 @@ + if (salt[0] != '\0') + return salt; + strlcpy(salt, "xx", sizeof(salt)); ++#ifndef __ANDROID__ + setpwent(); + while ((pw = getpwent()) != NULL) { + passwd = shadow_pw(pw); +@@ -92,6 +93,7 @@ + } + out: + endpwent(); ++#endif + return salt; + } +