[mutt] 01/04: remove from the repository patch that we are not using anymore
Antonio Radici
antonio at moszumanska.debian.org
Sun Nov 26 12:08:23 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 cced80cdb54eb5cff24b76c92972eff2a838c061
Author: Antonio Radici <antonio at debian.org>
Date: Sun Nov 26 10:44:24 2017 +0000
remove from the repository patch that we are not using anymore
---
.../866366-index_format-corruption.patch | 50 --------------
.../upstream/693993-manpage-corrections.patch | 23 -------
.../patches/upstream/865822-restore-defaults.patch | 77 ----------------------
debian/patches/upstream/fix_doc_builddir.patch | 16 -----
debian/patches/upstream/fix_spelling_error.patch | 13 ----
5 files changed, 179 deletions(-)
diff --git a/debian/patches/neomutt-devel/866366-index_format-corruption.patch b/debian/patches/neomutt-devel/866366-index_format-corruption.patch
deleted file mode 100644
index c453135..0000000
--- a/debian/patches/neomutt-devel/866366-index_format-corruption.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit fd852e5556dc6c9194d5e72acce734321defe2f8
-Author: Richard Russon <rich at flatcap.org>
-Date: Thu Jun 29 13:28:58 2017 +0100
-
- fix the padding expando '%>'
-
- Debian BTS 866366
-
- The non-greedy '%>' has been broken since the introduction of the
- nested-if patch.
-
- The second command should create a line of dots ending in a ']'
-
- set index_format="%?M?collapsed%|.]&expanded?
- set index_format="%?M?collapsed%>.]&expanded?
-
---- a/muttlib.c
-+++ b/muttlib.c
-@@ -1527,6 +1527,15 @@
- lrbalance = 1;
- while ((lrbalance > 0) && (count < sizeof(ifstring)) && *src)
- {
-+ if ((src[0] == '%') && (src[1] == '>'))
-+ {
-+ /* This is a padding expando; copy two chars and carry on */
-+ *cp++ = *src++;
-+ *cp++ = *src++;
-+ count += 2;
-+ continue;
-+ }
-+
- if (*src == '\\')
- {
- src++;
-@@ -1556,6 +1565,15 @@
- count = 0;
- while ((lrbalance > 0) && (count < sizeof(elsestring)) && *src)
- {
-+ if ((src[0] == '%') && (src[1] == '>'))
-+ {
-+ /* This is a padding expando; copy two chars and carry on */
-+ *cp++ = *src++;
-+ *cp++ = *src++;
-+ count += 2;
-+ continue;
-+ }
-+
- if (*src == '\\')
- {
- src++;
diff --git a/debian/patches/upstream/693993-manpage-corrections.patch b/debian/patches/upstream/693993-manpage-corrections.patch
deleted file mode 100644
index ea6b18c..0000000
--- a/debian/patches/upstream/693993-manpage-corrections.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Manual page fixes, patch provided by Regid Ichira <regid23 at nt1.in>.
-
-Debian bug: http://bugs.debian.org/693993
-
---- a/init.h
-+++ b/init.h
-@@ -1471,7 +1471,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
-- ** The value of this option is ignored if $$text_flowed is set, too because
-+ ** The value of this option is ignored if $$text_flowed is set, because
- ** the quoting mechanism is strictly defined for format=flowed.
- ** .pp
- ** This option is a format string, please see the description of
-@@ -1488,6 +1488,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).
-+ ** For an explanation of the %? construct, see the $status_format description.
- ** The following sequences are defined in Mutt:
- ** .dl
- ** .dt %a .dd address of the author
diff --git a/debian/patches/upstream/865822-restore-defaults.patch b/debian/patches/upstream/865822-restore-defaults.patch
deleted file mode 100644
index 15857c5..0000000
--- a/debian/patches/upstream/865822-restore-defaults.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-This patch moves the set_default/restore_default couple after the defaults have
-been set by the init function; this was correctly placed in 1.7.2 and somehow it
-got moved to the wrong place, which means that tmpdir (and many other variable)
-are not correctly set with their new default value determined from environment
-variables (or other logic), so when they get resetted with a 'reset all' call in
-.muttrc, they will never have the correct default to fall back to and they will
-use the wrong one in init.h
-
-This patch fixes:
-http://bugs.debian.org/865822
-http://bugs.debian.org/865842
-
---- a/init.c
-+++ b/init.c
-@@ -2196,6 +2196,9 @@
- */
- static void start_debug(void)
- {
-+ if (!DebugFile)
-+ return;
-+
- char buf[_POSIX_PATH_MAX];
-
- /* rotate the old debug logs */
-@@ -2203,6 +2206,9 @@
- {
- snprintf(debugfilename, sizeof(debugfilename), "%s%d", DebugFile, i);
- snprintf(buf, sizeof(buf), "%s%d", DebugFile, i + 1);
-+
-+ mutt_expand_path (debugfilename, sizeof (debugfilename));
-+ mutt_expand_path (buf, sizeof (buf));
- rename(debugfilename, buf);
- }
-
-@@ -4007,18 +4013,21 @@
- Shell = safe_strdup((p = getenv("SHELL")) ? p : "/bin/sh");
- }
-
-- /* Set standard defaults */
-- for (int i = 0; MuttVars[i].option; i++)
-- {
-- set_default(&MuttVars[i]);
-- restore_default(&MuttVars[i]);
-- }
--
- #ifdef DEBUG
- /* Start up debugging mode if requested from cmdline */
- if (debuglevel_cmdline > 0)
- {
- debuglevel = debuglevel_cmdline;
-+ if (debugfile_cmdline)
-+ {
-+ DebugFile = safe_strdup(debugfile_cmdline);
-+ }
-+ else
-+ {
-+ int i = mutt_option_index("debug_file");
-+ if ((i >= 0) && (MuttVars[i].init != 0))
-+ DebugFile = safe_strdup((const char*) MuttVars[i].init);
-+ }
- start_debug();
- }
- #endif
-@@ -4164,6 +4173,13 @@
-
- Matches = safe_calloc(Matches_listsize, sizeof(char *));
-
-+ /* Set standard defaults */
-+ for (int i = 0; MuttVars[i].option; i++)
-+ {
-+ set_default(&MuttVars[i]);
-+ restore_default(&MuttVars[i]);
-+ }
-+
- CurrentMenu = MENU_MAIN;
-
-
diff --git a/debian/patches/upstream/fix_doc_builddir.patch b/debian/patches/upstream/fix_doc_builddir.patch
deleted file mode 100644
index a6d820a..0000000
--- a/debian/patches/upstream/fix_doc_builddir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-html files are autogenreated, therefore they should be sourced from the builddir.
-
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -70,9 +70,9 @@
- for f in $(srcdir_DOCFILES) ; do \
- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
- done
-- -$(INSTALL) -m 644 $(srcdir)/manual.txt $(DESTDIR)$(docdir)
-+ -$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
- -for f in $(HTML_DOCFILES) ; do \
-- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
-+ $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
- done
- $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
- -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
diff --git a/debian/patches/upstream/fix_spelling_error.patch b/debian/patches/upstream/fix_spelling_error.patch
deleted file mode 100644
index b8f53a1..0000000
--- a/debian/patches/upstream/fix_spelling_error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-s/certficate/certificate in the muttrc manual
-
---- a/init.h
-+++ b/init.h
-@@ -3571,7 +3571,7 @@
- ** .pp
- ** This is an additional certificate used to encrypt messages when
- ** $$smime_self_encrypt is \fIset\fP. It is also used to specify the
-- ** certficate for $$postpone_encrypt. It should be the hash-value that
-+ ** certificate for $$postpone_encrypt. It should be the hash-value that
- ** OpenSSL generates.
- ** (S/MIME only)
- */
--
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