[139422] trunk/dports/net/bro

[khindenburg at macports.org]

Revision: 139422
          https://trac.macports.org/changeset/139422
Author:   khindenburg at macports.org
Date:     2015-08-16 17:21:50 -0700 (Sun, 16 Aug 2015)
Log Message:
-----------
bro: update to 2.4 #48512

Modified Paths:
--------------
    trunk/dports/net/bro/Portfile

Removed Paths:
-------------
    trunk/dports/net/bro/files/patch-CMakeLists.txt.diff
    trunk/dports/net/bro/files/patch-htonll.diff

Modified: trunk/dports/net/bro/Portfile
===================================================================
--- 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)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                bro
-version             2.2
+version             2.4
 categories          net security
 platforms           darwin
 maintainers         gmail.com:tanawts openmaintainer
@@ -20,8 +20,8 @@
 master_sites        ${homepage}downloads/release/ \
                     ${homepage}downloads/archive/
 
-checksums           rmd160  ad1820eae034062c0e1125e4a4ac1e61960ad126 \
-                    sha256  86909361c2d804681f314604a6ce763be663937b2f045c8d25d810528a633dc9
+checksums           rmd160  9b26dd589c626e9318560d923a1305634d463514 \
+                    sha256  740c0d0b0bec279c2acef5e1b6b4d0016c57cd02a729f5e2924ae4a922e208b2
 
 depends_build       port:cmake \
                     port:libgeoip \
@@ -38,9 +38,6 @@
                     port:readline \
                     port:zlib
 
-patchfiles          patch-CMakeLists.txt.diff
-patchfiles-append   patch-htonll.diff
-
 universal_variant   no
 
 configure.args      --enable-mobile-ipv6
@@ -55,6 +52,16 @@
     }
 }
 
+# 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
+
 notes \
 "You'll need to set your BROHOME to ${prefix}/share/bro and your\
 BROPATH to ${prefix}/share/bro/site:${prefix}/share/bro/policy\

Deleted: trunk/dports/net/bro/files/patch-CMakeLists.txt.diff
===================================================================
--- 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)
@@ -1,18 +0,0 @@
-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}

Deleted: trunk/dports/net/bro/files/patch-htonll.diff
===================================================================
--- 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)
@@ -1,56 +0,0 @@
-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
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150816/8b1459e0/attachment.html>