[mutt] 01/01: a less invasive upstream/837372-do-not-color-gpgme-output.patch
Antonio Radici
antonio at moszumanska.debian.org
Sun Sep 11 15:53:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
antonio pushed a commit to branch master
in repository mutt.
commit 866f392009587b14a7cf28a68d34113c2583ae88
Author: Antonio Radici <antonio at debian.org>
Date: Sun Sep 11 16:47:55 2016 +0100
a less invasive upstream/837372-do-not-color-gpgme-output.patch
---
.../837372-do-not-color-gpgme-output.patch | 103 ---------------------
1 file changed, 103 deletions(-)
diff --git a/debian/patches/upstream/837372-do-not-color-gpgme-output.patch b/debian/patches/upstream/837372-do-not-color-gpgme-output.patch
index 9639618..be6538e 100644
--- a/debian/patches/upstream/837372-do-not-color-gpgme-output.patch
+++ b/debian/patches/upstream/837372-do-not-color-gpgme-output.patch
@@ -280,24 +280,6 @@ Upstream issue: http://bugs.mutt.org/3872
}
else
{ /* Decryption/Verification succeeded */
-@@ -2462,7 +2462,7 @@
- int res, idx;
- int anybad = 0;
-
-- state_attach_puts (_("[-- Begin signature "
-+ state_puts (_("[-- Begin signature "
- "information --]\n"), s);
- have_any_sigs = 1;
- for(idx=0;
-@@ -2475,7 +2475,7 @@
- if (!anybad && idx)
- maybe_goodsig = 1;
-
-- state_attach_puts (_("[-- End signature "
-+ state_puts (_("[-- End signature "
- "information --]\n\n"), s);
- }
-
@@ -2483,7 +2483,7 @@
if (!tmpfname)
{
@@ -307,88 +289,3 @@ Upstream issue: http://bugs.mutt.org/3872
}
else
{
-@@ -2504,12 +2504,12 @@
- if(s->flags & MUTT_DISPLAY)
- {
- if (needpass)
-- state_attach_puts (_("[-- BEGIN PGP MESSAGE --]\n\n"), s);
-+ state_puts (_("[-- BEGIN PGP MESSAGE --]\n\n"), s);
- else if (pgp_keyblock)
-- state_attach_puts (_("[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"),
-+ state_puts (_("[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"),
- s);
- else
-- state_attach_puts (_("[-- BEGIN PGP SIGNED MESSAGE --]\n\n"),
-+ state_puts (_("[-- BEGIN PGP SIGNED MESSAGE --]\n\n"),
- s);
- }
-
-@@ -2536,11 +2536,11 @@
- {
- state_putc ('\n', s);
- if (needpass)
-- state_attach_puts (_("[-- END PGP MESSAGE --]\n"), s);
-+ state_puts (_("[-- END PGP MESSAGE --]\n"), s);
- else if (pgp_keyblock)
-- state_attach_puts (_("[-- END PGP PUBLIC KEY BLOCK --]\n"), s);
-+ state_puts (_("[-- END PGP PUBLIC KEY BLOCK --]\n"), s);
- else
-- state_attach_puts (_("[-- END PGP SIGNED MESSAGE --]\n"), s);
-+ state_puts (_("[-- END PGP SIGNED MESSAGE --]\n"), s);
- }
-
- gpgme_data_release (armored_data);
-@@ -2563,7 +2563,7 @@
-
- if (needpass == -1)
- {
-- state_attach_puts (_("[-- Error: could not find beginning"
-+ state_puts (_("[-- Error: could not find beginning"
- " of PGP message! --]\n\n"), s);
- return 1;
- }
-@@ -2594,7 +2594,7 @@
- if (!(fpout = safe_fopen (tempfile, "w+")))
- {
- if (s->flags & MUTT_DISPLAY)
-- state_attach_puts (_("[-- Error: could not create temporary file! "
-+ state_puts (_("[-- Error: could not create temporary file! "
- "--]\n"), s);
- return -1;
- }
-@@ -2605,7 +2605,7 @@
- tattach->goodsig = is_signed > 0;
-
- if (s->flags & MUTT_DISPLAY)
-- state_attach_puts (is_signed?
-+ state_puts (is_signed?
- _("[-- The following data is PGP/MIME signed and encrypted --]\n\n"):
- _("[-- The following data is PGP/MIME encrypted --]\n\n"),
- s);
-@@ -2628,7 +2628,7 @@
- if (s->flags & MUTT_DISPLAY)
- {
- state_puts ("\n", s);
-- state_attach_puts (is_signed?
-+ state_puts (is_signed?
- _("[-- End of PGP/MIME signed and encrypted data --]\n"):
- _("[-- End of PGP/MIME encrypted data --]\n"),
- s);
-@@ -2667,7 +2667,7 @@
- if (!(fpout = safe_fopen (tempfile, "w+")))
- {
- if (s->flags & MUTT_DISPLAY)
-- state_attach_puts (_("[-- Error: could not create temporary file! "
-+ state_puts (_("[-- Error: could not create temporary file! "
- "--]\n"), s);
- return -1;
- }
-@@ -2678,7 +2678,7 @@
- tattach->goodsig = is_signed > 0;
-
- if (s->flags & MUTT_DISPLAY)
-- state_attach_puts (is_signed?
-+ state_puts (is_signed?
- _("[-- The following data is S/MIME signed --]\n\n"):
- _("[-- The following data is S/MIME encrypted --]\n\n"),
- s);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git
More information about the pkg-mutt-commits
mailing list