aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2018-05-21 19:24:51 +0200
committerAndreas Enge <andreas@enge.fr>2018-05-21 19:24:51 +0200
commit6bc85e79c2a8403fe8683b68c513987bd1562aec (patch)
treebfb74a7479c81c32da6df41f48bace2a70d34c39 /gnu/packages
parentc036959b1a61c37c9b7d72e655e1441f2feefb6e (diff)
downloadpatches-6bc85e79c2a8403fe8683b68c513987bd1562aec.tar
patches-6bc85e79c2a8403fe8683b68c513987bd1562aec.tar.gz
gnu: pius: Really add the patch file.
* gnu/packages/patches/pius.patch: New file. This is a follow-up to commit a92d97266dffcd1ab5c40a379005a7db1fc3dad4.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/patches/pius.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/gnu/packages/patches/pius.patch b/gnu/packages/patches/pius.patch
new file mode 100644
index 0000000000..da39731d4d
--- /dev/null
+++ b/gnu/packages/patches/pius.patch
@@ -0,0 +1,38 @@
+See https://github.com/jaymzh/pius/pull/96
+
+commit 4dba0bf75ab351969622f7b9c38484657411a528
+Author: Martin Kletzander <nert.pinx+github@gmail.com>
+Date: Thu May 17 17:55:27 2018 +0200
+
+ Don't fail on ENCRYPTION_COMPLIANCE_MODE line from too new GnuPG (#96)
+
+ GnuPG started printing information about encryption compliance in [commit
+ f31dc2540acf](https://dev.gnupg.org/rGf31dc2540acf7cd7f09fd94658e815822222bfcb)
+ and since then signing with pius fails.
+
+ Closes #95
+
+ Signed-off-by: Martin Kletzander <nert.pinx@gmail.com>
+
+diff --git a/libpius/signer.py b/libpius/signer.py
+index 3c7262f..13013bb 100644
+--- a/libpius/signer.py
++++ b/libpius/signer.py
+@@ -45,6 +45,7 @@ class PiusSigner(object):
+ GPG_PINENTRY_LAUNCHED = '[GNUPG:] PINENTRY_LAUNCHED'
+ GPG_KEY_CONSIDERED = '[GNUPG:] KEY_CONSIDERED'
+ GPG_WARN_VERSION = '[GNUPG:] WARNING server_version_mismatch'
++ GPG_ENC_COMPLIANT_MODE = '[GNUPG:] ENCRYPTION_COMPLIANCE_MODE'
+
+ def __init__(self, signer, force_signer, mode, keyring, gpg_path, tmpdir,
+ outdir, encrypt_outfiles, mail, mailer, verbose, sort_keyring,
+@@ -431,6 +432,9 @@ class PiusSigner(object):
+ if PiusSigner.GPG_ENC_BEG in line:
+ debug('Got GPG_ENC_BEG')
+ continue
++ elif PiusSigner.GPG_ENC_COMPLIANT_MODE in line:
++ debug('Got ENCRYPTION_COMPLIANCE_MODE')
++ continue
+ elif PiusSigner.GPG_ENC_END in line:
+ debug('Got GPG_ENC_END')
+ break