<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/0eb7e9581c54b99f9436af004d0f61561c686ef5">https://github.com/macports/macports-ports/commit/0eb7e9581c54b99f9436af004d0f61561c686ef5</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 0eb7e9581c5 zeek: use bundled version of caf
</span>0eb7e9581c5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0eb7e9581c54b99f9436af004d0f61561c686ef5
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri Aug 14 15:50:35 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> zeek: use bundled version of caf
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> remove unneeded Catalina patch
</span>---
net/zeek/Portfile | 12 ++----------
.../patch-auxil-broker-src-detail-sqlite_backend.cc.diff | 14 --------------
2 files changed, 2 insertions(+), 24 deletions(-)
<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 eaca4439e72..f54f3859f83 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;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.1
</span>
name zeek
version 3.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net security
platforms darwin
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,6 @@ depends_build-append \
</span>
# use the system-provided flex
depends_lib-append port:bison \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:caf \
</span> port:curl \
port:libmagic \
port:libpcap \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,8 +59,7 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -DCAF_ROOT_DIR=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
</span>
variant python37 conflicts python38 description {Build using Python 3.7} {
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,12 +82,6 @@ if {![variant_isset python37] && ![variant_isset python38]} {
</span> +python38
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix Catalina build issue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 19 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-auxil-broker-src-detail-sqlite_backend.cc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
xinstall -d ${destroot}${prefix}/share/examples/${name}
copy ${worksrcpath}/auxil/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-auxil-broker-src-detail-sqlite_backend.cc.diff b/net/zeek/files/patch-auxil-broker-src-detail-sqlite_backend.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8df39bc5be3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zeek/files/patch-auxil-broker-src-detail-sqlite_backend.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- auxil/broker/src/detail/sqlite_backend.cc.orig 2020-02-25 14:27:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ auxil/broker/src/detail/sqlite_backend.cc 2020-02-28 14:27:45.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,9 +66,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Initialize database. SQLite has a bit of custom memory management
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // that seems to cause some LSANs to lose track and report a leak.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BROKER_LSAN_DISABLE();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //BROKER_LSAN_DISABLE();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto result = sqlite3_open(path.c_str(), &db);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BROKER_LSAN_ENABLE();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //BROKER_LSAN_ENABLE();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (result != SQLITE_OK) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sqlite3_close(db);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BROKER_ERROR("failed to open database:" << path);
</span></pre><pre style='margin:0'>
</pre>