<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/386c6760afe19c1f57d1d55c9de736ddf111c46a">https://github.com/macports/macports-ports/commit/386c6760afe19c1f57d1d55c9de736ddf111c46a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 386c676 claws-mail: include patch to fix a bug in replying to email
</span>386c676 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 386c6760afe19c1f57d1d55c9de736ddf111c46a
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Fri Aug 24 16:36:03 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> claws-mail: include patch to fix a bug in replying to email
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The patch and associated machinery for it can be removed as soon
</span><span style='display:block; white-space:pre;color:#404040;'> as the next release is out.
</span>---
mail/claws-mail/Portfile | 17 +++++++++++++++++
.../claws-mail/files/patch-broken-formatstr-fix.diff | 20 ++++++++++++++++++++
2 files changed, 37 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/claws-mail/Portfile b/mail/claws-mail/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71ba26c..e7addb0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/claws-mail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/claws-mail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup active_variants 1.1
</span>
name claws-mail
version 3.17.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories mail news
platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,6 +27,22 @@ checksums rmd160 f024f5130e2d2ff0d34a4b65969559d483601249 \
</span> sha256 1543e9b160e603922059b5514fb19c4914954268f8cd457117957f7413363e85 \
size 4752924
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Temporary fixes for a format string problem fixed in the Claws git repo.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove as soon as we upgrade past 3.17.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-broken-formatstr-fix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We need to remove these because the dependencies in the Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # are broken and we've patched a yacc file, and the thing ships with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pre-build .c and .h.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove this when a new release comes out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete file copy ${worksrcpath}/src/quote_fmt_parse.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete file copy ${worksrcpath}/src/quote_fmt_parse.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Bison is only needed for the temporary fix. Normally, the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# generated .[ch] files are shipped with the relase, but we patched a .y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:bison
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_xz yes
use_autoreconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/claws-mail/files/patch-broken-formatstr-fix.diff b/mail/claws-mail/files/patch-broken-formatstr-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3ade39a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/claws-mail/files/patch-broken-formatstr-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit e0a319b4b672c592f9824509d948914a4d167a1e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: wwp <subscript@free.fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat Aug 18 09:34:09 2018 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Fix for Bug 4072: Crash when clicking 'reply' or 'reply with quote'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Wrong '%\n' format causes a crash in g_strdup_printf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 03c872a67..92e300e03 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/quote_fmt_parse.y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/quote_fmt_parse.y
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -491,7 +491,7 @@ static void quote_fmt_show_msg(MsgInfo *msginfo, const gchar *body,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (fgets(buf, sizeof(buf), fp) != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcrchomp(buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!signature && account_signatures_matchlist_nchar_found(buf, "%\n"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!signature && account_signatures_matchlist_nchar_found(buf, "%s\n"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (quoted && quote_str)
</span></pre><pre style='margin:0'>
</pre>