From 2ea84722cf8f7da34f44f659ea1fbdfc6b52afee Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 25 Aug 2015 16:27:05 -0400 Subject: [PATCH] openssh: Update from 7.0 to 7.1 Also remove sftp patch which is no longer necessary. --- packages/openssh/build.sh | 2 +- packages/openssh/stfp_server_no_statvfs.patch | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 packages/openssh/stfp_server_no_statvfs.patch diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh index d7c05b56..535ef734 100755 --- a/packages/openssh/build.sh +++ b/packages/openssh/build.sh @@ -1,6 +1,6 @@ TERMUX_PKG_HOMEPAGE=http://www.openssh.com/ TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine" -TERMUX_PKG_VERSION=7.0 +TERMUX_PKG_VERSION=7.1 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" # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries: diff --git a/packages/openssh/stfp_server_no_statvfs.patch b/packages/openssh/stfp_server_no_statvfs.patch deleted file mode 100644 index 813f1a25..00000000 --- a/packages/openssh/stfp_server_no_statvfs.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u -r ../openssh-6.5p1/sftp-server.c ./sftp-server.c ---- ../openssh-6.5p1/sftp-server.c 2014-01-19 05:25:35.000000000 +0100 -+++ ./sftp-server.c 2014-02-11 11:06:33.000000000 +0100 -@@ -1259,7 +1259,7 @@ - debug3("request %u: statvfs", id); - logit("statvfs \"%s\"", path); - -- if (statvfs(path, &st) != 0) -+ if (statfs(path, &st) != 0) - send_status(id, errno_to_portable(errno)); - else - send_statvfs(id, &st); -@@ -1279,7 +1279,7 @@ - send_status(id, SSH2_FX_FAILURE); - return; - } -- if (fstatvfs(fd, &st) != 0) -+ if (fstat(fd, &st) != 0) - send_status(id, errno_to_portable(errno)); - else - send_statvfs(id, &st); -- 2.11.0