From 36b0e5f0ce3b510cebc3026f2a5ec6873b93e120 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 28 Nov 2018 01:37:15 +0100
Subject: [PATCH] apt: Fix ssh:// sources (fixes #3093)

---
 packages/apt/build.sh             |  2 +-
 packages/apt/methods-rsh.cc.patch | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 packages/apt/methods-rsh.cc.patch

diff --git a/packages/apt/build.sh b/packages/apt/build.sh
index 182570986..031b5fc9a 100644
--- a/packages/apt/build.sh
+++ b/packages/apt/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/apt
 TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager"
 TERMUX_PKG_DEPENDS="libcurl, liblzma, dpkg, gpgv, libc++, termux-exec"
 TERMUX_PKG_VERSION=1.4.8
-TERMUX_PKG_REVISION=6
+TERMUX_PKG_REVISION=7
 TERMUX_PKG_SHA256=767ad7d6efb64cde52faececb7d3c0bf49800b9fe06f3a5b0132ab4c01a5b8f8
 TERMUX_PKG_SRCURL=http://ftp.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/apt/methods-rsh.cc.patch b/packages/apt/methods-rsh.cc.patch
deleted file mode 100644
index 7b1902991..000000000
--- a/packages/apt/methods-rsh.cc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr apt-1.4.8/methods/rsh.cc apt-1.4.8.mod/methods/rsh.cc
---- apt-1.4.8/methods/rsh.cc	2017-09-13 19:47:33.000000000 +0300
-+++ apt-1.4.8.mod/methods/rsh.cc	2018-06-19 13:41:50.497061290 +0300
-@@ -152,7 +152,7 @@
-       if (Host.empty() == false) {
-          Args[i++] = Host.c_str();
-       }
--      Args[i++] = "/bin/sh";
-+      Args[i++] = "@TERMUX_PREFIX@/bin/sh";
-       Args[i] = 0;
-       execvp(Args[0],(char **)Args);
-       exit(100);