[mutt] 05/17: continuing the patch refresh
Antonio Radici
antonio at moszumanska.debian.org
Sat Jun 24 14:01:46 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 437c271b372b912758fa9602a136b34350451e40
Author: Antonio Radici <antonio at debian.org>
Date: Sat Jun 24 10:14:28 2017 +0100
continuing the patch refresh
---
debian/changelog | 1 +
.../566076-build_doc_adjustments.patch | 27 +++++++++++-----------
.../828751-pinentry-gpg2-support.patch | 2 +-
debian/patches/misc/gpg.rc-paths.patch | 10 ++++----
debian/patches/upstream/528233-readonly-open.patch | 16 ++++++-------
5 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7eafb77..7a9a1f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mutt (1.8.3+20170609-1) UNRELEASED; urgency=medium
+ neomutt patch removed.
+ debian-specific/Md.etc_mailname_gethostbyname.patch slightly rewritten.
+ debian-specific/467432-write_bcc.patch refreshed.
+ + general patch refresh where applicable.
-- Antonio Radici <antonio at debian.org> Sat, 24 Jun 2017 09:32:46 +0100
diff --git a/debian/patches/debian-specific/566076-build_doc_adjustments.patch b/debian/patches/debian-specific/566076-build_doc_adjustments.patch
index e112c75..1d30921 100644
--- a/debian/patches/debian-specific/566076-build_doc_adjustments.patch
+++ b/debian/patches/debian-specific/566076-build_doc_adjustments.patch
@@ -9,27 +9,28 @@ Use w3m to build the txt manual.
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
-@@ -127,9 +127,7 @@
+@@ -106,21 +106,19 @@
check:
manual.txt: 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 w3m -dump -O UTF8 manual.html > $@ || \
+- LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii 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: stamp-doc-rc
+ 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
-@@ -141,10 +139,10 @@
- touch stamp-doc-rc
-
- manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
+ manual.html: manual.xml $(srcdir)/html.xsl $(srcdir)/mutt.xsl $(srcdir)/mutt.css
- -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
+ xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
- stamp-doc-chunked: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
-- -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
-+ xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
- touch stamp-doc-chunked
+ $(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
- $(CHUNKED_DOCFILES): stamp-doc-chunked
+ validate: manual.xml
+ xmllint --noout --noblanks --postvalid $<
diff --git a/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch b/debian/patches/debian-specific/828751-pinentry-gpg2-support.patch
index 37ca042..1f9bf1f 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
-@@ -30,30 +30,40 @@
+@@ -28,30 +28,40 @@
# in some localiaztion environments, generates 8bit data in that header, thereby
# breaking PGP/MIME.
diff --git a/debian/patches/misc/gpg.rc-paths.patch b/debian/patches/misc/gpg.rc-paths.patch
index e9e7325..be74c3f 100644
--- a/debian/patches/misc/gpg.rc-paths.patch
+++ b/debian/patches/misc/gpg.rc-paths.patch
@@ -12,14 +12,14 @@ Use the correct path of pgpewrap.
@@ -2,9 +2,6 @@
#
# Command formats for gpg.
- #
--# This version uses gpg-2comp from
+ #
+-# This version uses gpg-2comp from
-# http://70t.de/download/gpg-2comp.tar.gz
-#
- # $Id$
- #
# %p The empty string when no passphrase is needed,
-@@ -50,20 +47,16 @@
+ # the string "PGPPASSFD=0" if one is needed.
+ #
+@@ -48,20 +45,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/upstream/528233-readonly-open.patch b/debian/patches/upstream/528233-readonly-open.patch
index b723dc1..31fa009 100644
--- a/debian/patches/upstream/528233-readonly-open.patch
+++ b/debian/patches/upstream/528233-readonly-open.patch
@@ -13,22 +13,22 @@ Debian bugs: #528233, updated in #572203
--- a/attach.c
+++ b/attach.c
-@@ -413,6 +413,7 @@
- FREE (&fname);
- if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
- goto return_error;
+@@ -414,6 +414,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,
-@@ -587,7 +588,11 @@
+ use_pipe = rfc1524_expand_command(a, tempfile, type, command, sizeof(command));
+@@ -585,7 +586,11 @@
if (entry)
- rfc1524_free_entry (&entry);
+ rfc1524_free_entry(&entry);
if (fp && tempfile[0])
+ {
+ /* 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