From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 22 Apr 2018 23:37:15 +0000 (+0200)
Subject: dropbear: Add back scp
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/e18c260e494bbb68838b31daf1939d7ffb3d79d4

dropbear: Add back scp

Make openssh conflict with dropbear as it also contains scp.
---

diff --git a/packages/dropbear/Makefile.in.patch b/packages/dropbear/Makefile.in.patch
new file mode 100644
index 00000000..49c76627
--- /dev/null
+++ b/packages/dropbear/Makefile.in.patch
@@ -0,0 +1,12 @@
+diff -uNr dropbear-2018.76/Makefile.in dropbear-2018.76.mod/Makefile.in
+--- dropbear-2018.76/Makefile.in	2018-02-27 16:25:10.000000000 +0200
++++ dropbear-2018.76.mod/Makefile.in	2018-04-21 14:05:03.923792282 +0300
+@@ -9,7 +9,7 @@
+ # dbclient functionality, and includes the progress-bar functionality in scp.
+ 
+ ifndef PROGRAMS
+-	PROGRAMS=dropbear dbclient dropbearkey dropbearconvert
++	PROGRAMS=dropbear dbclient dropbearkey dropbearconvert scp
+ endif
+ 
+ STATIC_LTC=libtomcrypt/libtomcrypt.a
diff --git a/packages/dropbear/build.sh b/packages/dropbear/build.sh
index 13ac8409..4f3b69fc 100755
--- a/packages/dropbear/build.sh
+++ b/packages/dropbear/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Small SSH server and client"
 TERMUX_PKG_DEPENDS="libutil, readline"
 TERMUX_PKG_CONFLICTS="openssh"
 TERMUX_PKG_VERSION=2018.76
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://matt.ucc.asn.au/dropbear/releases/dropbear-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-syslog --disable-utmp --disable-utmpx --disable-wtmp"
diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh
index 09f9f452..be47bd0c 100755
--- a/packages/openssh/build.sh
+++ b/packages/openssh/build.sh
@@ -1,9 +1,11 @@
 TERMUX_PKG_HOMEPAGE=https://www.openssh.com/
 TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
 TERMUX_PKG_VERSION=7.7p1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f
 TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, libutil"
+TERMUX_PKG_CONFLICTS="dropbear"
 # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-etc-default-login