diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-09-26 16:23:50 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-09-26 16:25:06 +0200 |
| commit | fb9142d5f0df59f9a0e381e6b79829dd6b40c680 (patch) | |
| tree | 3a348f8af96e03fe59c8319caa291718ae239850 /testing/git-secret/fix-passphrase-input-for-gpg2.2.patch | |
| parent | 9397682d64f1e7f23dcecd4f47fcf92ae7f2c1b0 (diff) | |
| download | aports-fb9142d5f0df59f9a0e381e6b79829dd6b40c680.tar.bz2 aports-fb9142d5f0df59f9a0e381e6b79829dd6b40c680.tar.xz | |
testing/git-secret: don't hide output, fix issue on gpg 2.2
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, 26 insertions, 0 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 new file mode 100644 index 0000000000..d106f19052 --- /dev/null +++ b/testing/git-secret/fix-passphrase-input-for-gpg2.2.patch @@ -0,0 +1,26 @@ +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) + |