<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1249a68472c2230713727ea8a7d2920915db7634">https://github.com/macports/macports-ports/commit/1249a68472c2230713727ea8a7d2920915db7634</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 1249a68 notmuch: Fix output file being closed twice
</span>1249a68 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1249a68472c2230713727ea8a7d2920915db7634
</span>Author: Ralph Seichter <github@seichter.de>
AuthorDate: Wed Jul 24 17:22:26 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> notmuch: Fix output file being closed twice
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixed: If the output file for a dump was non-writeable, gzclose_w()
</span><span style='display:block; white-space:pre;color:#404040;'> was called twice on the output file handle, resulting in SIGABRT.
</span><span style='display:block; white-space:pre;color:#404040;'> This fix has been submitted upstream, but not yet been accepted.
</span>---
mail/notmuch/Portfile | 7 +++++--
mail/notmuch/files/notmuch-0.29.1-fix-sigabrt.patch | 20 ++++++++++++++++++++
2 files changed, 25 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/notmuch/Portfile b/mail/notmuch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e4d943..6f0284e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/notmuch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/notmuch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span>
name notmuch
version 0.29.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories mail
platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +42,7 @@ depends_lib port:gmime3 \
</span> port:zlib
patchfiles ${distname}-configure.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distname}-fix-sigabrt.patch \
</span> patch-bindings-python-notmuch-globals.py.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +51,7 @@ post-patch {
</span>
conflicts_build ${name} xcbuild
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 300}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 300} llvm-g++-4.2
</span> compiler.whitelist clang macports-clang-5.0
configure.args --with-docs \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/notmuch/files/notmuch-0.29.1-fix-sigabrt.patch b/mail/notmuch/files/notmuch-0.29.1-fix-sigabrt.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7c8444c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/notmuch/files/notmuch-0.29.1-fix-sigabrt.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- notmuch-dump.c.orig 2019-07-24 17:11:02.899384482 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ notmuch-dump.c 2019-07-24 17:12:08.100487117 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,13 +329,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (gzclose_w (output) != Z_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = gzclose_w (output);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ret) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf (stderr, "Error closing %s: %s\n", name_for_error,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gzerror (output, NULL));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = EXIT_FAILURE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto DONE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ output = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (output_file_name) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = rename (tempname, output_file_name);
</span></pre><pre style='margin:0'>
</pre>