Index: head/net-mgmt/openbmp/Makefile =================================================================== --- head/net-mgmt/openbmp/Makefile (revision 463789) +++ head/net-mgmt/openbmp/Makefile (revision 463790) @@ -1,25 +1,24 @@ # Created by: Luca Pizzamiglio # $FreeBSD$ PORTNAME= openbmp DISTVERSIONPREFIX= v -DISTVERSION= 0.13.0 -PORTREVISION= 1 +DISTVERSION= 0.14.0 CATEGORIES= net-mgmt MAINTAINER= pizzamig@FreeBSD.org COMMENT= OpenBMP Server Collector LICENSE= EPL LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/boost/exception/all.hpp:devel/boost-libs LIB_DEPENDS= librdkafka.so:net/librdkafka \ libsasl2.so:security/cyrus-sasl2 \ libyaml-cpp.so:devel/yaml-cpp USES= cmake:outsource ssl USE_GITHUB= yes GH_ACCOUNT= OpenBMP .include Index: head/net-mgmt/openbmp/distinfo =================================================================== --- head/net-mgmt/openbmp/distinfo (revision 463789) +++ head/net-mgmt/openbmp/distinfo (revision 463790) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505339149 -SHA256 (OpenBMP-openbmp-v0.13.0_GH0.tar.gz) = 5eb3cc72553e1be86e47e298da441cdc1d4be9a4c67bd0d02f14fc903a01c307 -SIZE (OpenBMP-openbmp-v0.13.0_GH0.tar.gz) = 3016241 +TIMESTAMP = 1520416437 +SHA256 (OpenBMP-openbmp-v0.14.0_GH0.tar.gz) = 21367c4d9a552e7147b013fd62f5334d005513c63cd8f4f2653e31d42f1fc60c +SIZE (OpenBMP-openbmp-v0.14.0_GH0.tar.gz) = 3019126 Index: head/net-mgmt/openbmp/files/patch-Server_CMakeLists.txt =================================================================== --- head/net-mgmt/openbmp/files/patch-Server_CMakeLists.txt (revision 463789) +++ head/net-mgmt/openbmp/files/patch-Server_CMakeLists.txt (revision 463790) @@ -1,34 +1,34 @@ --- Server/CMakeLists.txt.orig 2017-09-14 09:29:16 UTC +++ Server/CMakeLists.txt @@ -24,6 +24,14 @@ find_path(LIBYAML_CPP_INCLUDE_DIR PATH_SUFFIXES include) +find_path(LIBLZ4_CPP_LIBRARY_DIR + NAMES + liblz4.so + HINTS + ${HINT_ROOT_DIR} + PATH_SUFFIXES + lib) + find_library(LIBYAML_CPP_LIBRARY NAMES libyaml-cpp.a yaml-cpp @@ -84,6 +92,7 @@ endif() # Update the include dir include_directories(${LIBRDKAFKA_INCLUDE_DIR} ${LIBYAML_CPP_INCLUDE_DIR} src/ src/bmp src/bgp src/bgp/linkstate src/kafka) #link_directories(${LIBRDKAFKA_LIBRARY}) +link_directories(${LIBLZ4_CPP_LIBRARY_DIR}) # Define the source files to compile @@ -134,7 +143,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMA endif() # Set the libs to link --set (LIBS pthread ${LIBYAML_CPP_LIBRARY} ${LIBRDKAFKA_CPP_LIBRARY} ${LIBRDKAFKA_LIBRARY} z ${SSL_LIBS}) +-set (LIBS pthread ${LIBYAML_CPP_LIBRARY} ${LIBRDKAFKA_CPP_LIBRARY} ${LIBRDKAFKA_LIBRARY} z ${SSL_LIBS} dl) +set (LIBS pthread ${LIBYAML_CPP_LIBRARY} ${LIBRDKAFKA_CPP_LIBRARY} ${LIBRDKAFKA_LIBRARY} z lz4 ${SSL_LIBS}) # Set the binary add_executable (openbmpd ${SRC_FILES}) Index: head/net-mgmt/openbmp/files/patch-Server_src_client__thread.cpp =================================================================== --- head/net-mgmt/openbmp/files/patch-Server_src_client__thread.cpp (revision 463789) +++ head/net-mgmt/openbmp/files/patch-Server_src_client__thread.cpp (revision 463790) @@ -1,11 +1,11 @@ --- Server/src/client_thread.cpp.orig 2017-09-14 09:34:45 UTC +++ Server/src/client_thread.cpp -@@ -227,7 +227,7 @@ void *ClientThread(void *arg) { +@@ -242,7 +242,7 @@ void *ClientThread(void *arg) { + LOG_INFO("%s: %s - Thread for sock [%d] ended", cInfo.client->c_ip, str, cInfo.client->c_sock); close(sock_fds[0]); close(sock_fds[1]); - -#ifndef __APPLE__ +#if !defined(__APPLE__) and !defined(__FreeBSD__) } catch (abi::__forced_unwind&) { close(sock_fds[0]); close(sock_fds[1]);