X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/62c37b9710a7ce8e4f1dee241acb988e1b9d361b..2173f7301d6332bbdb7c9c4d1aa25ddce6ff5964:/packages/openssh/build.sh

diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh
index d7c05b56..7aa80b94 100755
--- a/packages/openssh/build.sh
+++ b/packages/openssh/build.sh
@@ -1,18 +1,50 @@
-TERMUX_PKG_HOMEPAGE=http://www.openssh.com/
+TERMUX_PKG_HOMEPAGE=https://www.openssh.com/
 TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
-TERMUX_PKG_VERSION=7.0
-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"
+TERMUX_PKG_VERSION=7.5p1
+TERMUX_PKG_REVISION=3
+TERMUX_PKG_SRCURL=http://mirrors.evowise.com/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0
+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="--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-etc-default-login
+--disable-lastlog
+--disable-libutil
+--disable-pututline
+--disable-pututxline
+--disable-strip
+--disable-utmp
+--disable-utmpx
+--disable-wtmp
+--disable-wtmpx
+--sysconfdir=$TERMUX_PREFIX/etc/ssh
+--with-cflags=-Dfd_mask=int
+--with-ldns
+--with-libedit
+--without-ssh1
+--without-stackprotect
+--with-pid-dir=$TERMUX_PREFIX/var/run
+--with-privsep-path=$TERMUX_PREFIX/var/empty
+ac_cv_func_endgrent=yes
+ac_cv_func_fmt_scaled=no
+ac_cv_func_getlastlogxbyname=no
+ac_cv_func_readpassphrase=no
+ac_cv_func_strnvis=no
+ac_cv_header_sys_un_h=yes
+ac_cv_search_getrrsetbyname=no
+"
 TERMUX_PKG_MAKE_INSTALL_TARGET="install-nokeys"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/slogin share/man/man1/slogin.1"
 
-export LD=$CC # Needed to link the binaries
-export LDFLAGS="$LDFLAGS -llog" # liblog for android logging in syslog hack
+termux_step_pre_configure() {
+	autoreconf
 
-termux_step_pre_make () {
+	CPPFLAGS+=" -DHAVE_ATTRIBUTE__SENTINEL__=1"
+	LD=$CC # Needed to link the binaries
+	LDFLAGS+=" -llog" # liblog for android logging in syslog hack
+}
+
+termux_step_post_configure() {
 	# We need to remove this file before installing, since otherwise the
 	# install leaves it alone which means no updated timestamps.
 	rm -Rf $TERMUX_PREFIX/etc/moduli
@@ -20,11 +52,16 @@ termux_step_pre_make () {
 
 termux_step_post_make_install () {
 	# OpenSSH 7.0 disabled ssh-dss by default, keep it for a while in Termux:
-        echo -e "UsePrivilegeSeparation no\nPubkeyAcceptedKeyTypes +ssh-dss" > $TERMUX_PREFIX/etc/ssh/sshd_config
+        echo -e "PasswordAuthentication no\nPubkeyAcceptedKeyTypes +ssh-dss\nSubsystem sftp $TERMUX_PREFIX/libexec/sftp-server" > $TERMUX_PREFIX/etc/ssh/sshd_config
         echo "PubkeyAcceptedKeyTypes +ssh-dss" > $TERMUX_PREFIX/etc/ssh/ssh_config
 	cp $TERMUX_PKG_BUILDER_DIR/source-ssh-agent.sh $TERMUX_PREFIX/bin/source-ssh-agent
 	cp $TERMUX_PKG_BUILDER_DIR/ssh-with-agent.sh $TERMUX_PREFIX/bin/ssha
 
+	# Install ssh-copy-id:
+	cp $TERMUX_PKG_SRCDIR/contrib/ssh-copy-id.1 $TERMUX_PREFIX/share/man/man1/
+	cp $TERMUX_PKG_SRCDIR/contrib/ssh-copy-id $TERMUX_PREFIX/bin/
+	chmod +x $TERMUX_PREFIX/bin/ssh-copy-id
+
 	mkdir -p $TERMUX_PREFIX/var/run
 	echo "OpenSSH needs this folder to put sshd.pid in" >> $TERMUX_PREFIX/var/run/README.openssh