<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[139422] trunk/dports/net/bro</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/139422">139422</a></dd>
<dt>Author</dt> <dd>khindenburg@macports.org</dd>
<dt>Date</dt> <dd>2015-08-16 17:21:50 -0700 (Sun, 16 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>bro: update to 2.4 #48512</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetbroPortfile">trunk/dports/net/bro/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsnetbrofilespatchCMakeListstxtdiff">trunk/dports/net/bro/files/patch-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsnetbrofilespatchhtonlldiff">trunk/dports/net/bro/files/patch-htonll.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetbroPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/bro/Portfile (139421 => 139422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/bro/Portfile 2015-08-17 00:18:26 UTC (rev 139421)
+++ trunk/dports/net/bro/Portfile 2015-08-17 00:21:50 UTC (rev 139422)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name bro
</span><del>-version 2.2
</del><ins>+version 2.4
</ins><span class="cx"> categories net security
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers gmail.com:tanawts openmaintainer
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx"> master_sites ${homepage}downloads/release/ \
</span><span class="cx"> ${homepage}downloads/archive/
</span><span class="cx">
</span><del>-checksums rmd160 ad1820eae034062c0e1125e4a4ac1e61960ad126 \
- sha256 86909361c2d804681f314604a6ce763be663937b2f045c8d25d810528a633dc9
</del><ins>+checksums rmd160 9b26dd589c626e9318560d923a1305634d463514 \
+ sha256 740c0d0b0bec279c2acef5e1b6b4d0016c57cd02a729f5e2924ae4a922e208b2
</ins><span class="cx">
</span><span class="cx"> depends_build port:cmake \
</span><span class="cx"> port:libgeoip \
</span><span class="lines">@@ -38,9 +38,6 @@
</span><span class="cx"> port:readline \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><del>-patchfiles patch-CMakeLists.txt.diff
-patchfiles-append patch-htonll.diff
-
</del><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="cx"> configure.args --enable-mobile-ipv6
</span><span class="lines">@@ -55,6 +52,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# This doesn't work due to error: error: AF_UNIX path too long
+# To manual test:
+# sudo port build
+# cd ${worksrcpath}/aux/btest/testing
+# sudo make all
+#
+#test.run yes
+#test.target all
+#test.dir ${worksrcpath}/aux/btest/testing
+
</ins><span class="cx"> notes \
</span><span class="cx"> "You'll need to set your BROHOME to ${prefix}/share/bro and your\
</span><span class="cx"> BROPATH to ${prefix}/share/bro/site:${prefix}/share/bro/policy\
</span></span></pre></div>
<a id="trunkdportsnetbrofilespatchCMakeListstxtdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/bro/files/patch-CMakeLists.txt.diff (139421 => 139422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/bro/files/patch-CMakeLists.txt.diff 2015-08-17 00:18:26 UTC (rev 139421)
+++ trunk/dports/net/bro/files/patch-CMakeLists.txt.diff 2015-08-17 00:21:50 UTC (rev 139422)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-Don't check the libmagic version number, since it is determined incorrectly,
-and this will cause the build to fail on Snow Leopard and earlier when the
-otherwise unnecessary file port is not also installed, and upstream does not
-plan to fix this.
-https://bro-tracker.atlassian.net/browse/BIT-1096
---- CMakeLists.txt.orig 2013-11-07 12:27:11.000000000 -0600
-+++ CMakeLists.txt 2013-11-22 20:12:59.000000000 -0600
-@@ -75,10 +75,6 @@
- endif ()
-
- set(libmagic_req 5.04)
--if ( LibMagic_VERSION VERSION_LESS ${libmagic_req} )
-- message(FATAL_ERROR "libmagic of at least version ${libmagic_req} required "
-- "(found ${LibMagic_VERSION})")
--endif ()
-
- include_directories(BEFORE
- ${PCAP_INCLUDE_DIR}
</del></span></pre></div>
<a id="trunkdportsnetbrofilespatchhtonlldiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/bro/files/patch-htonll.diff (139421 => 139422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/bro/files/patch-htonll.diff 2015-08-17 00:18:26 UTC (rev 139421)
+++ trunk/dports/net/bro/files/patch-htonll.diff 2015-08-17 00:21:50 UTC (rev 139422)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-Fix build on Yosemite which already defines htonll and ntohll
-https://bro-tracker.atlassian.net/browse/BIT-1234
-https://github.com/bro/bro/commit/121fcdbb5b922103e28e806896e2cd3e15803478
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -148,6 +148,8 @@ set(brodeps
-
- include(TestBigEndian)
- test_big_endian(WORDS_BIGENDIAN)
-+include(CheckSymbolExists)
-+check_symbol_exists(htonll arpa/inet.h HAVE_BYTEORDER_64)
-
- include(OSSpecific)
- include(CheckTypes)
---- config.h.in.orig
-+++ config.h.in
-@@ -129,6 +129,9 @@
- /* whether words are stored with the most significant byte first */
- #cmakedefine WORDS_BIGENDIAN
-
-+/* whether htonll/ntohll is defined in <arpa/inet.h> */
-+#cmakedefine HAVE_BYTEORDER_64
-+
- /* ultrix can't hack const */
- #cmakedefine NEED_ULTRIX_CONST_HACK
- #ifdef NEED_ULTRIX_CONST_HACK
---- src/net_util.h.orig
-+++ src/net_util.h
-@@ -180,8 +180,11 @@ extern uint32 extract_uint32(const u_char* data);
-
- inline double ntohd(double d) { return d; }
- inline double htond(double d) { return d; }
-+
-+#ifndef HAVE_BYTEORDER_64
- inline uint64 ntohll(uint64 i) { return i; }
- inline uint64 htonll(uint64 i) { return i; }
-+#endif
-
- #else
-
-@@ -207,6 +210,7 @@ inline double ntohd(double d)
-
- inline double htond(double d) { return ntohd(d); }
-
-+#ifndef HAVE_BYTEORDER_64
- inline uint64 ntohll(uint64 i)
- {
- u_char c;
-@@ -224,6 +228,7 @@ inline uint64 ntohll(uint64 i)
- }
-
- inline uint64 htonll(uint64 i) { return ntohll(i); }
-+#endif
-
- #endif
-
</del></span></pre>
</div>
</div>
</body>
</html>