<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6759b2797f39f7d8be40e96eab947e19ec725815">https://github.com/macports/macports-ports/commit/6759b2797f39f7d8be40e96eab947e19ec725815</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 6759b27 zeek 3.1.0: fix Catalina build issue
</span>6759b27 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6759b2797f39f7d8be40e96eab947e19ec725815
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri Feb 28 14:47:08 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> zeek 3.1.0: fix Catalina build issue
</span>---
net/zeek/Portfile | 6 ++++++
.../patch-aux-broker-src-detail-sqlite_backend.cc.diff | 14 ++++++++++++++
2 files changed, 20 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zeek/Portfile b/net/zeek/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a04fe6..07eaeab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zeek/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/zeek/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,6 +70,12 @@ if {![variant_isset python37] && ![variant_isset python38]} {
</span> +python38
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix Catalina build issue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 19 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-aux-broker-src-detail-sqlite_backend.cc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
xinstall -d ${destroot}${prefix}/share/examples/${name}
copy ${worksrcpath}/aux/zeekctl/etc/node.cfg ${destroot}${prefix}/share/examples/${name}/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zeek/files/patch-aux-broker-src-detail-sqlite_backend.cc.diff b/net/zeek/files/patch-aux-broker-src-detail-sqlite_backend.cc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..77982d7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/zeek/files/patch-aux-broker-src-detail-sqlite_backend.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aux/broker/src/detail/sqlite_backend.cc.orig 2020-02-25 14:27:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aux/broker/src/detail/sqlite_backend.cc 2020-02-28 14:27:45.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,9 +66,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Initialize database. SQLite has a bit of custom memory management
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // that seems to cause some LSANs to lose track and report a leak.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BROKER_LSAN_DISABLE();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //BROKER_LSAN_DISABLE();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto result = sqlite3_open(path.c_str(), &db);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BROKER_LSAN_ENABLE();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //BROKER_LSAN_ENABLE();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (result != SQLITE_OK) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sqlite3_close(db);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BROKER_ERROR("failed to open database:" << path);
</span></pre><pre style='margin:0'>
</pre>