[mutt] 04/17: a couple of patches refreshed in debian-specific, still some work to go
Antonio Radici
antonio at moszumanska.debian.org
Sat Jun 24 14:01:45 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 4ee7bd6b85c81a9a9a81aab171fedc6597c2b35f
Author: Antonio Radici <antonio at debian.org>
Date: Sat Jun 24 10:02:19 2017 +0100
a couple of patches refreshed in debian-specific, still some work to go
---
debian/changelog | 1 +
.../patches/debian-specific/467432-write_bcc.patch | 169 ++++++++++++++-------
.../debian-specific/document_debian_defaults.patch | 26 ++--
.../debian-specific/use_usr_bin_editor.patch | 10 +-
debian/patches/series | 1 -
5 files changed, 130 insertions(+), 77 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2061b46..7eafb77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mutt (1.8.3+20170609-1) UNRELEASED; urgency=medium
* debian/patches:
+ neomutt patch removed.
+ debian-specific/Md.etc_mailname_gethostbyname.patch slightly rewritten.
+ + debian-specific/467432-write_bcc.patch refreshed.
-- Antonio Radici <antonio at debian.org> Sat, 24 Jun 2017 09:32:46 +0100
diff --git a/debian/patches/debian-specific/467432-write_bcc.patch b/debian/patches/debian-specific/467432-write_bcc.patch
index 5d586bf..ba27f5f 100644
--- a/debian/patches/debian-specific/467432-write_bcc.patch
+++ b/debian/patches/debian-specific/467432-write_bcc.patch
@@ -28,100 +28,153 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
sendlib.c | 6 +++---
6 files changed, 11 insertions(+), 16 deletions(-)
---- a/headers.c
-+++ b/headers.c
-@@ -53,7 +53,7 @@
- }
-
- mutt_env_to_local (msg->env);
-- mutt_write_rfc822_header (ofp, msg->env, NULL, 1, 0);
-+ mutt_write_rfc822_header (ofp, msg->env, NULL, 1, 0, 1);
- fputc ('\n', ofp); /* tie off the header. */
-
- /* now copy the body of the message. */
--- a/init.h
+++ b/init.h
-@@ -4277,14 +4277,9 @@
- { "write_bcc", DT_BOOL, R_NONE, OPTWRITEBCC, 1},
+@@ -355,9 +355,6 @@
+ ** .pp
+ ** When this variable is \fIset\fP, mutt will include Delivered-To headers when
+ ** bouncing messages. Postfix users may wish to \fIunset\fP this variable.
+- ** .pp
+- ** \fBNote:\fP On Debian systems, this option is unset by default in
+- ** /etc/Muttrc.
+ */
+ { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 },
/*
+@@ -795,7 +792,7 @@
** .pp
-- ** Controls whether mutt writes out the ``Bcc:'' header when preparing
-- ** messages to be sent. Exim users may wish to unset this. If mutt
-- ** is set to deliver directly via SMTP (see $$smtp_url), this
-- ** option does nothing: mutt will never write out the ``Bcc:'' header
-- ** in this case.
+ ** This variable specifies which editor is used by mutt.
+ ** It defaults to the value of the \fC$$$VISUAL\fP, or \fC$$$EDITOR\fP, environment
+- ** variable, or to the string ``/usr/bin/editor'' if neither of those are set.
++ ** variable, or to the string ``vi'' if neither of those are set.
+ ** .pp
+ ** The \fC$$editor\fP string may contain a \fI%s\fP escape, which will be replaced by the name
+ ** of the file to be edited. If the \fI%s\fP escape does not appear in \fC$$editor\fP, a
+@@ -1260,9 +1257,6 @@
+ ** which case a detected one is not used.
+ ** .pp
+ ** Also see $$use_domain and $$hidden_host.
+- ** .pp
+- ** \fBNote:\fP On Debian systems, the default for this variable is obtained
+- ** from /etc/mailname when Mutt starts.
+ */
+ #ifdef HAVE_LIBIDN
+ { "idn_decode", DT_BOOL, R_MENU, OPTIDNDECODE, 1 },
+@@ -1916,9 +1910,6 @@
+ ** system. It is used with various sets of parameters to gather the
+ ** list of known remailers, and to finally send a message through the
+ ** mixmaster chain.
+- ** .pp
+- ** \fBNote:\fP On Debian systems, this option is set by default to
+- ** ``mixmaster-filter'' in /etc/Muttrc.
+ */
+ #endif
+ { "move", DT_QUAD, R_NONE, OPT_MOVE, MUTT_NO },
+@@ -3411,10 +3402,6 @@
+ ** for a certificate about to be added to the database or not. It is
+ ** \fIset\fP by default.
+ ** (S/MIME only)
+- ** .pp
+- ** \fBNote:\fP On Debian systems, this defaults to the first existing file in
+- ** the following list: ~/.smime/ca-certificates.crt ~/.smime/ca-bundle.crt
+- ** /etc/ssl/certs/ca-certificates.crt.
+ */
+ { "smime_ca_location", DT_PATH, R_NONE, UL &SmimeCALocation, 0 },
+ /*
+@@ -3699,9 +3686,6 @@
+ ** .ts
+ ** set sort=reverse-date-sent
+ ** .te
+- ** .pp
+- ** \fBNote:\fP On Debian systems, this option is set by default to
+- ** ``threads'' in /etc/Muttrc.
+ */
+ { "sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS },
+ /*
+@@ -4345,9 +4329,6 @@
+ ** is set to deliver directly via SMTP (see $$smtp_url), this
+ ** option does nothing: mutt will never write out the ``Bcc:'' header
+ ** in this case.
- ** .pp
- ** \fBNote:\fP On Debian systems, exim4 and postfix strip BCC headers by
- ** default. The above warning applies to exim3 users, see /etc/Muttrc.
-+ ** Controls whether mutt writes out the Bcc header when saving
-+ ** messages to FCC. Bcc headers will never be written to a message
-+ ** when sending it. Note: this behavior is Debian specific.
*/
- { "write_inc", DT_NUM, R_NONE, UL &WriteInc, 10 },
+ { "write_inc", DT_NUM, R_NONE, UL &WriteInc, 10 },
/*
+--- a/protos.h
++++ b/protos.h
+@@ -363,7 +363,7 @@
+ int mutt_write_mime_header(struct Body *a, FILE *f);
+ int mutt_write_one_header(FILE *fp, const char *tag, const char *value,
+ const char *pfx, int wraplen, int flags);
+-int mutt_write_rfc822_header(FILE *fp, struct Envelope *env, struct Body *attach, int mode, int privacy);
++int mutt_write_rfc822_header(FILE *fp, struct Envelope *env, struct Body *attach, int mode, int privacy, int should_write_bcc);
+ void mutt_write_references(struct List *r, FILE *f, int trim);
+ int mutt_yesorno(const char *msg, int def);
+ void mutt_set_header_color(struct Context *ctx, struct Header *curhdr);
+--- a/headers.c
++++ b/headers.c
+@@ -60,7 +60,7 @@
+ }
+
+ mutt_env_to_local(msg->env);
+- mutt_write_rfc822_header(ofp, msg->env, NULL, 1, 0);
++ mutt_write_rfc822_header(ofp, msg->env, NULL, 1, 0, 1);
+ fputc('\n', ofp); /* tie off the header. */
+
+ /* now copy the body of the message. */
--- a/main.c
+++ b/main.c
-@@ -783,7 +783,7 @@
- mutt_env_to_intl (msg->env, NULL, NULL);
+@@ -800,7 +800,7 @@
+ mutt_env_to_intl(msg->env, NULL, NULL);
}
-- mutt_write_rfc822_header (fout, msg->env, msg->content, -1, 0);
-+ mutt_write_rfc822_header (fout, msg->env, msg->content, -1, 0, 1);
- if (option (OPTRESUMEEDITEDDRAFTFILES))
- fprintf (fout, "X-Mutt-Resume-Draft: 1\n");
- fputc ('\n', fout);
---- a/protos.h
-+++ b/protos.h
-@@ -395,7 +395,7 @@
- int mutt_write_mime_body (BODY *, FILE *);
- int mutt_write_mime_header (BODY *, FILE *);
- int mutt_write_one_header (FILE *fp, const char *tag, const char *value, const char *pfx, int wraplen, int flags);
--int mutt_write_rfc822_header (FILE *, ENVELOPE *, BODY *, int, int);
-+int mutt_write_rfc822_header (FILE *, ENVELOPE *, BODY *, int, int, int);
- void mutt_write_references (LIST *, FILE *, int);
- int mutt_yesorno (const char *, int);
- void mutt_set_header_color(CONTEXT *, HEADER *);
+- mutt_write_rfc822_header(fout, msg->env, msg->content, -1, 0);
++ mutt_write_rfc822_header(fout, msg->env, msg->content, -1, 0, 1);
+ if (option(OPTRESUMEEDITEDDRAFTFILES))
+ fprintf(fout, "X-Mutt-Resume-Draft: 1\n");
+ fputc('\n', fout);
--- a/send.c
+++ b/send.c
-@@ -1078,10 +1078,10 @@
- unset_option (OPTWRITEBCC);
+@@ -1097,10 +1097,10 @@
+ unset_option(OPTWRITEBCC);
#endif
#ifdef MIXMASTER
-- mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, msg->chain ? 1 : 0);
-+ mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, msg->chain ? 1 : 0, 0);
+- mutt_write_rfc822_header(tempfp, msg->env, msg->content, 0, msg->chain ? 1 : 0);
++ mutt_write_rfc822_header(tempfp, msg->env, msg->content, 0, msg->chain ? 1 : 0, 0);
#endif
#ifndef MIXMASTER
-- mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, 0);
-+ mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, 0, 0);
+- mutt_write_rfc822_header(tempfp, msg->env, msg->content, 0, 0);
++ mutt_write_rfc822_header(tempfp, msg->env, msg->content, 0, 0, 0);
#endif
#ifdef USE_SMTP
if (old_write_bcc)
--- a/sendlib.c
+++ b/sendlib.c
-@@ -1961,7 +1961,7 @@
+@@ -1939,7 +1939,8 @@
- int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach,
-- int mode, int privacy)
-+ int mode, int privacy, int should_write_bcc)
+ int mutt_write_rfc822_header(FILE *fp, struct Envelope *env,
+- struct Body *attach, int mode, int privacy)
++ struct Body *attach, int mode, int privacy,
++ int should_write_bcc)
{
char buffer[LONG_STRING];
- char *p, *q;
-@@ -2010,7 +2010,7 @@
+ char *p = NULL, *q = NULL;
+@@ -1988,7 +1989,7 @@
#endif
- fputs ("Cc: \n", fp);
+ fputs("Cc: \n", fp);
- if (env->bcc)
+ if (env->bcc && should_write_bcc)
{
- if(mode != 0 || option(OPTWRITEBCC))
+ if (mode != 0 || option(OPTWRITEBCC))
{
-@@ -2890,7 +2890,7 @@
+@@ -2868,7 +2869,7 @@
/* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header()
* post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header()
* */
-- mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, 0);
-+ mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, 0, 1);
+- mutt_write_rfc822_header(msg->fp, hdr->env, hdr->content, post ? -post : 0, 0);
++ mutt_write_rfc822_header(msg->fp, hdr->env, hdr->content, post ? -post : 0, 0, 1);
- /* (postponment) if this was a reply of some sort, <msgid> contains the
+ /* (postponement) if this was a reply of some sort, <msgid> contains the
* Message-ID: of message replied to. Save it using a special X-Mutt-
diff --git a/debian/patches/debian-specific/document_debian_defaults.patch b/debian/patches/debian-specific/document_debian_defaults.patch
index 4e76fa4..bc87529 100644
--- a/debian/patches/debian-specific/document_debian_defaults.patch
+++ b/debian/patches/debian-specific/document_debian_defaults.patch
@@ -10,7 +10,7 @@ from the default only on Debian systems.
--- a/init.h
+++ b/init.h
-@@ -371,6 +371,9 @@
+@@ -355,6 +355,9 @@
** .pp
** When this variable is \fIset\fP, mutt will include Delivered-To headers when
** bouncing messages. Postfix users may wish to \fIunset\fP this variable.
@@ -20,7 +20,7 @@ from the default only on Debian systems.
*/
{ "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 },
/*
-@@ -1236,6 +1239,9 @@
+@@ -1257,6 +1260,9 @@
** which case a detected one is not used.
** .pp
** Also see $$use_domain and $$hidden_host.
@@ -29,8 +29,8 @@ from the default only on Debian systems.
+ ** from /etc/mailname when Mutt starts.
*/
#ifdef HAVE_LIBIDN
- { "idn_decode", DT_BOOL, R_BOTH, OPTIDNDECODE, 1},
-@@ -1883,6 +1889,9 @@
+ { "idn_decode", DT_BOOL, R_MENU, OPTIDNDECODE, 1 },
+@@ -1910,6 +1916,9 @@
** system. It is used with various sets of parameters to gather the
** list of known remailers, and to finally send a message through the
** mixmaster chain.
@@ -39,19 +39,19 @@ from the default only on Debian systems.
+ ** ``mixmaster-filter'' in /etc/Muttrc.
*/
#endif
- { "move", DT_QUAD, R_NONE, OPT_MOVE, MUTT_NO },
-@@ -3370,6 +3379,10 @@
- ** This variable contains the name of either a directory, or a file which
- ** contains trusted certificates for use with OpenSSL.
+ { "move", DT_QUAD, R_NONE, OPT_MOVE, MUTT_NO },
+@@ -3402,6 +3411,10 @@
+ ** for a certificate about to be added to the database or not. It is
+ ** \fIset\fP by default.
** (S/MIME only)
+ ** .pp
+ ** \fBNote:\fP On Debian systems, this defaults to the first existing file in
+ ** the following list: ~/.smime/ca-certificates.crt ~/.smime/ca-bundle.crt
+ ** /etc/ssl/certs/ca-certificates.crt.
*/
- { "smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
+ { "smime_ca_location", DT_PATH, R_NONE, UL &SmimeCALocation, 0 },
/*
-@@ -3641,6 +3654,9 @@
+@@ -3686,6 +3699,9 @@
** .ts
** set sort=reverse-date-sent
** .te
@@ -59,9 +59,9 @@ from the default only on Debian systems.
+ ** \fBNote:\fP On Debian systems, this option is set by default to
+ ** ``threads'' in /etc/Muttrc.
*/
- { "sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS },
+ { "sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS },
/*
-@@ -4266,6 +4282,9 @@
+@@ -4329,6 +4345,9 @@
** is set to deliver directly via SMTP (see $$smtp_url), this
** option does nothing: mutt will never write out the ``Bcc:'' header
** in this case.
@@ -69,5 +69,5 @@ from the default only on Debian systems.
+ ** \fBNote:\fP On Debian systems, exim4 and postfix strip BCC headers by
+ ** default. The above warning applies to exim3 users, see /etc/Muttrc.
*/
- { "write_inc", DT_NUM, R_NONE, UL &WriteInc, 10 },
+ { "write_inc", DT_NUM, R_NONE, UL &WriteInc, 10 },
/*
diff --git a/debian/patches/debian-specific/use_usr_bin_editor.patch b/debian/patches/debian-specific/use_usr_bin_editor.patch
index 38323f9..fe6d0c3 100644
--- a/debian/patches/debian-specific/use_usr_bin_editor.patch
+++ b/debian/patches/debian-specific/use_usr_bin_editor.patch
@@ -12,18 +12,18 @@ to vi.
--- a/init.c
+++ b/init.c
-@@ -3853,7 +3853,7 @@
+@@ -4130,7 +4130,7 @@
{
- p = getenv ("EDITOR");
+ p = getenv("EDITOR");
if (!p)
- p = "vi";
+ p = "/usr/bin/editor";
}
- Editor = safe_strdup (p);
- Visual = safe_strdup (p);
+ Editor = safe_strdup(p);
+ Visual = safe_strdup(p);
--- a/init.h
+++ b/init.h
-@@ -791,7 +791,7 @@
+@@ -792,7 +792,7 @@
** .pp
** This variable specifies which editor is used by mutt.
** It defaults to the value of the \fC$$$VISUAL\fP, or \fC$$$EDITOR\fP, environment
diff --git a/debian/patches/series b/debian/patches/series
index 51a6ea0..0e1cda1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ debian-specific/Muttrc.patch
debian-specific/Md.etc_mailname_gethostbyname.patch
debian-specific/use_usr_bin_editor.patch
debian-specific/correct_docdir_in_man_page.patch
-debian-specific/dont_document_not_present_features.patch
debian-specific/document_debian_defaults.patch
debian-specific/467432-write_bcc.patch
debian-specific/566076-build_doc_adjustments.patch
--
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