From c3a784b9d0703e774a3011671ecf6555fdef152b Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 20 Jun 2018 01:15:57 +0200
Subject: [PATCH] pass: Update from 1.7.1 to 1.7.2

---
 packages/pass/build.sh                    |  5 ++---
 packages/pass/src-password-store.sh.patch | 15 +++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/pass/build.sh b/packages/pass/build.sh
index 69f3de1bf..12220e1d4 100644
--- a/packages/pass/build.sh
+++ b/packages/pass/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.passwordstore.org/
 TERMUX_PKG_DESCRIPTION="Lightweight directory-based password manager"
-TERMUX_PKG_VERSION=1.7.1
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_VERSION=1.7.2
+TERMUX_PKG_SHA256=4768c5e1965c4d2aeb28818681e484fb105b6f46cbd75a97608615c4ec6980ea
 TERMUX_PKG_SRCURL=https://git.zx2c4.com/password-store/snapshot/password-store-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_BUILD_IN_SRC=yes
 # Depend on coreutils as pass uses [:graph:] when calling tr, which
@@ -11,4 +11,3 @@ TERMUX_PKG_RECOMMENDS="git"
 TERMUX_PKG_SUGGESTS="pass-otp"
 TERMUX_PKG_PLATFORM_INDEPENDENT=yes
 TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX"
-TERMUX_PKG_SHA256=f6d2199593398aaefeaa55e21daddfb7f1073e9e096af6d887126141e99d9869
diff --git a/packages/pass/src-password-store.sh.patch b/packages/pass/src-password-store.sh.patch
index 7924730d4..bb0ee7e3e 100644
--- a/packages/pass/src-password-store.sh.patch
+++ b/packages/pass/src-password-store.sh.patch
@@ -1,8 +1,7 @@
-diff --git a/src/password-store.sh b/src/password-store.sh
-index 1ab6fb5..912b8b1 100755
---- a/src/password-store.sh
-+++ b/src/password-store.sh
-@@ -11,7 +11,7 @@ GPG="gpg"
+diff -u -r ../password-store-1.7.2/src/password-store.sh ./src/password-store.sh
+--- ../password-store-1.7.2/src/password-store.sh	2018-06-14 16:58:28.000000000 +0200
++++ ./src/password-store.sh	2018-06-17 00:03:16.760901453 +0200
+@@ -11,7 +11,7 @@
  export GPG_TTY="${GPG_TTY:-$(tty 2>/dev/null)}"
  which gpg2 &>/dev/null && GPG="gpg2"
  [[ -n $GPG_AGENT_INFO || $GPG == "gpg2" ]] && GPG_OPTS+=( "--batch" "--use-agent" )
@@ -11,7 +10,7 @@ index 1ab6fb5..912b8b1 100755
  PREFIX="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
  EXTENSIONS="${PASSWORD_STORE_EXTENSIONS_DIR:-$PREFIX/.extensions}"
  X_SELECTION="${PASSWORD_STORE_X_SELECTION:-clipboard}"
-@@ -156,12 +156,13 @@ clip() {
+@@ -156,12 +156,13 @@
  	# trailing new lines.
  	local sleep_argv0="password store sleep on display $DISPLAY"
  	pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
@@ -29,12 +28,12 @@ index 1ab6fb5..912b8b1 100755
  
  		# It might be nice to programatically check to see if klipper exists,
  		# as well as checking for other common clipboard managers. But for now,
-@@ -172,7 +173,7 @@ clip() {
+@@ -172,7 +173,7 @@
  		# so we axe it here:
  		qdbus org.kde.klipper /klipper org.kde.klipper.klipper.clearClipboardHistory &>/dev/null
  
 -		echo "$before" | base64 -d | xclip -selection "$X_SELECTION"
 +		echo "$before" | base64 -d | termux-clipboard-set
- 	) 2>/dev/null & disown
+ 	) >/dev/null 2>&1 & disown
  	echo "Copied $2 to clipboard. Will clear in $CLIP_TIME seconds."
  }