[mutt] 02/02: Refresh all patches
Faidon Liambotis
paravoid at moszumanska.debian.org
Mon Jul 25 08:46:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
paravoid pushed a commit to branch master
in repository mutt.
commit 709036952f6fc83e3705ace5b78ce4a5aa2571ef
Author: Faidon Liambotis <paravoid at debian.org>
Date: Mon Jul 25 11:11:25 2016 +0300
Refresh all patches
---
.../patches/debian-specific/467432-write_bcc.patch | 6 ++--
.../debian-specific/assumed_charset-compat.patch | 2 +-
.../debian-specific/document_debian_defaults.patch | 14 ++++-----
debian/patches/features/809802_timeout_hook.patch | 6 ++--
debian/patches/features/multiple-fcc.patch | 4 +--
.../patches/neomutt-devel/sensible-browser.patch | 36 ++++++----------------
6 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/debian/patches/debian-specific/467432-write_bcc.patch b/debian/patches/debian-specific/467432-write_bcc.patch
index c292b24..d994c0d 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
-@@ -4070,14 +4070,9 @@ struct option_t MuttVars[] = {
+@@ -4096,14 +4096,9 @@ struct option_t MuttVars[] = {
{ "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
-@@ -765,7 +765,7 @@ int main (int argc, char **argv)
+@@ -761,7 +761,7 @@ int main (int argc, char **argv)
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
-@@ -389,7 +389,7 @@ int mutt_write_fcc (const char *path, HE
+@@ -390,7 +390,7 @@ int mutt_write_fcc (const char *path, HE
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);
diff --git a/debian/patches/debian-specific/assumed_charset-compat.patch b/debian/patches/debian-specific/assumed_charset-compat.patch
index f2b1414..a4bcf39 100644
--- a/debian/patches/debian-specific/assumed_charset-compat.patch
+++ b/debian/patches/debian-specific/assumed_charset-compat.patch
@@ -11,7 +11,7 @@ for compatibility.
--- a/init.h
+++ b/init.h
-@@ -226,6 +226,9 @@ struct option_t MuttVars[] = {
+@@ -228,6 +228,9 @@ struct option_t MuttVars[] = {
** Note: for Japanese users, ``iso-2022-*'' must be put at the head
** of the value as shown above if included.
*/
diff --git a/debian/patches/debian-specific/document_debian_defaults.patch b/debian/patches/debian-specific/document_debian_defaults.patch
index 557ff77..1d2627c 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
-@@ -327,6 +327,9 @@ struct option_t MuttVars[] = {
+@@ -336,6 +336,9 @@ struct option_t MuttVars[] = {
** .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 },
/*
-@@ -1129,6 +1132,9 @@ struct option_t MuttVars[] = {
+@@ -1138,6 +1141,9 @@ struct option_t MuttVars[] = {
** 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},
-@@ -1748,6 +1754,9 @@ struct option_t MuttVars[] = {
+@@ -1773,6 +1779,9 @@ struct option_t MuttVars[] = {
** 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, M_NO },
-@@ -3188,6 +3197,10 @@ struct option_t MuttVars[] = {
+@@ -3208,6 +3217,10 @@ struct option_t MuttVars[] = {
** 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 },
/*
-@@ -3401,6 +3414,9 @@ struct option_t MuttVars[] = {
+@@ -3427,6 +3440,9 @@ struct option_t MuttVars[] = {
** .ts
** set smtp_authenticators="digest-md5:cram-md5"
** .te
@@ -61,7 +61,7 @@ from the default only on Debian systems.
*/
# endif /* USE_SASL */
{ "smtp_pass", DT_STR, R_NONE, UL &SmtpPass, UL 0 },
-@@ -3448,6 +3464,9 @@ struct option_t MuttVars[] = {
+@@ -3474,6 +3490,9 @@ struct option_t MuttVars[] = {
** .pp
** You may optionally use the ``reverse-'' prefix to specify reverse sorting
** order (example: ``\fCset sort=reverse-date-sent\fP'').
@@ -71,7 +71,7 @@ from the default only on Debian systems.
*/
{ "sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS },
/*
-@@ -4053,6 +4072,9 @@ struct option_t MuttVars[] = {
+@@ -4079,6 +4098,9 @@ struct option_t MuttVars[] = {
** 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/features/809802_timeout_hook.patch b/debian/patches/features/809802_timeout_hook.patch
index e31c73c..d9672e6 100644
--- a/debian/patches/features/809802_timeout_hook.patch
+++ b/debian/patches/features/809802_timeout_hook.patch
@@ -13,7 +13,7 @@ Patch provided by gustavo panizzo <gfa at zumbi.com.ar>
--- a/curs_main.c
+++ b/curs_main.c
-@@ -931,8 +931,10 @@ int mutt_index_menu (void)
+@@ -949,8 +949,10 @@ int mutt_index_menu (void)
dprint(4, (debugfile, "mutt_index_menu[%d]: Got op %d\n", __LINE__, op));
@@ -72,7 +72,7 @@ Patch provided by gustavo panizzo <gfa at zumbi.com.ar>
{
--- a/init.h
+++ b/init.h
-@@ -4289,6 +4289,7 @@ const struct command_t Commands[] = {
+@@ -4315,6 +4315,7 @@ const struct command_t Commands[] = {
{ "spam", parse_spam_list, M_SPAM },
{ "nospam", parse_spam_list, M_NOSPAM },
{ "subscribe", parse_subscribe, 0 },
@@ -99,7 +99,7 @@ Patch provided by gustavo panizzo <gfa at zumbi.com.ar>
/* tree characters for linearize_tree and print_enriched_string */
--- a/protos.h
+++ b/protos.h
-@@ -153,6 +153,7 @@ const char *mutt_get_name (ADDRESS *);
+@@ -154,6 +154,7 @@ const char *mutt_get_name (ADDRESS *);
char *mutt_get_parameter (const char *, PARAMETER *);
LIST *mutt_crypt_hook (ADDRESS *);
char *mutt_make_date (char *, size_t);
diff --git a/debian/patches/features/multiple-fcc.patch b/debian/patches/features/multiple-fcc.patch
index c75521c..bdadb5c 100644
--- a/debian/patches/features/multiple-fcc.patch
+++ b/debian/patches/features/multiple-fcc.patch
@@ -17,7 +17,7 @@ Changed by Richard Russon <rich at flatcap.org> to apply on top of neomutt.
--- a/protos.h
+++ b/protos.h
-@@ -384,6 +384,7 @@ int mutt_user_is_recipient (HEADER *);
+@@ -385,6 +385,7 @@ int mutt_user_is_recipient (HEADER *);
void mutt_update_num_postponed (void);
int mutt_wait_filter (pid_t);
int mutt_which_case (const char *);
@@ -27,7 +27,7 @@ Changed by Richard Russon <rich at flatcap.org> to apply on top of neomutt.
int mutt_write_mime_header (BODY *, FILE *);
--- a/send.c
+++ b/send.c
-@@ -1974,7 +1974,7 @@ full_fcc:
+@@ -1975,7 +1975,7 @@ full_fcc:
* message was first postponed.
*/
msg->received = time (NULL);
diff --git a/debian/patches/neomutt-devel/sensible-browser.patch b/debian/patches/neomutt-devel/sensible-browser.patch
index 806e52d..fe2fa4c 100644
--- a/debian/patches/neomutt-devel/sensible-browser.patch
+++ b/debian/patches/neomutt-devel/sensible-browser.patch
@@ -13,18 +13,13 @@ Subject: [PATCH 02/22] patches-20160502/sensible-browser
6 files changed, 164 insertions(+), 8 deletions(-)
create mode 100644 README.sensible-browser
-diff --git a/PATCHES b/PATCHES
-index f77d115..a8827d6 100644
--- a/PATCHES
+++ b/PATCHES
-@@ -15,3 +15,4 @@
- patch-compress-neo-20160612
- patch-keywords-neo-20160612
- patch-nntp-neo-20160612
+@@ -19,3 +19,4 @@ patch-lmdb-neo-git
+ patch-1.5.23.smime-encrypt-self.1
+ patch-new-mail-neo-git
+ patch-smime-encrypt-to-self-neo-git
+patch-sensible-browser-neo-UNKNOWN
-diff --git a/README.sensible-browser b/README.sensible-browser
-new file mode 100644
-index 0000000..adfc076
--- /dev/null
+++ b/README.sensible-browser
@@ -0,0 +1,39 @@
@@ -67,8 +62,6 @@ index 0000000..adfc076
+ * Haakon Riiser <haakon.riiser at fys.uio.no>
+ * Richard Russon <rich at flatcap.org>
+
-diff --git a/browser.c b/browser.c
-index 3ffcd13..10cb663 100644
--- a/browser.c
+++ b/browser.c
@@ -76,6 +76,7 @@ typedef struct folder_t
@@ -79,7 +72,7 @@ index 3ffcd13..10cb663 100644
static char LastDir[_POSIX_PATH_MAX] = "";
static char LastDirBackup[_POSIX_PATH_MAX] = "";
-@@ -862,17 +863,32 @@ static void init_menu (struct browser_state *state, MUTTMENU *menu, char *title,
+@@ -862,17 +863,32 @@ static void init_menu (struct browser_st
}
else
#endif
@@ -118,7 +111,7 @@ index 3ffcd13..10cb663 100644
#endif
snprintf (title, titlelen, _("Directory [%s], File mask: %s"),
path, NONULL(Mask.pattern));
-@@ -1104,8 +1120,6 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, int *num
+@@ -1104,8 +1120,6 @@ void _mutt_select_file (char *f, size_t
#endif
)
{
@@ -127,12 +120,10 @@ index 3ffcd13..10cb663 100644
/* save the old directory */
strfcpy (OldLastDir, LastDir, sizeof (OldLastDir));
-diff --git a/doc/manual.xml.head b/doc/manual.xml.head
-index a2b5ef8..ea3be08 100644
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
-@@ -12534,6 +12534,96 @@ <sect1 id="trash-folder">
- </sect2>
+@@ -13422,6 +13422,96 @@ bind index D purge-message
+ </sect2>
</sect1>
+<sect1 id="sensible-browser">
@@ -228,11 +219,9 @@ index a2b5ef8..ea3be08 100644
</chapter>
<chapter id="security">
-diff --git a/menu.c b/menu.c
-index 554f990..cbf1caf 100644
--- a/menu.c
+++ b/menu.c
-@@ -919,8 +919,17 @@ int menu_redraw (MUTTMENU *menu)
+@@ -931,8 +931,17 @@ int menu_redraw (MUTTMENU *menu)
int mutt_menuLoop (MUTTMENU *menu)
{
@@ -250,7 +239,7 @@ index 554f990..cbf1caf 100644
FOREVER
{
if (option (OPTMENUCALLER))
-@@ -1143,6 +1152,8 @@ int mutt_menuLoop (MUTTMENU *menu)
+@@ -1155,6 +1164,8 @@ int mutt_menuLoop (MUTTMENU *menu)
break;
default:
@@ -259,8 +248,6 @@ index 554f990..cbf1caf 100644
return (i);
}
}
-diff --git a/mutt_menu.h b/mutt_menu.h
-index 3a7ae08..258ff3d 100644
--- a/mutt_menu.h
+++ b/mutt_menu.h
@@ -52,6 +52,7 @@ typedef struct menu_t
@@ -271,6 +258,3 @@ index 3a7ae08..258ff3d 100644
/* Setting dialog != NULL overrides normal menu behavior.
* In dialog mode menubar is hidden and prompt keys are checked before
---
-2.8.2
-
--
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