diff --git a/net/bro/Makefile b/net/bro/Makefile index a0950af8a8c..9a787063165 100644 --- a/net/bro/Makefile +++ b/net/bro/Makefile @@ -1,13 +1,11 @@ COMMENT= network analysis and security monitoring framework -V = 8.1.2 +V = 8.2.0 DISTNAME = zeek-${V} -SHARED_LIBS += binpac 3.0 -SHARED_LIBS += broker 10.0 -# only used at configure+build time; these libs aren't installed -SHARED_LIBS += caf_core 4.1 +SHARED_LIBS += binpac 4.0 +SHARED_LIBS += broker 11.0 CATEGORIES= net security diff --git a/net/bro/distinfo b/net/bro/distinfo index e68f41dec74..fe86ac613c3 100644 --- a/net/bro/distinfo +++ b/net/bro/distinfo @@ -1,2 +1,2 @@ -SHA256 (zeek-8.1.2.tar.gz) = X8Hz1Rgv6hBfjeJT4PsQoF6fzQ9JsrjmrOOq2chkrLU= -SIZE (zeek-8.1.2.tar.gz) = 93727442 +SHA256 (zeek-8.2.0.tar.gz) = iF/QZ+J9p2VbxhbhJaZbM+4GN8M8VRsDScghoR9ANM4= +SIZE (zeek-8.2.0.tar.gz) = 103160883 diff --git a/net/bro/patches/patch-CMakeLists_txt b/net/bro/patches/patch-CMakeLists_txt index 129627caf3d..5aef929309b 100644 --- a/net/bro/patches/patch-CMakeLists_txt +++ b/net/bro/patches/patch-CMakeLists_txt @@ -1,7 +1,7 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -1293,7 +1293,7 @@ if (INSTALL_ZKG) +@@ -1330,7 +1330,7 @@ if (INSTALL_ZKG) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake_templates/zkg-config.in ${CMAKE_CURRENT_BINARY_DIR}/zkg-config @ONLY) diff --git a/net/bro/patches/patch-src_DNS_Mgr_h b/net/bro/patches/patch-src_DNS_Mgr_h index 67846a73d59..1b2f8d886f2 100644 --- a/net/bro/patches/patch-src_DNS_Mgr_h +++ b/net/bro/patches/patch-src_DNS_Mgr_h @@ -1,7 +1,7 @@ Index: src/DNS_Mgr.h --- src/DNS_Mgr.h.orig +++ src/DNS_Mgr.h -@@ -19,24 +19,6 @@ +@@ -21,24 +21,6 @@ struct ares_channeldata; using ares_channel = struct ares_channeldata*; diff --git a/net/bro/patches/patch-src_iosource_pcapng_Source_h b/net/bro/patches/patch-src_iosource_pcapng_Source_h new file mode 100644 index 00000000000..09f8aded85d --- /dev/null +++ b/net/bro/patches/patch-src_iosource_pcapng_Source_h @@ -0,0 +1,15 @@ +Unbreak build +${WRKSRC}/src/iosource/pcapng/Source.cc:142:26: error: cannot initialize a parameter of type 'pkt_timeval *' (aka 'bpf_timeval *') with an rvalue of type 'struct timeval *' + +Index: src/iosource/pcapng/Source.h +--- src/iosource/pcapng/Source.h.orig ++++ src/iosource/pcapng/Source.h +@@ -41,7 +41,7 @@ class Source : public PktSrc { (protected) + private: + struct PacketBlock { + uint32_t interface = 0; +- struct timeval ts_tval{}; ++ pkt_timeval ts_tval{}; + uint32_t caplen = 0; + uint32_t origlen = 0; + uint8_t* data; diff --git a/net/bro/pkg/PLIST b/net/bro/pkg/PLIST index ee4207b2287..257d41cbe0e 100644 --- a/net/bro/pkg/PLIST +++ b/net/bro/pkg/PLIST @@ -253,6 +253,7 @@ include/zeek/UID.h include/zeek/Val.h include/zeek/Var.h include/zeek/WeirdState.h +include/zeek/WinHandle.h include/zeek/ZVal.h include/zeek/ZeekArgs.h include/zeek/ZeekList.h @@ -653,6 +654,7 @@ include/zeek/cluster/Component.h include/zeek/cluster/Event.h include/zeek/cluster/Manager.h include/zeek/cluster/OnLoop.h +include/zeek/cluster/PublishOnChangeState.h include/zeek/cluster/Serializer.h include/zeek/cluster/Telemetry.h include/zeek/cluster/backend/ @@ -660,17 +662,13 @@ include/zeek/cluster/backend/none/ include/zeek/cluster/backend/zeromq/ include/zeek/cluster/backend/zeromq/Plugin.h include/zeek/cluster/backend/zeromq/ZeroMQ-Proxy.h +include/zeek/cluster/backend/zeromq/ZeroMQ-ZAP.h include/zeek/cluster/backend/zeromq/ZeroMQ.h include/zeek/cluster/backend/zeromq/auxil/ -include/zeek/cluster/backend/zeromq/auxil/cppzmq/ -include/zeek/cluster/backend/zeromq/auxil/cppzmq/cmake/ -include/zeek/cluster/backend/zeromq/auxil/cppzmq/demo/ -include/zeek/cluster/backend/zeromq/auxil/cppzmq/examples/ -include/zeek/cluster/backend/zeromq/auxil/cppzmq/libzmq-pkg-config/ -include/zeek/cluster/backend/zeromq/auxil/cppzmq/tests/ include/zeek/cluster/backend/zeromq/cluster_backend_zeromq.bif.h include/zeek/cluster/backend/zeromq/cmake/ include/zeek/cluster/cluster.bif.h +include/zeek/cluster/publish_on_change.bif.h include/zeek/cluster/serializer/ include/zeek/cluster/serializer/binary-serialization-format/ include/zeek/cluster/serializer/binary-serialization-format/Plugin.h @@ -683,86 +681,6 @@ include/zeek/cluster/websocket/Plugin.h include/zeek/cluster/websocket/WebSocket.h include/zeek/cluster/websocket/auxil/ include/zeek/cluster/websocket/auxil/IXWebSocket/ -include/zeek/cluster/websocket/auxil/IXWebSocket/CMake/ -include/zeek/cluster/websocket/auxil/IXWebSocket/docker/ -include/zeek/cluster/websocket/auxil/IXWebSocket/docs/ -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/ -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXBase64.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXBench.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXCancellationRequest.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXConnectionState.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXDNSLookup.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXExponentialBackoff.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXGetFreePort.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXGzipCodec.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXHttp.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXHttpClient.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXHttpServer.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXNetSystem.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXProgressCallback.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSelectInterrupt.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSelectInterruptEvent.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSelectInterruptFactory.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSelectInterruptPipe.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSetThreadName.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocket.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketAppleSSL.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketConnect.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketFactory.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketMbedTLS.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketOpenSSL.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketServer.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXSocketTLSOptions.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXStrCaseCompare.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXUdpSocket.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXUniquePtr.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXUrlParser.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXUserAgent.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXUtf8Validator.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXUuid.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocket.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketCloseConstants.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketCloseInfo.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketErrorInfo.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketHandshake.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketHandshakeKeyGen.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketHttpHeaders.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketInitResult.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketMessage.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketMessageType.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketOpenInfo.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflate.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateCodec.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateOptions.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketProxyServer.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketSendData.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketSendInfo.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketServer.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketTransport.h -include/zeek/cluster/websocket/auxil/IXWebSocket/ixwebsocket/IXWebSocketVersion.h -include/zeek/cluster/websocket/auxil/IXWebSocket/test/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/.certs/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/Catch2/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/Catch2/single_include/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/IXTest.h -include/zeek/cluster/websocket/auxil/IXWebSocket/test/compatibility/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/compatibility/cpp/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/compatibility/cpp/libwebsockets/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/compatibility/csharp/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/compatibility/node/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/compatibility/python/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/compatibility/python/websocket-client/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/compatibility/python/websockets/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/compatibility/python/websockets/vendor/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/compatibility/ruby/ -include/zeek/cluster/websocket/auxil/IXWebSocket/test/data/ -include/zeek/cluster/websocket/auxil/IXWebSocket/third_party/ -include/zeek/cluster/websocket/auxil/IXWebSocket/third_party/cli11/ -include/zeek/cluster/websocket/auxil/IXWebSocket/third_party/cpp-linenoise/ -include/zeek/cluster/websocket/auxil/IXWebSocket/third_party/cpp-linenoise/example/ -include/zeek/cluster/websocket/auxil/IXWebSocket/third_party/msgpack11/ -include/zeek/cluster/websocket/auxil/IXWebSocket/tools/ -include/zeek/cluster/websocket/auxil/IXWebSocket/ws/ include/zeek/cluster/websocket/events.bif.h include/zeek/communityid.bif.func_h include/zeek/communityid.bif.netvar_h @@ -824,6 +742,7 @@ include/zeek/include/zeek include/zeek/input/ include/zeek/input.h include/zeek/input/Component.h +include/zeek/input/InputFile.h include/zeek/input/Manager.h include/zeek/input/ReaderBackend.h include/zeek/input/ReaderFrontend.h @@ -863,6 +782,10 @@ include/zeek/iosource/pcap/ include/zeek/iosource/pcap/Dumper.h include/zeek/iosource/pcap/Source.h include/zeek/iosource/pcap/pcap.bif.h +include/zeek/iosource/pcapng/ +include/zeek/iosource/pcapng/Source.h +include/zeek/iosource/pcapng/auxil/ +include/zeek/iosource/pcapng/auxil/LightPcapNg/ include/zeek/logging/ include/zeek/logging/Component.h include/zeek/logging/Manager.h @@ -924,6 +847,7 @@ include/zeek/packet_analysis/protocol/ieee802_11/ include/zeek/packet_analysis/protocol/ieee802_11/IEEE802_11.h include/zeek/packet_analysis/protocol/ieee802_11_radio/ include/zeek/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.h +include/zeek/packet_analysis/protocol/igmp/ include/zeek/packet_analysis/protocol/ip/ include/zeek/packet_analysis/protocol/ip/IP.h include/zeek/packet_analysis/protocol/ip/IPBasedAnalyzer.h @@ -1525,6 +1449,7 @@ share/zeek/base/bif/plugins/Zeek_X509.ocsp_events.bif.zeek share/zeek/base/bif/plugins/Zeek_X509.types.bif.zeek share/zeek/base/bif/plugins/Zeek_XMPP.events.bif.zeek share/zeek/base/bif/plugins/__load__.zeek +share/zeek/base/bif/publish_on_change.bif.zeek share/zeek/base/bif/reporter.bif.zeek share/zeek/base/bif/stats.bif.zeek share/zeek/base/bif/storage-async.bif.zeek @@ -1579,6 +1504,7 @@ share/zeek/base/frameworks/cluster/nodes/manager.zeek share/zeek/base/frameworks/cluster/nodes/proxy.zeek share/zeek/base/frameworks/cluster/nodes/worker.zeek share/zeek/base/frameworks/cluster/pools.zeek +share/zeek/base/frameworks/cluster/publish-on-change.zeek share/zeek/base/frameworks/cluster/pubsub.zeek share/zeek/base/frameworks/cluster/setup-connections.zeek share/zeek/base/frameworks/cluster/setup-subscriptions.zeek @@ -1767,6 +1693,11 @@ share/zeek/base/packet-protocols/ieee802_11/main.zeek share/zeek/base/packet-protocols/ieee802_11_radio/ share/zeek/base/packet-protocols/ieee802_11_radio/__load__.zeek share/zeek/base/packet-protocols/ieee802_11_radio/main.zeek +share/zeek/base/packet-protocols/igmp/ +share/zeek/base/packet-protocols/igmp/__load__.zeek +share/zeek/base/packet-protocols/igmp/main.zeek +share/zeek/base/packet-protocols/igmp/spicy-events.zeek +share/zeek/base/packet-protocols/igmp/types.zeek share/zeek/base/packet-protocols/ip/ share/zeek/base/packet-protocols/ip/__load__.zeek share/zeek/base/packet-protocols/ip/main.zeek