testing/git-secret: update to 0.2.5

* drop passhprase input patch, since it's included in upstream
* rebase remaining patches

Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>

4 files changed, 16 insertions, 57 deletions

diff --git a/testing/git-secret/APKBUILD b/testing/git-secret/APKBUILD
index e9c606acfe..0dda5e545c 100644
--- a/testing/git-secret/APKBUILD
+++ b/testing/git-secret/APKBUILD
@@ -4,8 +4,8 @@
 # Note: git-secret is very badly designed, I'll replace this abuild once
 #   I find or write something better.
 pkgname=git-secret
-pkgver=0.2.2
-pkgrel=1
+pkgver=0.2.5
+pkgrel=0
 pkgdesc="A bash-tool to store your private data inside a git repository"
 url="http://git-secret.io/"
 arch="noarch"
@@ -14,7 +14,6 @@ depends="bash gnupg"
 checkdepends="bats"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/sobolevn/$pkgname/archive/v$pkgver.tar.gz
-	fix-passphrase-input-for-gpg2.2.patch
 	dont-hide-gpg-output.patch
 	makefile.patch"
 builddir="$srcdir/$pkgname-$pkgver"
@@ -35,7 +34,6 @@ package() {
 	make PREFIX="$pkgdir/usr" install
 }
 
-sha512sums="453b9012fd90e962ec47af598b43f1036b7e741d9f46053ff16a469c08c1da33f99c8e792119664c82dd63d24b8cf72736e445a454c7b7f59c0387e886ee5fde  git-secret-0.2.2.tar.gz
-c1e619a7770f9a075e51fcdb2bac8651b0e29d0eae25bbeaa60458e1462b01f2d080aabecca20c909d2ec6e77656c0ce75d8781f5ac90352a416c8a76b287256  fix-passphrase-input-for-gpg2.2.patch
-43a446c7fa3bf723fb00ddddb187b58fffa8bfa9914de8398501f93f9ef42836abaa606944a67670e3033e5ff28d3e1d4cdcf40d05d6a1069aa20916a398ee76  dont-hide-gpg-output.patch
-5e91d0830e95a8be0eb1f87b482a1d9216ff86be354d52c5f0f5cf5b7c4bba6833f09097ea83349178314d63c373683f1782315b862eb4fc728dc17c91ba9bad  makefile.patch"
+sha512sums="be4ff93db3ae1f4de2314d2b9fb9f0e671e2f01cb0927a2e5e939bc7082b825fe536a464b5f165caafe56fe30715a974182099c6827785194a2a42a837e31c8f  git-secret-0.2.5.tar.gz
+102106c349797fe20eb32447b43d6ae70e44ba82a79fbc706c29a11cb76376394081fe10751b202346e703dd5eeae2494ea958071c7eee96a05927e544015b58  dont-hide-gpg-output.patch
+445cb34ccaaf5ed89a4db1e93e34f2fa63f3cdf63fbfc7d0fa592cfc030d4fcfd697c377e20695dc7566143aa7559ffa463169d606255eafa9e296e623fe8ff1  makefile.patch"
diff --git a/testing/git-secret/dont-hide-gpg-output.patch b/testing/git-secret/dont-hide-gpg-output.patch
index a6045e9a87..234834fe6f 100644
--- a/testing/git-secret/dont-hide-gpg-output.patch
+++ b/testing/git-secret/dont-hide-gpg-output.patch
@@ -1,26 +1,13 @@
 Goddamn, don't make troubleshooting impossible!
 
---- a/src/_utils/_git_secret_tools.sh
-+++ b/src/_utils/_git_secret_tools.sh
-@@ -279,8 +279,8 @@
-   if [[ ! -z "$passphrase" ]]; then
-     echo "$passphrase" | $base --batch --yes --no-tty --passphrase-fd 0 \
-       --passphrase-fd 0 --pinentry-mode loopback \
--      "$encrypted_filename" > /dev/null 2>&1
-+      --quiet "$encrypted_filename"
-   else
--    $base "$encrypted_filename" > /dev/null 2>&1
-+    $base "$encrypted_filename"
-   fi
- }
 --- a/src/commands/git_secret_tell.sh
 +++ b/src/commands/git_secret_tell.sh
-@@ -64,7 +64,7 @@
-     fi
- 
+@@ -95,7 +95,7 @@ function tell {
      # Importing public key to the local keychain:
--    $GPGLOCAL --import "$keyfile" > /dev/null 2>&1
-+    $GPGLOCAL --import "$keyfile"
-   done
- 
-   echo "done. ${emails[*]} added as someone who know(s) the secret."
+     local secrets_dir_keys
+     secrets_dir_keys=$(_get_secrets_dir_keys)
+-    $SECRETS_GPG_COMMAND --homedir "$secrets_dir_keys" --no-permission-warning --import "$keyfile" > /dev/null 2>&1
++    $SECRETS_GPG_COMMAND --homedir "$secrets_dir_keys" --no-permission-warning --import "$keyfile"
+     exit_code=$?
+     if [[ "$exit_code" -ne 0 ]]; then
+       _abort "problem importing public key for '$email' with gpg: exit code $exit_code"
diff --git a/testing/git-secret/fix-passphrase-input-for-gpg2.2.patch b/testing/git-secret/fix-passphrase-input-for-gpg2.2.patch
deleted file mode 100644
index d106f19052..0000000000
--- a/testing/git-secret/fix-passphrase-input-for-gpg2.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d548e548d8c4d03356cf576188715292091efe18 Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Tue, 26 Sep 2017 16:09:39 +0200
-Subject: [PATCH 1/2] Fix providing passphrase to GPG to work with GPG 2.2+
-
----
- src/_utils/_git_secret_tools.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/_utils/_git_secret_tools.sh b/src/_utils/_git_secret_tools.sh
-index 882c0b2..9e4282b 100644
---- a/src/_utils/_git_secret_tools.sh
-+++ b/src/_utils/_git_secret_tools.sh
-@@ -446,7 +446,8 @@ function _decrypt {
-   fi
- 
-   if [[ ! -z "$passphrase" ]]; then
--    echo "$passphrase" | $base --batch --yes --no-tty --passphrase-fd 0 \
-+    echo "$passphrase" | $base --batch --yes --no-tty \
-+      --passphrase-fd 0 --pinentry-mode loopback \
-       "$encrypted_filename" > /dev/null 2>&1
-   else
-     $base --quiet "$encrypted_filename"
--- 
-2.10.1 (Apple Git-78)
-
diff --git a/testing/git-secret/makefile.patch b/testing/git-secret/makefile.patch
index a864c95841..3f049658ea 100644
--- a/testing/git-secret/makefile.patch
+++ b/testing/git-secret/makefile.patch
@@ -1,14 +1,14 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -39,10 +39,10 @@
- 	git clone https://github.com/sstephenson/bats.git vendor/bats; fi
+@@ -40,10 +40,10 @@ install-test:
+ 	fi
  
  .PHONY: test
 -test: install-test clean build
 +test: build
  	@chmod +x "./utils/tests.sh"; sync; \
  	export SECRET_PROJECT_ROOT="${PWD}"; \
--	export PATH="${PWD}/vendor/bats/bin:${PWD}:${PATH}"; \
+-	export PATH="${PWD}/vendor/bats-core/bin:${PWD}:${PATH}"; \
 +	export PATH="${PWD}:${PATH}"; \
  	"./utils/tests.sh"