openssh: update to 7.6p1 (#1613)

diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh
index 2f3e183..515ec96 100755 (executable)
--- a/packages/openssh/build.sh
+++ b/packages/openssh/build.sh
@@ -1,9 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://www.openssh.com/
 TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
-TERMUX_PKG_VERSION=7.5p1
-TERMUX_PKG_REVISION=8
-TERMUX_PKG_SRCURL=http://mirrors.evowise.com/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0
+TERMUX_PKG_VERSION=7.6p1
+TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723
 TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, libutil"
 # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

diff --git a/packages/openssh/configure.ac.patch b/packages/openssh/configure.ac.patch
deleted file mode 100644 (file)
index 04da907..0000000
--- a/packages/openssh/configure.ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Patch submitted upstream at https://bugzilla.mindrot.org/show_bug.cgi?id=2697
-
-diff -u -r ../openssh-7.5p1/configure.ac ./configure.ac
---- ../openssh-7.5p1/configure.ac      2017-03-20 03:39:27.000000000 +0100
-+++ ./configure.ac     2017-03-23 11:18:49.800171062 +0100
-@@ -1486,6 +1486,7 @@
-               else
-                       LIBS="$LIBS `$LDNSCONFIG --libs`"
-                       CPPFLAGS="$CPPFLAGS `$LDNSCONFIG --cflags`"
-+                      ldns=yes
-               fi
-       elif test "x$withval" != "xno" ; then
-                       CPPFLAGS="$CPPFLAGS -I${withval}/include"