diff options
| author | Mateusz Gozdek <mgozdekof@gmail.com> | 2019-04-18 09:54:42 +0200 |
|---|---|---|
| committer | Andy Postnikov <apostnikov@gmail.com> | 2019-04-19 02:08:07 +0300 |
| commit | c356cce42674c0b627adb85c9a0884ae4cea7122 (patch) | |
| tree | fa63938d617806c78b508108b6ae8e9847ed754b /testing/git-secret/fix-passphrase-input-for-gpg2.2.patch | |
| parent | 3d087765f687f814be88fb8c1eb755abbe933e7d (diff) | |
| download | aports-c356cce42674c0b627adb85c9a0884ae4cea7122.tar.bz2 aports-c356cce42674c0b627adb85c9a0884ae4cea7122.tar.xz | |
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>
Diffstat (limited to 'testing/git-secret/fix-passphrase-input-for-gpg2.2.patch')
| -rw-r--r-- | testing/git-secret/fix-passphrase-input-for-gpg2.2.patch | 26 |
1 files changed, 0 insertions, 26 deletions
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) - |