diff --git a/security/zeek/Makefile b/security/zeek/Makefile index 53c8a38718c8..a77ecf53c0b5 100644 --- a/security/zeek/Makefile +++ b/security/zeek/Makefile @@ -1,135 +1,135 @@ # Created by: David O'Brien PORTNAME= zeek -PORTVERSION= 4.0.0 +PORTVERSION= 4.0.1 CATEGORIES= security MASTER_SITES= https://old.zeek.org/downloads/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= leres@FreeBSD.org COMMENT= System for detecting network intruders in real-time LICENSE= BSD3CLAUSE BROKEN_FreeBSD_11_powerpc64= Does not build: error: zero-size array 'names' BROKEN_FreeBSD_12_powerpc64= Does not build: error: zero-size array 'names' USES= bison cmake compiler:c++11-lang gettext-runtime ninja perl5 python shebangfix ssl USE_LDCONFIG= yes PORTSCOUT= limit:0,even CXXFLAGS_powerpc64= -mpower8-vector CMAKE_ARGS+= -DPYTHON_EXECUTABLE:PATH=${PYTHON_CMD} SHEBANG_FILES= auxil/zeekctl/auxil/trace-summary/trace-summary SUB_FILES= pkg-message NO_MTREE= yes CMAKE_ARGS+= -GNinja \ -D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ -D ZEEK_ROOT_DIR:PATH=${PREFIX} \ -D PY_MOD_INSTALL_DIR:PATH=${PREFIX}/lib/zeekctl \ -D ZEEK_SCRIPT_INSTALL_PATH:PATH=${PREFIX}/share/zeek \ -D ZEEK_ETC_INSTALL_DIR:PATH=${PREFIX}/etc \ -D ZEEK_MAN_INSTALL_PATH=${MANPREFIX}/man \ -D ENABLE_PERFTOOLS_DEBUG:BOOL=false \ -D BinPAC_SKIP_INSTALL:BOOL=true \ -D INSTALL_AUX_TOOLS:BOOL=true \ -D BUILD_SHARED_LIBS:BOOL=true \ -D BUILD_STATIC_BROKER:BOOL=true \ -D CMAKE_EXE_LINKER_FLAGS="${OPENSSL_LDFLAGS}" ZEEKUSER?= zeek ZEEKGROUP?= zeek PLIST_SUB+= ARCH=${UNAME_M} \ ZEEKUSER=${ZEEKUSER} \ ZEEKGROUP=${ZEEKGROUP} \ LCASE_OPSYS=${OPSYS:tl} USERS= ${ZEEKUSER} GROUPS= ${ZEEKGROUP} OPTIONS_DEFINE= BROKER DEBUG GEOIP2 IPSUMDUMP LBL_CF LBL_HF NETMAP \ PERFTOOLS ZEEKCTL OPTIONS_DEFAULT=BROKER GEOIP2 IPSUMDUMP LBL_CF LBL_HF NETMAP ZEEKCTL OPTIONS_SUB= yes BROKER_DESC= Enable the Broker communication library GEOIP2_DESC= Build with GeoIP2 (MaxMindDB) support IPSUMDUMP_DESC= Enables traffic summaries LBL_CF_DESC= Unix time to formated time/date filter support LBL_HF_DESC= Address to hostname filter support NETMAP_DESC= Native Netmap Packet IOSource for Zeek PERFTOOLS_DESC= Use Perftools to improve memory & CPU usage ZEEKCTL_DESC= ZeekControl support (implies BROKER and IPSUMDUMP) ZEEKCTL_IMPLIES= BROKER IPSUMDUMP BROKER_BUILD_DEPENDS= swig:devel/swig BROKER_CMAKE_BOOL= ENABLE_BROKER DEBUG_CMAKE_BOOL= ENABLE_DEBUG GEOIP2_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb IPSUMDUMP_BUILD_DEPENDS=ipsumdump:net/ipsumdump IPSUMDUMP_RUN_DEPENDS= ipsumdump:net/ipsumdump LBL_CF_RUN_DEPENDS= ${LOCALBASE}/bin/cf:sysutils/lbl-cf LBL_HF_RUN_DEPENDS= ${LOCALBASE}/bin/hf:sysutils/lbl-hf NETMAP_GH_TUPLE= zeek:zeek-netmap:v2.0.0:zeek_netmap NETMAP_USE= GITHUB=nodefault PERFTOOLS_BUILD_DEPENDS=${LOCALBASE}/bin/perftools-pprof:devel/google-perftools PERFTOOLS_CMAKE_BOOL= ENABLE_PERFTOOLS PERFTOOLS_RUN_DEPENDS=${LOCALBASE}/bin/perftools-pprof:devel/google-perftools PYTHON_BUILD_DEPENDS= swig:devel/swig ZEEKCTL_BUILD_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ swig:devel/swig ZEEKCTL_CMAKE_BOOL= INSTALL_ZEEKCTL ZEEKCTL_RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} .include .if ${PORT_OPTIONS:MZEEKCTL} USE_RC_SUBR= zeek .endif post-patch: ${REINPLACE_CMD} -e '\|/usr/local/|s|$$| ${STAGEDIR}${PREFIX}/|' \ ${WRKSRC_zeek_netmap}/cmake/FindNetmap.cmake post-install-ZEEKCTL-on: ${MKDIR} ${STAGEDIR}${PREFIX}/logs ${MKDIR} ${STAGEDIR}${PREFIX}/spool/tmp ${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/auto ${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/site .for F in zeekctl.cfg networks.cfg node.cfg ${MV} ${STAGEDIR}${PREFIX}/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.sample .endfor ${RM} ${STAGEDIR}${PREFIX}/share/zeekctl/scripts/zeekctl-config.sh ${LN} -s ../../../spool/zeekctl-config.sh \ ${STAGEDIR}${PREFIX}/share/zeekctl/scripts/zeekctl-config.sh post-install: ${MV} ${STAGEDIR}${DATADIR}/site/local.zeek \ ${STAGEDIR}${DATADIR}/site/local.zeek.sample pre-install-ZEEKCTL-on: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d post-install-NETMAP-on: ${MKDIR} ${WRKDIR}/zeek-bin ${CP} ${STAGEDIR}${PREFIX}/bin/zeek-config ${WRKDIR}/zeek-bin ${REINPLACE_CMD} -e 's|=/usr/local|=${STAGEDIR}${PREFIX}|' \ -e '/^include_dir=/s|:/usr/local|:${STAGEDIR}${PREFIX}|' \ ${WRKDIR}/zeek-bin/zeek-config cd ${WRKSRC_zeek_netmap} && ${SETENV} PATH=${WRKDIR}/zeek-bin:${PATH} \ ./configure --with-netmap=/usr \ --install-root=${STAGEDIR}${PREFIX}/lib/zeek/plugins cd ${WRKSRC_zeek_netmap}/build && make && make install .include UNAME_M!= ${UNAME} -m .include diff --git a/security/zeek/distinfo b/security/zeek/distinfo index fca030af5023..791c7d2127f7 100644 --- a/security/zeek/distinfo +++ b/security/zeek/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1615852305 -SHA256 (zeek-4.0.0.tar.gz) = f2eedab3262eaa3f58a83442b1f38bad35ed72399564917b71bba42266f1ff54 -SIZE (zeek-4.0.0.tar.gz) = 29441929 +TIMESTAMP = 1619038578 +SHA256 (zeek-4.0.1.tar.gz) = 659a890f433cb730519966bdc41f1a03fb67e27e94b5d52ad9ee890022a12c3a +SIZE (zeek-4.0.1.tar.gz) = 29450307 SHA256 (zeek-zeek-netmap-v2.0.0_GH0.tar.gz) = d37a69babfbb62a51a2413d6b83ae792ce1e7f1ccb1d51bd6b209a10fe5c4d75 SIZE (zeek-zeek-netmap-v2.0.0_GH0.tar.gz) = 9100 diff --git a/security/zeek/files/patch-auxil_highwayhash_highwayhash_arch__specific.cc b/security/zeek/files/patch-auxil_highwayhash_highwayhash_arch__specific.cc deleted file mode 100644 index eda7565aad24..000000000000 --- a/security/zeek/files/patch-auxil_highwayhash_highwayhash_arch__specific.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- auxil/highwayhash/highwayhash/arch_specific.cc.orig 2021-03-23 17:45:40 UTC -+++ auxil/highwayhash/highwayhash/arch_specific.cc -@@ -150,7 +150,7 @@ double DetectNominalClockRate() { - } - #elif __FreeBSD__ - size_t length = sizeof(freq); -- sysctlbyname("dev.cpu.0.freq"), &freq, &length, NULL, 0); -+ sysctlbyname("dev.cpu.0.freq", &freq, &length, NULL, 0); - freq *= 1E6; - return freq; - #endif diff --git a/security/zeek/files/patch-src_CMakeLists.txt b/security/zeek/files/patch-src_CMakeLists.txt deleted file mode 100644 index de12b5954a97..000000000000 --- a/security/zeek/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- src/CMakeLists.txt.orig 2021-04-09 11:46:37 UTC -+++ src/CMakeLists.txt -@@ -344,6 +344,7 @@ set(HH_SRCS - ) - - if (${COMPILER_ARCHITECTURE} STREQUAL "arm") -+ list(APPEND HH_SRCS ../auxil/highwayhash/highwayhash/hh_neon.cc) - set_source_files_properties(${HH_SRCS} PROPERTIES COMPILE_FLAGS - -mfloat-abi=hard -march=armv7-a -mfpu=neon) - elseif (${COMPILER_ARCHITECTURE} STREQUAL "aarch64")