X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/1ee955a14208153daf993e6b9ef6e708f90e4e9e..73246f3b26ac3a9666d3546da77a7f80abd84865:/packages/openssh/build.sh

diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh
index 8bbfc935..19c683d5 100755
--- a/packages/openssh/build.sh
+++ b/packages/openssh/build.sh
@@ -1,7 +1,7 @@
 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=1
+TERMUX_PKG_REVISION=4
 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"
@@ -37,10 +37,9 @@ TERMUX_PKG_MAKE_INSTALL_TARGET="install-nokeys"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/slogin share/man/man1/slogin.1"
 
 termux_step_pre_configure() {
-	# We patch configure.ac:
-	cd $TERMUX_PKG_SRCDIR
 	autoreconf
 
+	CPPFLAGS+=" -DHAVE_ATTRIBUTE__SENTINEL__=1"
 	LD=$CC # Needed to link the binaries
 	LDFLAGS+=" -llog" # liblog for android logging in syslog hack
 }
@@ -71,7 +70,11 @@ termux_step_post_make_install () {
 }
 
 termux_step_create_debscripts () {
-	echo "mkdir -p \$HOME/.ssh" > postinst
+	echo "#!$TERMUX_PREFIX/bin/sh" > postinst
+	echo "mkdir -p \$HOME/.ssh" >> postinst
+	echo "touch \$HOME/.ssh/authorized_keys" >> postinst
+	echo "chmod 700 \$HOME/.ssh" >> postinst
+	echo "chmod 600 \$HOME/.ssh/authorized_keys" >> postinst
 	echo "" >> postinst
         echo "for a in rsa dsa ecdsa ed25519; do" >> postinst
         echo "    KEYFILE=$TERMUX_PREFIX/etc/ssh/ssh_host_\${a}_key" >> postinst