pass: 1.7.2 -> 1.7.3

2 files changed, 20 insertions, 20 deletions

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 007414d68a5..6c0a59bcce7 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -29,12 +29,12 @@ let
     };
 
   generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec {
-    version = "1.7.2";
+    version = "1.7.3";
     name    = "password-store-${version}";
 
     src = fetchurl {
       url    = "https://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
-      sha256 = "1sl0d7nc85c6c2bmmmyb8rpmn47vhkj831l153mjlkawjvhwas27";
+      sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b";
     };
 
     patches = [ ./set-correct-program-name-for-sleep.patch
diff --git a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
index 782e06e20fd..f3a844ad2d6 100644
--- a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
+++ b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
@@ -1,6 +1,6 @@
-From 25b44e00ed5df8ffe2782d38ad5cd9f514379599 Mon Sep 17 00:00:00 2001
-From: "Andrew R. M" <andrewmiller237@gmail.com>
-Date: Sat, 8 Apr 2017 13:50:01 -0400
+From d11261c2ad184daf6e9edd777bc8a3372c277b4b Mon Sep 17 00:00:00 2001
+From: Johannes Frankenau <johannes@frankenau.net>
+Date: Fri, 10 Aug 2018 09:49:57 +0200
 Subject: [PATCH] Patch the clip() function to work even when using
  single-binary coreutils
 
@@ -11,7 +11,7 @@ Subject: [PATCH] Patch the clip() function to work even when using
  3 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/password-store.sh b/src/password-store.sh
-index 6a4172d..4dbd6b8 100755
+index 7264ffc..68551a4 100755
 --- a/src/password-store.sh
 +++ b/src/password-store.sh
 @@ -155,11 +155,11 @@ clip() {
@@ -20,16 +20,16 @@ index 6a4172d..4dbd6b8 100755
  	local sleep_argv0="password store sleep on display $DISPLAY"
 -	pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
 +	pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
- 	local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | base64)"
+ 	local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | $BASE64)"
  	echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard"
  	(
 -		( exec -a "$sleep_argv0" bash <<<"trap 'kill %1' TERM; sleep '$CLIP_TIME' & wait" )
 +		( exec -a "$sleep_argv0" bash <(echo trap 'kill %1' TERM\; sleep "$CLIP_TIME & wait") )
- 		local now="$(xclip -o -selection "$X_SELECTION" | base64)"
- 		[[ $now != $(echo -n "$1" | base64) ]] && before="$now"
+ 		local now="$(xclip -o -selection "$X_SELECTION" | $BASE64)"
+ 		[[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now"
  
 diff --git a/src/platform/cygwin.sh b/src/platform/cygwin.sh
-index 6e5dd86..f3574c4 100644
+index 5a8d5ea..423e0ce 100644
 --- a/src/platform/cygwin.sh
 +++ b/src/platform/cygwin.sh
 @@ -3,11 +3,11 @@
@@ -38,16 +38,16 @@ index 6e5dd86..f3574c4 100644
  	local sleep_argv0="password store sleep on display $DISPLAY"
 -	pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
 +	pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
- 	local before="$(base64 < /dev/clipboard)"
+ 	local before="$($BASE64 < /dev/clipboard)"
  	echo -n "$1" > /dev/clipboard
  	(
 -		( exec -a "$sleep_argv0" sleep "$CLIP_TIME" )
 +		( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") )
- 		local now="$(base64 < /dev/clipboard)"
- 		[[ $now != $(echo -n "$1" | base64) ]] && before="$now"
- 		echo "$before" | base64 -d > /dev/clipboard
+ 		local now="$($BASE64 < /dev/clipboard)"
+ 		[[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now"
+ 		echo "$before" | $BASE64 -d > /dev/clipboard
 diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh
-index 86eb325..deb04c4 100644
+index 342ecce..9e12837 100644
 --- a/src/platform/darwin.sh
 +++ b/src/platform/darwin.sh
 @@ -3,11 +3,11 @@
@@ -56,14 +56,14 @@ index 86eb325..deb04c4 100644
  	local sleep_argv0="password store sleep for user $(id -u)"
 -	pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
 +	pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
- 	local before="$(pbpaste | openssl base64)"
+ 	local before="$(pbpaste | $BASE64)"
  	echo -n "$1" | pbcopy
  	(
 -		( exec -a "$sleep_argv0" sleep "$CLIP_TIME" )
 +		( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") )
- 		local now="$(pbpaste | openssl base64)"
- 		[[ $now != $(echo -n "$1" | openssl base64) ]] && before="$now"
- 		echo "$before" | openssl base64 -d | pbcopy
+ 		local now="$(pbpaste | $BASE64)"
+ 		[[ $now != $(echo -n "$1" | $BASE64) ]] && before="$now"
+ 		echo "$before" | $BASE64 -d | pbcopy
 -- 
-2.12.2
+2.16.4