openssh: Update from 7.3p1 to 7.4p1

diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh
index f704a55..ac17e59 100755 (executable)
--- a/packages/openssh/build.sh
+++ b/packages/openssh/build.sh
@@ -1,14 +1,13 @@
 TERMUX_PKG_HOMEPAGE=http://www.openssh.com/
 TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
 TERMUX_PKG_HOMEPAGE=http://www.openssh.com/
 TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"

-TERMUX_PKG_VERSION=7.3p1
-TERMUX_PKG_BUILD_REVISION=1
-TERMUX_PKG_SRCURL=http://mirrors.mit.edu/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=3ffb989a6dcaa69594c3b550d4855a5a2e1718ccdde7f5e36387b424220fbecc
-TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl"
+TERMUX_PKG_VERSION=7.4p1
+TERMUX_PKG_SRCURL=http://mirrors.evowise.com/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1
+TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libutil"

 # --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"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_header_sys_un_h=yes ac_cv_func_strnvis=no ac_cv_func_readpassphrase=no ac_cv_search_getrrsetbyname=no ac_cv_func_getlastlogxbyname=no ac_cv_func_fmt_scaled=no ac_cv_func_endgrent=yes"
 # --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"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_header_sys_un_h=yes ac_cv_func_strnvis=no ac_cv_func_readpassphrase=no ac_cv_search_getrrsetbyname=no ac_cv_func_getlastlogxbyname=no ac_cv_func_fmt_scaled=no ac_cv_func_endgrent=yes"

-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-libutil ac_cv_search_openpty=no --with-privsep-path=$TERMUX_PREFIX/var/empty"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-privsep-path=$TERMUX_PREFIX/var/empty"

 TERMUX_PKG_MAKE_INSTALL_TARGET="install-nokeys"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/slogin share/man/man1/slogin.1"
 
 TERMUX_PKG_MAKE_INSTALL_TARGET="install-nokeys"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/slogin share/man/man1/slogin.1"
 

diff --git a/packages/openssh/have_dev_ptmx.patch b/packages/openssh/have_dev_ptmx.patch
deleted file mode 100644 (file)
index 65ef33d..0000000
--- a/packages/openssh/have_dev_ptmx.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -u -r ../openssh-6.4p1/config.h.in ./config.h.in
---- ../openssh-6.4p1/config.h.in       2013-11-08 02:41:08.000000000 +0100
-+++ ./config.h.in      2014-02-03 04:32:13.000000000 +0100
-@@ -336,7 +336,7 @@
- #undef HAVE_DES_CRYPT
- 
- /* Define if you have /dev/ptmx */
--#undef HAVE_DEV_PTMX
-+#define HAVE_DEV_PTMX 1
- 
- /* Define if you have /dev/ptc */
- #undef HAVE_DEV_PTS_AND_PTC
-diff -u -r ../openssh-6.4p1/openbsd-compat/bsd-openpty.c ./openbsd-compat/bsd-openpty.c
---- ../openssh-6.4p1/openbsd-compat/bsd-openpty.c      2006-08-24 11:52:30.000000000 +0200
-+++ ./openbsd-compat/bsd-openpty.c     2014-02-03 04:33:42.000000000 +0100
-@@ -121,15 +121,17 @@
-               return (-1);
-       }
- 
-+# ifndef __ANDROID__
-       /*
-        * Try to push the appropriate streams modules, as described 
-        * in Solaris pts(7).
-        */
-       ioctl(*aslave, I_PUSH, "ptem");
-       ioctl(*aslave, I_PUSH, "ldterm");
--# ifndef __hpux
-+#  ifndef __hpux
-       ioctl(*aslave, I_PUSH, "ttcompat");
--# endif /* __hpux */
-+#  endif /* __hpux */
-+# endif /* __ANDROID__ */
- 
-       return (0);
- 

diff --git a/packages/openssh/explicit_bzero.c.patch b/packages/openssh/openbsd-compat-explicit_bzero.c.patch
similarity index 53%
rename from packages/openssh/explicit_bzero.c.patch
rename to packages/openssh/openbsd-compat-explicit_bzero.c.patch
index 7683ddb..2991c4d 100644 (file)
--- a/packages/openssh/explicit_bzero.c.patch
+++ b/packages/openssh/openbsd-compat-explicit_bzero.c.patch
@@ -1,9 +1,9 @@
-bzero is a macro in android-21
+On Android bzero() is a macro.

 
 

-diff -u -r ../openssh-6.7p1/openbsd-compat/explicit_bzero.c ./openbsd-compat/explicit_bzero.c
---- ../openssh-6.7p1/openbsd-compat/explicit_bzero.c   2014-08-26 16:32:02.000000000 -0400
-+++ ./openbsd-compat/explicit_bzero.c  2014-12-20 10:01:24.551588019 -0500
-@@ -23,16 +23,10 @@
+diff -u -r ../openssh-7.4p1/openbsd-compat/explicit_bzero.c ./openbsd-compat/explicit_bzero.c
+--- ../openssh-7.4p1/openbsd-compat/explicit_bzero.c   2016-12-18 23:59:41.000000000 -0500
++++ ./openbsd-compat/explicit_bzero.c  2016-12-20 19:57:24.595833810 -0500
+@@ -25,12 +25,6 @@

  
  #else /* HAVE_MEMSET_S */
  
  
  #else /* HAVE_MEMSET_S */
  


@@ -16,6 +16,10 @@ diff -u -r ../openssh-6.7p1/openbsd-compat/explicit_bzero.c ./openbsd-compat/exp
  void
  explicit_bzero(void *p, size_t n)
  {
  void
  explicit_bzero(void *p, size_t n)
  {

+@@ -45,7 +39,7 @@
+ # endif
+ #endif
+ 

 -      ssh_bzero(p, n);
 +      bzero(p, n);
  }
 -      ssh_bzero(p, n);
 +      bzero(p, n);
  }