[mutt] 01/01: all patches refreshed, upstream/gpgme-set-sender.patch removed because it is already upstream.
Antonio Radici
antonio at moszumanska.debian.org
Fri Jan 20 21:52:53 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 e684cb2fdb5eec10b95d11ab67e9e3cee923ece3
Author: Antonio Radici <antonio at debian.org>
Date: Fri Jan 20 21:52:32 2017 +0000
all patches refreshed, upstream/gpgme-set-sender.patch removed because it is already upstream.
---
debian/changelog | 3 +++
debian/patches/debian-specific/467432-write_bcc.patch | 8 ++++----
.../debian-specific/Md.etc_mailname_gethostbyname.patch | 6 +++---
.../patches/debian-specific/document_debian_defaults.patch | 12 ++++++------
debian/patches/debian-specific/use_usr_bin_editor.patch | 4 ++--
debian/patches/neomutt-devel/832971-reset-xlabel.patch | 2 +-
debian/patches/series | 1 -
.../upstream/611410-no-implicit_autoview-for-text-html.patch | 4 ++--
debian/patches/upstream/693993-manpage-corrections.patch | 4 ++--
9 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f2825ae..80246be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ mutt (1.7.2-1) UNRELEASED; urgency=medium
* New upstream Mutt release.
* New upstream NeoMutt release, 2017-01-13.
+ * debian/patches:
+ + all patches refreshed.
+ + upstream/gpgme-set-sender.patch removed because it is already upstream.
-- Antonio Radici <antonio at debian.org> Fri, 20 Jan 2017 21:47:49 +0000
diff --git a/debian/patches/debian-specific/467432-write_bcc.patch b/debian/patches/debian-specific/467432-write_bcc.patch
index 47412a7..a2782c9 100644
--- a/debian/patches/debian-specific/467432-write_bcc.patch
+++ b/debian/patches/debian-specific/467432-write_bcc.patch
@@ -41,7 +41,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
/* now copy the body of the message. */
--- a/init.h
+++ b/init.h
-@@ -4175,14 +4175,9 @@
+@@ -4230,14 +4230,9 @@
{ "write_bcc", DT_BOOL, R_NONE, OPTWRITEBCC, 1},
/*
** .pp
@@ -61,7 +61,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
/*
--- a/main.c
+++ b/main.c
-@@ -763,7 +763,7 @@
+@@ -776,7 +776,7 @@
mutt_env_to_intl (msg->env, NULL, NULL);
}
@@ -72,7 +72,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
fputc ('\n', fout);
--- a/protos.h
+++ b/protos.h
-@@ -399,7 +399,7 @@
+@@ -401,7 +401,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);
@@ -116,7 +116,7 @@ Stefan Völkel <stefan at bc-bd.org> in the second bug.
{
if(mode != 0 || option(OPTWRITEBCC))
{
-@@ -2886,7 +2886,7 @@
+@@ -2889,7 +2889,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()
* */
diff --git a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.patch b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.patch
index b9dbd13..cfed175 100644
--- a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.patch
+++ b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.patch
@@ -18,8 +18,8 @@ used, rather than calling gethostbyname() on the actual hostname.
#include <errno.h>
#include <sys/wait.h>
#include <sys/time.h>
-@@ -3218,6 +3219,31 @@
- return 0;
+@@ -3464,6 +3465,31 @@
+ return NULL;
}
+int getmailname(char *s, size_t l)
@@ -50,7 +50,7 @@ used, rather than calling gethostbyname() on the actual hostname.
void mutt_init (int skip_sys_rc, LIST *commands)
{
struct passwd *pw;
-@@ -3311,8 +3337,10 @@
+@@ -3557,8 +3583,10 @@
else
Hostname = safe_strdup (utsname.nodename);
diff --git a/debian/patches/debian-specific/document_debian_defaults.patch b/debian/patches/debian-specific/document_debian_defaults.patch
index 4966752..e65e991 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
-@@ -364,6 +364,9 @@
+@@ -365,6 +365,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 },
/*
-@@ -1199,6 +1202,9 @@
+@@ -1224,6 +1227,9 @@
** which case a detected one is not used.
** .pp
** Also see $$use_domain and $$hidden_host.
@@ -30,7 +30,7 @@ from the default only on Debian systems.
*/
#ifdef HAVE_LIBIDN
{ "idn_decode", DT_BOOL, R_BOTH, OPTIDNDECODE, 1},
-@@ -1838,6 +1844,9 @@
+@@ -1863,6 +1869,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.
@@ -40,7 +40,7 @@ from the default only on Debian systems.
*/
#endif
{ "move", DT_QUAD, R_NONE, OPT_MOVE, MUTT_NO },
-@@ -3298,6 +3307,10 @@
+@@ -3323,6 +3332,10 @@
** This variable contains the name of either a directory, or a file which
** contains trusted certificates for use with OpenSSL.
** (S/MIME only)
@@ -51,7 +51,7 @@ from the default only on Debian systems.
*/
{ "smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
/*
-@@ -3569,6 +3582,9 @@
+@@ -3594,6 +3607,9 @@
** .ts
** set sort=reverse-date-sent
** .te
@@ -61,7 +61,7 @@ from the default only on Debian systems.
*/
{ "sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS },
/*
-@@ -4164,6 +4180,9 @@
+@@ -4219,6 +4235,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.
diff --git a/debian/patches/debian-specific/use_usr_bin_editor.patch b/debian/patches/debian-specific/use_usr_bin_editor.patch
index 546956e..b1255af 100644
--- a/debian/patches/debian-specific/use_usr_bin_editor.patch
+++ b/debian/patches/debian-specific/use_usr_bin_editor.patch
@@ -12,7 +12,7 @@ to vi.
--- a/init.c
+++ b/init.c
-@@ -3415,7 +3415,7 @@
+@@ -3661,7 +3661,7 @@
{
p = getenv ("EDITOR");
if (!p)
@@ -23,7 +23,7 @@ to vi.
Visual = safe_strdup (p);
--- a/init.h
+++ b/init.h
-@@ -784,7 +784,7 @@
+@@ -785,7 +785,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/neomutt-devel/832971-reset-xlabel.patch b/debian/patches/neomutt-devel/832971-reset-xlabel.patch
index e8656dc..2c323fe 100644
--- a/debian/patches/neomutt-devel/832971-reset-xlabel.patch
+++ b/debian/patches/neomutt-devel/832971-reset-xlabel.patch
@@ -5,7 +5,7 @@ Debian bug: http://bugs.debian.org/832971
--- a/copy.c
+++ b/copy.c
-@@ -462,8 +462,7 @@
+@@ -460,8 +460,7 @@
char *tmp = NULL;
int fail = 0;
diff --git a/debian/patches/series b/debian/patches/series
index 94a0da1..2bb7217 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,4 +19,3 @@ upstream/611410-no-implicit_autoview-for-text-html.patch
upstream/693993-manpage-corrections.patch
upstream/749483-conststrings.patch
upstream/644992-ipv6-literal.patch
-upstream/gpgme-set-sender.patch
diff --git a/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch b/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch
index 7469091..c9bc501 100644
--- a/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch
+++ b/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch
@@ -9,7 +9,7 @@ The original Debian bug for this problem is http://bugs.debian.org/611410
--- a/init.h
+++ b/init.h
-@@ -1390,7 +1390,9 @@
+@@ -1415,7 +1415,9 @@
** ``\fCcopiousoutput\fP'' flag set for \fIevery\fP MIME attachment it doesn't have
** an internal viewer defined for. If such an entry is found, mutt will
** use the viewer defined in that entry to convert the body part to text
@@ -22,7 +22,7 @@ The original Debian bug for this problem is http://bugs.debian.org/611410
/*
--- a/muttlib.c
+++ b/muttlib.c
-@@ -701,6 +701,9 @@
+@@ -707,6 +707,9 @@
switch (m->type)
{
case TYPETEXT:
diff --git a/debian/patches/upstream/693993-manpage-corrections.patch b/debian/patches/upstream/693993-manpage-corrections.patch
index 3a1adf0..8fa1cdb 100644
--- a/debian/patches/upstream/693993-manpage-corrections.patch
+++ b/debian/patches/upstream/693993-manpage-corrections.patch
@@ -4,7 +4,7 @@ Debian bug: http://bugs.debian.org/693993
--- a/init.h
+++ b/init.h
-@@ -1413,7 +1413,7 @@
+@@ -1438,7 +1438,7 @@
** message to which you are replying. You are strongly encouraged not to
** change this value, as it tends to agitate the more fanatical netizens.
** .pp
@@ -13,7 +13,7 @@ Debian bug: http://bugs.debian.org/693993
** the quoting mechanism is strictly defined for format=flowed.
** .pp
** This option is a format string, please see the description of
-@@ -1430,6 +1430,7 @@
+@@ -1455,6 +1455,7 @@
** .pp
** ``Format strings'' are similar to the strings used in the C
** function \fCprintf(3)\fP to format output (see the man page for more details).
--
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