[mutt] 02/04: cleaning up unused patches
Antonio Radici
antonio at moszumanska.debian.org
Sat Jun 24 14:54:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
antonio pushed a commit to branch master
in repository mutt.
commit 9ae39230b9a2922fd79a724b8bbb6836d6786061
Author: Antonio Radici <antonio at debian.org>
Date: Sat Jun 24 15:41:32 2017 +0100
cleaning up unused patches
---
.../dont_document_not_present_features.patch | 33 ---------
debian/patches/upstream/228671-pipe-mime.patch | 42 ------------
.../549204-clear-N-on-readonly-imap-folders.patch | 78 ----------------------
.../patches/upstream/835421-pop-digest-md5.patch | 19 ------
debian/patches/upstream/gpgme-set-sender.patch | 34 ----------
5 files changed, 206 deletions(-)
diff --git a/debian/patches/debian-specific/dont_document_not_present_features.patch b/debian/patches/debian-specific/dont_document_not_present_features.patch
deleted file mode 100644
index 54a1466..0000000
--- a/debian/patches/debian-specific/dont_document_not_present_features.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Antonio Radici <antonio at debian.org>
-Date: Thu, 27 Feb 2014 16:17:42 +0100
-Subject: dont_document_not_present_features
-
-As the patch says, this will add an include so only
-documented options for Debian will be used.
----
- functions.h | 2 +-
- init.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/functions.h
-+++ b/functions.h
-@@ -32,7 +32,7 @@
-
- #ifdef _MAKEDOC
- # include "config.h"
--# include "doc/makedoc-defs.h"
-+/* # include "doc/makedoc-defs.h" include only documented options for Debian */
- #endif
-
- // clang-format off
---- a/init.h
-+++ b/init.h
-@@ -19,7 +19,7 @@
-
- #ifdef _MAKEDOC
- # include "config.h"
--# include "doc/makedoc-defs.h"
-+/* # include "makedoc-defs.h" include only documented options for Debian */
- #else
- # include "sort.h"
- # include "mx.h"
diff --git a/debian/patches/upstream/228671-pipe-mime.patch b/debian/patches/upstream/228671-pipe-mime.patch
deleted file mode 100644
index 54764cb..0000000
--- a/debian/patches/upstream/228671-pipe-mime.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Antonio Radici <antonio at debian.org>
-Date: Thu, 27 Feb 2014 17:11:56 +0100
-Subject: 228671-pipe-mime
-
-Don't draw imap fetch progress if we aren't in visual mode.
-Drawing progress leaves terminal in confusing state when
-piping a message from pager to less(1).
-See http://bugs.mutt.org/1771
-
-Updated in Debian bug #569279
----
- imap/message.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
---- a/imap/message.c
-+++ b/imap/message.c
-@@ -419,7 +419,7 @@
- char path[_POSIX_PATH_MAX];
- char *pc;
- long bytes;
-- progress_t progressbar;
-+ progress_t progressbar, *pbar;
- int uid;
- int cacheno;
- IMAP_CACHE *cache;
-@@ -517,8 +517,14 @@
- imap_error ("imap_fetch_message()", buf);
- goto bail;
- }
-- mutt_progress_init (&progressbar, _("Fetching message..."),
-- MUTT_PROGRESS_SIZE, NetInc, bytes);
-+ if (!isendwin())
-+ {
-+ mutt_progress_init (&progressbar, _("Fetching message..."),
-+ MUTT_PROGRESS_SIZE, NetInc, bytes);
-+ pbar = &progressbar;
-+ }
-+ else
-+ pbar = NULL;
- if (imap_read_literal (msg->fp, idata, bytes, &progressbar) < 0)
- goto bail;
- /* pick up trailing line */
diff --git a/debian/patches/upstream/549204-clear-N-on-readonly-imap-folders.patch b/debian/patches/upstream/549204-clear-N-on-readonly-imap-folders.patch
deleted file mode 100644
index 6f4b563..0000000
--- a/debian/patches/upstream/549204-clear-N-on-readonly-imap-folders.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Clear N flag on read-only IMAP mailboxes if the user requires so.
-
-Patch created by Julien Danjou <acid at debian.org>, Antonio Radici has added a
-case for OP_MAIN_SET_FLAG and OP_MAIN_CLEAR_FLAG which was not there 7 years
-ago.
-
-Debian bug: http://bugs.debian.org/549204
-Mutt bug: http://bugs.mutt.org/969
-
---- a/mx.c
-+++ b/mx.c
-@@ -896,7 +896,7 @@
-
- ctx->closing = 1;
-
-- if (ctx->readonly || ctx->dontwrite)
-+ if (ctx->dontwrite)
- {
- /* mailbox is readonly or we don't want to write */
- mx_fastclose_mailbox (ctx);
---- a/pager.c
-+++ b/pager.c
-@@ -2549,7 +2549,6 @@
- case OP_PURGE_MESSAGE:
- case OP_DELETE:
- CHECK_MODE(IsHeader (extra));
-- CHECK_READONLY;
- /* L10N: CHECK_ACL */
- CHECK_ACL(MUTT_ACL_DELETE, _("Cannot delete message"));
-
-@@ -2568,7 +2567,6 @@
- case OP_MAIN_SET_FLAG:
- case OP_MAIN_CLEAR_FLAG:
- CHECK_MODE(IsHeader (extra));
-- CHECK_READONLY;
-
- if (mutt_change_flag (extra->hdr, (ch == OP_MAIN_SET_FLAG)) == 0)
- redraw |= REDRAW_STATUS | REDRAW_INDEX;
-@@ -2583,7 +2581,6 @@
- case OP_DELETE_SUBTHREAD:
- case OP_PURGE_THREAD:
- CHECK_MODE(IsHeader (extra));
-- CHECK_READONLY;
- /* L10N: CHECK_ACL */
- CHECK_ACL(MUTT_ACL_DELETE, _("Cannot delete message(s)"));
-
-@@ -2710,7 +2707,6 @@
-
- case OP_FLAG_MESSAGE:
- CHECK_MODE(IsHeader (extra));
-- CHECK_READONLY;
- /* L10N: CHECK_ACL */
- CHECK_ACL(MUTT_ACL_WRITE, "Cannot flag message");
-
-@@ -2924,7 +2920,6 @@
-
- case OP_TOGGLE_NEW:
- CHECK_MODE(IsHeader (extra));
-- CHECK_READONLY;
- /* L10N: CHECK_ACL */
- CHECK_ACL(MUTT_ACL_SEEN, _("Cannot toggle new"));
-
-@@ -2944,7 +2939,6 @@
-
- case OP_UNDELETE:
- CHECK_MODE(IsHeader (extra));
-- CHECK_READONLY;
- /* L10N: CHECK_ACL */
- CHECK_ACL(MUTT_ACL_DELETE, _("Cannot undelete message"));
-
-@@ -2961,7 +2955,6 @@
- case OP_UNDELETE_THREAD:
- case OP_UNDELETE_SUBTHREAD:
- CHECK_MODE(IsHeader (extra));
-- CHECK_READONLY;
- /* L10N: CHECK_ACL */
- CHECK_ACL(MUTT_ACL_DELETE, _("Cannot undelete message(s)"));
-
diff --git a/debian/patches/upstream/835421-pop-digest-md5.patch b/debian/patches/upstream/835421-pop-digest-md5.patch
deleted file mode 100644
index 70588b4..0000000
--- a/debian/patches/upstream/835421-pop-digest-md5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-This patch was written by g1 <g1pi at libero.it>, there is an issue with mutt
-incorrectly handling the pop3 AUTH DIGEST-MD5 (RFC 5034).
-
-The patch was forwarded upstream on:
-http://bugs.mutt.org/3862
-
-The original Debian bug for this problem is http://bugs.debian.org/835421
-
---- a/pop_auth.c
-+++ b/pop_auth.c
-@@ -121,7 +121,7 @@
- client_start = 0;
- }
-
-- if (rc != SASL_CONTINUE && (olen == 0 || rc != SASL_OK))
-+ if (rc == SASL_FAIL || !mutt_strncmp(inbuf, "+OK", 3) || !mutt_strncmp(inbuf, "-ERR", 4))
- break;
-
- /* send out response, or line break if none needed */
diff --git a/debian/patches/upstream/gpgme-set-sender.patch b/debian/patches/upstream/gpgme-set-sender.patch
deleted file mode 100644
index 9212a13..0000000
--- a/debian/patches/upstream/gpgme-set-sender.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-The latest version of gpgpme includes gpgpme_set_sender, therefore mutt will not
-build unless our own version of gpgme_set_sender is renamed.
---- a/crypt-gpgme.c
-+++ b/crypt-gpgme.c
-@@ -4959,7 +4959,7 @@
- return verify_sender (h, GPGME_PROTOCOL_CMS);
- }
-
--void gpgme_set_sender (const char *sender)
-+void crypt_gpgme_set_sender (const char *sender)
- {
- mutt_error ("[setting sender] mailbox: %s\n", sender);
- FREE (¤t_sender);
---- a/crypt-gpgme.h
-+++ b/crypt-gpgme.h
-@@ -53,6 +53,6 @@
-
- int smime_gpgme_verify_sender (HEADER *h);
-
--void gpgme_set_sender (const char *sender);
-+void crypt_gpgme_set_sender (const char *sender);
-
- #endif
---- a/crypt-mod-pgp-gpgme.c
-+++ b/crypt-mod-pgp-gpgme.c
-@@ -104,7 +104,7 @@
-
- static void crypt_mod_pgp_set_sender (const char *sender)
- {
-- gpgme_set_sender (sender);
-+ crypt_gpgme_set_sender (sender);
- }
-
- struct crypt_module_specs crypt_mod_pgp_gpgme =
--
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