[mutt] 04/06: + removed the following patches because they were either applied upstream or not relevant: * upstream/693993-manpage-corrections.patch * upstream/749483-conststrings.patch * upstream/fix_doc_builddir.patch * upstream/fix_spelling_error.patch * upstream/865822-restore-defaults.patch * neomutt-devel/866366-index_format-corruption.patch
Antonio Radici
antonio at moszumanska.debian.org
Mon Nov 20 22:45:18 UTC 2017
This is an automated email from the git hooks/post-receive script.
antonio pushed a commit to annotated tag debian/1.9.1-1
in repository mutt.
commit 53ac0075f58c25916261435473292c12ab3e4c2c
Author: Antonio Radici <antonio at debian.org>
Date: Mon Nov 20 21:59:11 2017 +0000
+ removed the following patches because they were either applied upstream or not relevant: * upstream/693993-manpage-corrections.patch * upstream/749483-conststrings.patch * upstream/fix_doc_builddir.patch * upstream/fix_spelling_error.patch * upstream/865822-restore-defaults.patch * neomutt-devel/866366-index_format-corruption.patch
+ removed the following patches because they were either applied upstream
or not relevant:
* upstream/693993-manpage-corrections.patch
* upstream/749483-conststrings.patch
* upstream/fix_doc_builddir.patch
* upstream/fix_spelling_error.patch
* upstream/865822-restore-defaults.patch
* neomutt-devel/866366-index_format-corruption.patch
---
debian/changelog | 11 +-
.../patches/debian-specific/467432-write_bcc.patch | 141 ++++++++++-----------
.../566076-build_doc_adjustments.patch | 25 ++--
.../828751-pinentry-gpg2-support.patch | 2 +-
.../Md.etc_mailname_gethostbyname.patch | 67 +++++-----
debian/patches/debian-specific/Muttrc.patch | 2 +-
.../correct_docdir_in_man_page.patch | 2 +-
.../debian-specific/document_debian_defaults.patch | 32 ++---
.../debian-specific/use_usr_bin_editor.patch | 10 +-
debian/patches/misc/gpg.rc-paths.patch | 12 +-
debian/patches/series | 5 -
debian/patches/upstream/383769-score-match.patch | 4 +-
debian/patches/upstream/528233-readonly-open.patch | 17 +--
13 files changed, 155 insertions(+), 175 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 39dfdd8..be216e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,19 @@
-mutt (1.9.1-1) unstable; urgency=medium
+mutt (1.9.1-1) UNRELEASED; urgency=medium
* New upstream release
+ switched to the official mutt.org source code (Closes: 870635)
* debian/patches:
+ upstream/865822-restore-defaults.patch updated so that the debug file is
correctly named and initialized.
+ + removed the following patches because they were either applied upstream
+ or not relevant:
+ * upstream/693993-manpage-corrections.patch
+ * upstream/749483-conststrings.patch
+ * upstream/fix_doc_builddir.patch
+ * upstream/fix_spelling_error.patch
+ * upstream/865822-restore-defaults.patch
+ * neomutt-devel/866366-index_format-corruption.patch
+ + all remaining patches refreshed.
* debian/control:
+ ensure correct attribution to the mutt source code for the sidebar and
the compressed folder features.
diff --git a/debian/patches/debian-specific/467432-write_bcc.patch b/debian/patches/debian-specific/467432-write_bcc.patch
index ba27f5f..e4121c3 100644
--- a/debian/patches/debian-specific/467432-write_bcc.patch
+++ b/debian/patches/debian-specific/467432-write_bcc.patch
@@ -30,7 +30,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
--- a/init.h
+++ b/init.h
-@@ -355,9 +355,6 @@
+@@ -330,9 +330,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.
@@ -40,7 +40,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
*/
{ "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 },
/*
-@@ -795,7 +792,7 @@
+@@ -746,7 +743,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
@@ -49,7 +49,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
** .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 @@
+@@ -1153,9 +1150,6 @@
** which case a detected one is not used.
** .pp
** Also see $$use_domain and $$hidden_host.
@@ -58,8 +58,8 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
- ** from /etc/mailname when Mutt starts.
*/
#ifdef HAVE_LIBIDN
- { "idn_decode", DT_BOOL, R_MENU, OPTIDNDECODE, 1 },
-@@ -1916,9 +1910,6 @@
+ { "idn_decode", DT_BOOL, R_MENU, OPTIDNDECODE, 1},
+@@ -1773,9 +1767,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.
@@ -68,29 +68,29 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
- ** ``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.
+ { "move", DT_QUAD, R_NONE, OPT_MOVE, MUTT_NO },
+@@ -3252,10 +3243,6 @@
+ ** This is a format string, see the $$smime_decrypt_command command for
+ ** possible \fCprintf(3)\fP-like sequences.
** (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 @@
+ #ifdef USE_SMTP
+ # ifdef USE_SASL
+@@ -3413,9 +3400,6 @@
** .ts
- ** set sort=reverse-date-sent
+ ** set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
** .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 @@
+ #endif /* USE_SSL_GNUTLS */
+ { "ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, 0 },
+@@ -3926,9 +3910,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.
@@ -98,83 +98,82 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
- ** \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 },
/*
--- 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);
+@@ -378,7 +378,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 *);
+--- a/sendlib.c
++++ b/sendlib.c
+@@ -1969,7 +1969,7 @@
+
+
+ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach,
+- int mode, int privacy)
++ int mode, int privacy, int should_write_bcc)
+ {
+ char buffer[LONG_STRING];
+ char *p, *q;
+@@ -2012,7 +2012,7 @@
+ else if (mode > 0)
+ fputs ("Cc: \n", fp);
+
+- if (env->bcc)
++ if (env->bcc && should_write_bcc)
+ {
+ if(mode != 0 || option(OPTWRITEBCC))
+ {
+@@ -2804,7 +2804,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);
+
+ /* (postponment) if this was a reply of some sort, <msgid> contians the
+ * Message-ID: of message replied to. Save it using a special X-Mutt-
--- a/headers.c
+++ b/headers.c
-@@ -60,7 +60,7 @@
+@@ -53,7 +53,7 @@
}
-
- mutt_env_to_local(msg->env);
-- mutt_write_rfc822_header(ofp, msg->env, NULL, 1, 0);
+
+ 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. */
+ fputc ('\n', ofp); /* tie off the header. */
/* now copy the body of the message. */
--- a/main.c
+++ b/main.c
-@@ -800,7 +800,7 @@
- mutt_env_to_intl(msg->env, NULL, NULL);
+@@ -1162,7 +1162,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);
+ 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);
+ if (option (OPTRESUMEEDITEDDRAFTFILES))
+ fprintf (fout, "X-Mutt-Resume-Draft: 1\n");
+ fputc ('\n', fout);
--- a/send.c
+++ b/send.c
-@@ -1097,10 +1097,10 @@
- unset_option(OPTWRITEBCC);
+@@ -994,10 +994,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);
+ 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);
+ 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
-@@ -1939,7 +1939,8 @@
-
-
- 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 = NULL, *q = NULL;
-@@ -1988,7 +1989,7 @@
- #endif
- fputs("Cc: \n", fp);
-
-- if (env->bcc)
-+ if (env->bcc && should_write_bcc)
- {
- if (mode != 0 || option(OPTWRITEBCC))
- {
-@@ -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);
-
- /* (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/566076-build_doc_adjustments.patch b/debian/patches/debian-specific/566076-build_doc_adjustments.patch
index 1d30921..337a984 100644
--- a/debian/patches/debian-specific/566076-build_doc_adjustments.patch
+++ b/debian/patches/debian-specific/566076-build_doc_adjustments.patch
@@ -9,28 +9,23 @@ Use w3m to build the txt manual.
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
-@@ -106,21 +106,19 @@
+@@ -109,9 +109,7 @@
check:
manual.txt: manual.html
-- -LC_ALL=C w3m -dump -O UTF8 manual.html > $@ || \
-- LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
+- -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
+- LC_ALL=C w3m -dump manual.html > $@ || \
- LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
+ LC_ALL=C w3m -dump -O UTF-8 manual.html > $@
- Muttrc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head
- sed -e 's,[@]docdir[@],$(docdir),' $(srcdir)/Muttrc.head > Muttrc
- $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -c >> Muttrc
+ Muttrc: stamp-doc-rc
- manual.html: manual.xml $(srcdir)/html.xsl $(srcdir)/mutt.xsl $(srcdir)/mutt.css
+@@ -123,7 +121,7 @@
+ touch stamp-doc-rc
+
+ manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
- -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
+ xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
- $(CHUNKED_DOCFILES): index.html
-
- index.html: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl manual.xml $(srcdir)/mutt.css
-- -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml > /dev/null 2>&1
-+ xsltproc --nonet $(srcdir)/chunk.xsl manual.xml > /dev/null 2>&1
-
- validate: manual.xml
- xmllint --noout --noblanks --postvalid $<
+ stamp-doc-chunked: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
+ -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
diff --git a/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch b/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch
index 1f9bf1f..37ca042 100644
--- a/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch
+++ b/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch
@@ -3,7 +3,7 @@ This patch enables gpgme by default on the Debian version of mutt starting from
--- a/contrib/gpg.rc
+++ b/contrib/gpg.rc
-@@ -28,30 +28,40 @@
+@@ -30,30 +30,40 @@
# in some localiaztion environments, generates 8bit data in that header, thereby
# breaking PGP/MIME.
diff --git a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.patch b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.patch
index d3c62c2..cb25449 100644
--- a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.patch
+++ b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.patch
@@ -10,9 +10,9 @@ used, rather than calling gethostbyname() on the actual hostname.
--- a/init.c
+++ b/init.c
-@@ -85,6 +85,32 @@
-
- static struct MyVar *MyVars;
+@@ -134,6 +134,33 @@
+ return (-1);
+ }
+static int getmailname(char *s, size_t l)
+{
@@ -40,35 +40,38 @@ used, rather than calling gethostbyname() on the actual hostname.
+}
+
+
- static void myvar_set(const char *var, const char *val)
++
+ int mutt_extract_token (BUFFER *dest, BUFFER *tok, int flags)
{
- struct MyVar **cur = NULL;
-@@ -4017,28 +4043,40 @@
- else
- Hostname = safe_strdup(utsname.nodename);
+ char ch;
+@@ -3399,22 +3426,43 @@
+ }
--/* now get FQDN. Use configured domain first, DNS next, then uname */
+ /* some systems report the FQDN instead of just the hostname */
+ /* If /etc/mailname is available, use that as domain name, otherwise the
-+ * configured domain, DNS or numae (in order) */
++ * configured domain, DNS or uname (in order) */
+ if (getmailname(buffer, sizeof(buffer)) != -1)
+ {
+ Fqdn = safe_strdup(buffer);
+ }
- #ifdef DOMAIN
-- /* we have a compile-time domain name, use that for Fqdn */
-- Fqdn = safe_malloc(mutt_strlen(DOMAIN) + mutt_strlen(Hostname) + 2);
-- sprintf(Fqdn, "%s.%s", NONULL(Hostname), DOMAIN);
-+ if (!Fqdn)
-+ {
-+ Fqdn = safe_malloc(mutt_strlen(DOMAIN) + mutt_strlen(Hostname) + 2);
-+ sprintf(Fqdn, "%s.%s", NONULL(Hostname), DOMAIN);
-+ }
- #else
-- if (!(getdnsdomainname(buffer, sizeof(buffer))))
-+ if (!Fqdn)
+ if ((p = strchr (utsname.nodename, '.')))
+ Hostname = mutt_substrdup (utsname.nodename, p);
+ else
+ Hostname = safe_strdup (utsname.nodename);
+-
+ /* now get FQDN. Use configured domain first, DNS next, then uname */
+- if (domain)
++ if (domain && !Fqdn)
+ {
+ /* we have a compile-time domain name, use that for Fqdn */
+ Fqdn = safe_malloc (mutt_strlen (domain) + mutt_strlen (Hostname) + 2);
+ sprintf (Fqdn, "%s.%s", NONULL(Hostname), domain); /* __SPRINTF_CHECKED__ */
+ }
+- else if (!(getdnsdomainname (buffer, sizeof buffer)))
++ else if (!Fqdn)
{
-- Fqdn = safe_malloc(mutt_strlen(buffer) + mutt_strlen(Hostname) + 2);
-- sprintf(Fqdn, "%s.%s", NONULL(Hostname), buffer);
+- Fqdn = safe_malloc (mutt_strlen (buffer) + mutt_strlen (Hostname) + 2);
+- sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer); /* __SPRINTF_CHECKED__ */
+ if (!getdnsdomainname(buffer, sizeof(buffer)))
+ {
+ Fqdn = safe_malloc(mutt_strlen(buffer) + mutt_strlen(Hostname) + 2);
@@ -88,17 +91,5 @@ used, rather than calling gethostbyname() on the actual hostname.
+ Fqdn = safe_strdup(utsname.nodename);
+ }
}
-- else
-- /*
-- * DNS failed, use the nodename. Whether or not the nodename had a '.' in
-- * it, we can use the nodename as the FQDN. On hosts where DNS is not
-- * being used, e.g. small network that relies on hosts files, a short host
-- * name is all that is required for SMTP to work correctly. It could be
-- * wrong, but we've done the best we can, at this point the onus is on the
-- * user to provide the correct hostname if the nodename won't work in their
-- * network.
-- */
-- Fqdn = safe_strdup(utsname.nodename);
- #endif
-
- #ifdef USE_NNTP
+ else
+ /*
diff --git a/debian/patches/debian-specific/Muttrc.patch b/debian/patches/debian-specific/Muttrc.patch
index 7ff4e59..1cda5d6 100644
--- a/debian/patches/debian-specific/Muttrc.patch
+++ b/debian/patches/debian-specific/Muttrc.patch
@@ -57,7 +57,7 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
@@ -35,7 +63,7 @@
- # append-hook '\.gz$' "gzip --stdout '%t' >> '%f'"
+ # append-hook '\.gz$' "gzip -c '%t' >> '%f'"
# If Mutt is unable to determine your site's domain name correctly, you can
-# set the default here.
diff --git a/debian/patches/debian-specific/correct_docdir_in_man_page.patch b/debian/patches/debian-specific/correct_docdir_in_man_page.patch
index 3408881..9223a4e 100644
--- a/debian/patches/debian-specific/correct_docdir_in_man_page.patch
+++ b/debian/patches/debian-specific/correct_docdir_in_man_page.patch
@@ -10,7 +10,7 @@ and gzipped manual.
--- a/doc/mutt.man
+++ b/doc/mutt.man
-@@ -197,7 +197,7 @@
+@@ -191,7 +191,7 @@
System mapping between MIME types and file extensions.
.IP "@bindir@/mutt_dotlock"
The privileged dotlocking program.
diff --git a/debian/patches/debian-specific/document_debian_defaults.patch b/debian/patches/debian-specific/document_debian_defaults.patch
index bc87529..0279e34 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
-@@ -355,6 +355,9 @@
+@@ -330,6 +330,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 },
/*
-@@ -1257,6 +1260,9 @@
+@@ -1150,6 +1153,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_MENU, OPTIDNDECODE, 1 },
-@@ -1910,6 +1916,9 @@
+ { "idn_decode", DT_BOOL, R_MENU, OPTIDNDECODE, 1},
+@@ -1767,6 +1773,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,29 +39,29 @@ from the default only on Debian systems.
+ ** ``mixmaster-filter'' in /etc/Muttrc.
*/
#endif
- { "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.
+ { "move", DT_QUAD, R_NONE, OPT_MOVE, MUTT_NO },
+@@ -3243,6 +3252,10 @@
+ ** This is a format string, see the $$smime_decrypt_command command for
+ ** possible \fCprintf(3)\fP-like sequences.
** (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 },
- /*
-@@ -3686,6 +3699,9 @@
+ #ifdef USE_SMTP
+ # ifdef USE_SASL
+@@ -3400,6 +3413,9 @@
** .ts
- ** set sort=reverse-date-sent
+ ** set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
** .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 },
- /*
-@@ -4329,6 +4345,9 @@
+ #endif /* USE_SSL_GNUTLS */
+ { "ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, 0 },
+@@ -3910,6 +3926,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 fe6d0c3..77fee98 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
-@@ -4130,7 +4130,7 @@
+@@ -3485,7 +3485,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
-@@ -792,7 +792,7 @@
+@@ -743,7 +743,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/misc/gpg.rc-paths.patch b/debian/patches/misc/gpg.rc-paths.patch
index be74c3f..c5fb5bb 100644
--- a/debian/patches/misc/gpg.rc-paths.patch
+++ b/debian/patches/misc/gpg.rc-paths.patch
@@ -9,17 +9,7 @@ Use the correct path of pgpewrap.
--- a/contrib/gpg.rc
+++ b/contrib/gpg.rc
-@@ -2,9 +2,6 @@
- #
- # Command formats for gpg.
- #
--# This version uses gpg-2comp from
--# http://70t.de/download/gpg-2comp.tar.gz
--#
- # %p The empty string when no passphrase is needed,
- # the string "PGPPASSFD=0" if one is needed.
- #
-@@ -48,20 +45,16 @@
+@@ -50,20 +50,16 @@
set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0 --pinentry-mode=loopback? --no-verbose --quiet --batch --output - %f"
# create a pgp/mime signed attachment
diff --git a/debian/patches/series b/debian/patches/series
index e74e2db..aedfc1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,9 +10,4 @@ misc/gpg.rc-paths.patch
misc/smime.rc.patch
upstream/528233-readonly-open.patch
upstream/383769-score-match.patch
-upstream/693993-manpage-corrections.patch
upstream/749483-conststrings.patch
-upstream/fix_doc_builddir.patch
-upstream/fix_spelling_error.patch
-upstream/865822-restore-defaults.patch
-neomutt-devel/866366-index_format-corruption.patch
diff --git a/debian/patches/upstream/383769-score-match.patch b/debian/patches/upstream/383769-score-match.patch
index 3edf50e..da69c52 100644
--- a/debian/patches/upstream/383769-score-match.patch
+++ b/debian/patches/upstream/383769-score-match.patch
@@ -10,11 +10,11 @@ Better matching for ~f, same as mutt-ng did.
--- a/score.c
+++ b/score.c
-@@ -142,7 +142,7 @@
+@@ -136,7 +136,7 @@
hdr->score = 0; /* in case of re-scoring */
for (tmp = Score; tmp; tmp = tmp->next)
{
-- if (mutt_pattern_exec(tmp->pat, 0, NULL, hdr, &cache) > 0)
+- if (mutt_pattern_exec (tmp->pat, 0, NULL, hdr, &cache) > 0)
+ if (mutt_pattern_exec(tmp->pat, MUTT_MATCH_FULL_ADDRESS, NULL, hdr, &cache) > 0)
{
if (tmp->exact || tmp->val == 9999 || tmp->val == -9999)
diff --git a/debian/patches/upstream/528233-readonly-open.patch b/debian/patches/upstream/528233-readonly-open.patch
index 31fa009..b45c3f1 100644
--- a/debian/patches/upstream/528233-readonly-open.patch
+++ b/debian/patches/upstream/528233-readonly-open.patch
@@ -13,22 +13,23 @@ Debian bugs: #528233, updated in #572203
--- a/attach.c
+++ b/attach.c
-@@ -414,6 +414,7 @@
- FREE(&fname);
- if (mutt_save_attachment(fp, a, tempfile, 0, NULL) == -1)
- goto return_error;
+@@ -415,6 +415,7 @@
+ FREE (&fname);
+ if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
+ goto return_error;
+ chmod (tempfile, 0400);
}
- use_pipe = rfc1524_expand_command(a, tempfile, type, command, sizeof(command));
-@@ -585,7 +586,11 @@
+ use_pipe = rfc1524_expand_command (a, tempfile, type,
+@@ -586,7 +587,11 @@
if (entry)
- rfc1524_free_entry(&entry);
+ rfc1524_free_entry (&entry);
if (fp && tempfile[0])
+- mutt_unlink (tempfile);
+ {
+ /* Restore write permission so mutt_unlink can open the file for writing */
+ chmod(tempfile, 0600);
- mutt_unlink(tempfile);
++ mutt_unlink(tempfile);
+ }
else if (unlink_tempfile)
unlink(tempfile);
--
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