[pkgsrc/trunk]: pkgsrc/net/tcpflow tcpflow: updated to 1.5.0

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d803cee3becc
branches:  trunk
changeset: 384289:d803cee3becc
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Aug 21 06:52:11 2018 +0000

description:
tcpflow: updated to 1.5.0

1.5.0:
* updated to work with Fedora 26 compilers
* Found bug in sbuf.cpp
* Fixed C++ warnings in hash
* Now works with OpenSSL 1.1.0f-fips

diffstat:

 net/tcpflow/Makefile                                      |  13 ++++++-------
 net/tcpflow/distinfo                                      |  12 +++++-------
 net/tcpflow/patches/patch-src_be13__api_beregex.cpp       |  13 -------------
 net/tcpflow/patches/patch-src_dfxml_src_dfxml__writer.cpp |  13 -------------
 4 files changed, 11 insertions(+), 40 deletions(-)

diffs (88 lines):

diff -r 8e37f9c37a7e -r d803cee3becc net/tcpflow/Makefile
--- a/net/tcpflow/Makefile      Tue Aug 21 06:19:15 2018 +0000
+++ b/net/tcpflow/Makefile      Tue Aug 21 06:52:11 2018 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2018/08/16 18:55:08 adam Exp $
-#
+# $NetBSD: Makefile,v 1.18 2018/08/21 06:52:11 adam Exp $
 
-DISTNAME=      tcpflow-1.4.5
-PKGREVISION=   5
+DISTNAME=      tcpflow-1.5.0
 CATEGORIES=    net security
 MASTER_SITES=  http://downloads.digitalcorpora.org/downloads/tcpflow/
 
@@ -11,15 +9,16 @@
 COMMENT=       Captures data transmitted as part of TCP connections
 LICENSE=       gnu-gpl-v3
 
-USE_LANGUAGES= c c++
-
-GNU_CONFIGURE= YES
+USE_LANGUAGES=         c c++
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --without-o3
 
 CPPFLAGS.SunOS+=       -Du_int8_t=uint8_t -Du_int16_t=uint16_t -DMAP_FILE=0
 CPPFLAGS.SunOS+=       -Du_int32_t=uint32_t -Du_int64_t=uint64_t
 
 .include "options.mk"
 
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
diff -r 8e37f9c37a7e -r d803cee3becc net/tcpflow/distinfo
--- a/net/tcpflow/distinfo      Tue Aug 21 06:19:15 2018 +0000
+++ b/net/tcpflow/distinfo      Tue Aug 21 06:52:11 2018 +0000
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.9 2017/07/14 12:58:25 joerg Exp $
+$NetBSD: distinfo,v 1.10 2018/08/21 06:52:11 adam Exp $
 
-SHA1 (tcpflow-1.4.5.tar.gz) = a86ca927ec68e7a05cdc0da436e365504fdab27b
-RMD160 (tcpflow-1.4.5.tar.gz) = 2f30ea47f301fb4737fc3911c1d94f8c53e5db0f
-SHA512 (tcpflow-1.4.5.tar.gz) = e31b278b8f4e97b6d1ffb6f8f145a56806963271ab96204ba555ab88049dedc5a13adf78b7775e96e92fe48bbf5116781810cef0d3374231764af059fc09dd97
-Size (tcpflow-1.4.5.tar.gz) = 450450 bytes
+SHA1 (tcpflow-1.5.0.tar.gz) = 5d8b3dda2be469fd2449b31d2ca8955010666d85
+RMD160 (tcpflow-1.5.0.tar.gz) = be77d858cf1825f41008d0ca51af83ccaaa96e12
+SHA512 (tcpflow-1.5.0.tar.gz) = eaf518e5e4d95ea9587542cec16a65a8e1518b54e6c23d84355ce11780c99758346db364ba502f90d938e54b01a1e32807d69ed35afb1e5e378a9a009c5609f5
+Size (tcpflow-1.5.0.tar.gz) = 471429 bytes
 SHA1 (patch-configure) = 1cd65ab0ae845d908813773bcc6bc5f3fbd135d0
-SHA1 (patch-src_be13__api_beregex.cpp) = 72edfaae9a55ba5eae250061125744e0d83bebe0
-SHA1 (patch-src_dfxml_src_dfxml__writer.cpp) = 2cda94ad1446ea5fdc9b3712433bb0db747eab11
 SHA1 (patch-src_tcpip.cpp) = 0ff720b2192ba879c390bb5f82d0e0e240e26078
 SHA1 (patch-tests_test-multifile.sh) = 7c614f53a6664b74540ee54f7cb61dfa3934d978
diff -r 8e37f9c37a7e -r d803cee3becc net/tcpflow/patches/patch-src_be13__api_beregex.cpp
--- a/net/tcpflow/patches/patch-src_be13__api_beregex.cpp       Tue Aug 21 06:19:15 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_be13__api_beregex.cpp,v 1.1 2017/07/14 12:58:25 joerg Exp $
-
---- src/be13_api/beregex.cpp.orig      2017-07-12 22:51:30.689369147 +0000
-+++ src/be13_api/beregex.cpp
-@@ -9,7 +9,7 @@
- #include <unistd.h>
- 
- 
--#if defined(HAVE_LIBTRE) && defined(HAVE_TRE_REGCOMP)
-+#if defined(HAVE_LIBTRE) && defined(HAVE_TRE_REGCOMP) && defined(HAVE_TRE_TRE_H)
- #define REGCOMP tre_regcomp
- #define REGFREE tre_regfree
- #define REGEXEC tre_regexec
diff -r 8e37f9c37a7e -r d803cee3becc net/tcpflow/patches/patch-src_dfxml_src_dfxml__writer.cpp
--- a/net/tcpflow/patches/patch-src_dfxml_src_dfxml__writer.cpp Tue Aug 21 06:19:15 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_dfxml_src_dfxml__writer.cpp,v 1.1 2017/07/14 12:58:25 joerg Exp $
-
---- src/dfxml/src/dfxml_writer.cpp.orig        2017-07-12 22:50:57.618132822 +0000
-+++ src/dfxml/src/dfxml_writer.cpp
-@@ -710,7 +710,7 @@ void dfxml_writer::add_DFXML_build_envir
- #ifdef HAVE_EXIV2
-     xmlout("library", "", std::string("name=\"exiv2\" version=\"") + Exiv2::version() + "\"",false);
- #endif
--#if defined(HAVE_LIBTRE) && defined(HAVE_TRE_VERSION)
-+#if defined(HAVE_LIBTRE) && defined(HAVE_TRE_VERSION) && defined(HAVE_TRE_TRE_H)
-     xmlout("library", "", std::string("name=\"tre\" version=\"") + tre_version() + "\"",false);
- #endif
- #ifdef HAVE_HASHID