From e012fbbde8113fe608910acbba31366fa138405d Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Thu, 3 Oct 2019 22:15:37 +0200
Subject: [PATCH] bettercap: update to 2.25

---
 root-packages/bettercap/build.sh         |  5 ++---
 root-packages/bettercap/fix-paths.patch  | 22 ++++++++++------------
 root-packages/bettercap/fix-tmpdir.patch | 20 --------------------
 3 files changed, 12 insertions(+), 35 deletions(-)
 delete mode 100644 root-packages/bettercap/fix-tmpdir.patch

diff --git a/root-packages/bettercap/build.sh b/root-packages/bettercap/build.sh
index d64b2443c..4daddb6be 100644
--- a/root-packages/bettercap/build.sh
+++ b/root-packages/bettercap/build.sh
@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://www.bettercap.org
 TERMUX_PKG_DESCRIPTION="The Swiss Army knife for 802.11, BLE and Ethernet networks reconnaissance and MITM attacks"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_VERSION=2.24.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=2.25
 TERMUX_PKG_SRCURL=https://github.com/bettercap/bettercap/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=590cef2b2b24fd9f67c57c8cb19ab8ff08b11d43bfc23b468013ddad907bb8b8
+TERMUX_PKG_SHA256=955b29946774bb12a757006d5518bc20e7174092c5a37f771ab1cb8d21223b6a
 TERMUX_PKG_DEPENDS="libpcap, libusb"
 # x86_64 seem to depend on libnetfilter_queue
 TERMUX_PKG_BLACKLISTED_ARCHES="x86_64"
diff --git a/root-packages/bettercap/fix-paths.patch b/root-packages/bettercap/fix-paths.patch
index e149f7e00..49a6fc94a 100644
--- a/root-packages/bettercap/fix-paths.patch
+++ b/root-packages/bettercap/fix-paths.patch
@@ -1,16 +1,14 @@
-diff --git a/caplets/env.go b/caplets/env.go
-index 4c803b6..eccfe7e 100644
---- a/caplets/env.go
-+++ b/caplets/env.go
-@@ -11,7 +11,7 @@ const (
- 	EnvVarName     = "CAPSPATH"
- 	Suffix         = ".cap"
- 	InstallArchive = "https://github.com/bettercap/caplets/archive/master.zip"
--	InstallBase    = "/usr/local/share/bettercap/"
-+	InstallBase    = "@TERMUX_PREFIX@/local/share/bettercap/"
- )
+--- ./caplets/env.go.orig	2019-10-03 21:17:37.044291360 +0200
++++ ./caplets/env.go	2019-10-03 21:18:21.894201252 +0200
+@@ -19,7 +19,7 @@
+ 	if runtime.GOOS == "windows" {
+ 		return filepath.Join(os.Getenv("ALLUSERSPROFILE"), "bettercap")
+ 	}
+-	return "/usr/local/share/bettercap/"
++	return "@TERMUX_PREFIX@/local/share/bettercap/"
+ }
  
- var (
+ func getUserHomeDir() string {
 diff --git a/modules/ui/ui.go b/modules/ui/ui.go
 index f5d6950..4059c6c 100644
 --- a/modules/ui/ui.go
diff --git a/root-packages/bettercap/fix-tmpdir.patch b/root-packages/bettercap/fix-tmpdir.patch
deleted file mode 100644
index 9eec28c58..000000000
--- a/root-packages/bettercap/fix-tmpdir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../caplets.go.orig	2019-09-12 07:01:02.402741887 +0200
-+++ ./modules/caplets/caplets.go	2019-09-12 07:01:26.121229567 +0200
-@@ -120,7 +120,7 @@
- 		}
- 	}
- 
--	out, err := os.Create("/tmp/caplets.zip")
-+	out, err := os.Create("@TERMUX_PREFIX@/tmp/caplets.zip")
- 	if err != nil {
- 		return err
- 	}
-@@ -140,7 +140,7 @@
- 
- 	mod.Info("installing caplets to %s ...", caplets.InstallPath)
- 
--	if _, err = zip.Unzip("/tmp/caplets.zip", caplets.InstallBase); err != nil {
-+	if _, err = zip.Unzip("@TERMUX_PREFIX@/tmp/caplets.zip", caplets.InstallBase); err != nil {
- 		return err
- 	}
-