openssh: Update from 7.0 to 7.1
authorFredrik Fornwall <fredrik@fornwall.net>
Tue, 25 Aug 2015 20:27:05 +0000 (16:27 -0400)
committerFredrik Fornwall <fredrik@fornwall.net>
Tue, 25 Aug 2015 20:27:05 +0000 (16:27 -0400)
Also remove sftp patch which is no longer necessary.

packages/openssh/build.sh
packages/openssh/stfp_server_no_statvfs.patch [deleted file]

index d7c05b5..535ef73 100755 (executable)
@@ -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 (file)
index 813f1a2..0000000
+++ /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);