Date: Mon, 27 May 2024 16:39:36 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2ea18430249a - main - security/snort3: Update version 3.1.84.0=>3.2.1.0 Message-ID: <202405271639.44RGdali011626@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ea18430249a11f1913719ffeb9157d72a37bb87 commit 2ea18430249a11f1913719ffeb9157d72a37bb87 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-05-27 16:37:49 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-05-27 16:38:57 +0000 security/snort3: Update version 3.1.84.0=>3.2.1.0 Changelog: https://github.com/snort3/snort3/releases/tag/3.2.1.0 --- security/snort3/Makefile | 2 +- security/snort3/distinfo | 6 +- .../files/patch-src_actions_actions__module.h | 15 +++ security/snort3/files/patch-src_control_control.h | 10 -- ...elpers_process.cc => patch-src_main_process.cc} | 12 +-- security/snort3/files/patch-src_utils_util.cc | 18 ++++ security/snort3/files/patch-src_utils_util.h | 12 +++ security/snort3/pkg-plist | 108 ++++++++------------- 8 files changed, 93 insertions(+), 90 deletions(-) diff --git a/security/snort3/Makefile b/security/snort3/Makefile index 2d51c5a95c8b..ee7c4dd5c39f 100644 --- a/security/snort3/Makefile +++ b/security/snort3/Makefile @@ -1,5 +1,5 @@ PORTNAME= snort -DISTVERSION= 3.1.84.0 +DISTVERSION= 3.2.1.0 PORTEPOCH= 1 CATEGORIES= security PKGNAMESUFFIX= 3 diff --git a/security/snort3/distinfo b/security/snort3/distinfo index 96d2b310b8bb..d2c2a778ba33 100644 --- a/security/snort3/distinfo +++ b/security/snort3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713003154 -SHA256 (snort3-snort3-3.1.84.0_GH0.tar.gz) = dca1707a66f6ca56ddd526163b2d951cefdb168bddc162c791adc74c0d226c7f -SIZE (snort3-snort3-3.1.84.0_GH0.tar.gz) = 3299757 +TIMESTAMP = 1716824303 +SHA256 (snort3-snort3-3.2.1.0_GH0.tar.gz) = c7242fd7a199ecc78c05ca357478b68b29bd2ca46dc14ac2517eae3406f7e1e0 +SIZE (snort3-snort3-3.2.1.0_GH0.tar.gz) = 3316251 diff --git a/security/snort3/files/patch-src_actions_actions__module.h b/security/snort3/files/patch-src_actions_actions__module.h new file mode 100644 index 000000000000..20b3c7016916 --- /dev/null +++ b/security/snort3/files/patch-src_actions_actions__module.h @@ -0,0 +1,15 @@ +--- src/actions/actions_module.h.orig 2024-05-27 15:44:00 UTC ++++ src/actions/actions_module.h +@@ -25,6 +25,7 @@ + + #include <map> + #include <vector> ++#include <array> + + #include "framework/module.h" + +@@ -59,4 +60,3 @@ class ActionsModule : public snort::Module (private) + }; + + #endif +- diff --git a/security/snort3/files/patch-src_control_control.h b/security/snort3/files/patch-src_control_control.h deleted file mode 100644 index d99f74fa5418..000000000000 --- a/security/snort3/files/patch-src_control_control.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/control/control.h.orig 2023-06-02 19:53:06 UTC -+++ src/control/control.h -@@ -28,6 +28,7 @@ - #include <queue> - #include <string> - #include <vector> -+#include <ctime> - - #include "main/snort_types.h" - diff --git a/security/snort3/files/patch-src_helpers_process.cc b/security/snort3/files/patch-src_main_process.cc similarity index 50% rename from security/snort3/files/patch-src_helpers_process.cc rename to security/snort3/files/patch-src_main_process.cc index 271ebbe4d8ad..d7a26cc91d9b 100644 --- a/security/snort3/files/patch-src_helpers_process.cc +++ b/security/snort3/files/patch-src_main_process.cc @@ -1,8 +1,8 @@ ---- src/helpers/process.cc.orig 2020-07-10 23:44:17 UTC -+++ src/helpers/process.cc -@@ -34,6 +34,11 @@ - #include <malloc.h> - #endif +--- src/main/process.cc.orig 2024-05-17 14:59:20 UTC ++++ src/main/process.cc +@@ -60,6 +60,11 @@ extern "C" { + #include <daq.h> + } +/* sighandler_t is GNU extension */ +#ifndef HAVE_SIGHANDLER_T @@ -10,5 +10,5 @@ +#endif + #include <csignal> + #include <fstream> #include <iostream> - diff --git a/security/snort3/files/patch-src_utils_util.cc b/security/snort3/files/patch-src_utils_util.cc new file mode 100644 index 000000000000..d50c0f21e4c8 --- /dev/null +++ b/security/snort3/files/patch-src_utils_util.cc @@ -0,0 +1,18 @@ +--- src/utils/util.cc.orig 2024-05-27 16:02:34 UTC ++++ src/utils/util.cc +@@ -83,14 +83,7 @@ bool get_file_size(const std::string& path, size_t& si + } + + #if defined(NOCOREFILE) +-void SetNoCores() +-{ +- struct rlimit rlim; +- +- getrlimit(RLIMIT_CORE, &rlim); +- rlim.rlim_max = 0; +- setrlimit(RLIMIT_CORE, &rlim); +-} ++void SetNoCores(); + #endif + + namespace snort diff --git a/security/snort3/files/patch-src_utils_util.h b/security/snort3/files/patch-src_utils_util.h new file mode 100644 index 000000000000..9df6b47b9227 --- /dev/null +++ b/security/snort3/files/patch-src_utils_util.h @@ -0,0 +1,12 @@ +--- src/utils/util.h.orig 2024-05-27 15:47:21 UTC ++++ src/utils/util.h +@@ -27,6 +27,9 @@ + #if defined(__linux__) + #include <sys/syscall.h> + #endif ++#if defined(__FreeBSD__) || defined(__DragonFly__) ++#include <sys/types.h> ++#endif + #include <sys/stat.h> + #include <sys/time.h> + #include <unistd.h> diff --git a/security/snort3/pkg-plist b/security/snort3/pkg-plist index 51cd4d7ebc50..9d2e06354461 100644 --- a/security/snort3/pkg-plist +++ b/security/snort3/pkg-plist @@ -5,46 +5,34 @@ bin/u2boat bin/u2spewfoo %%ETCDIR%%/balanced.lua %%ETCDIR%%/connectivity.lua -%%ETCDIR%%/inline.lua %%ETCDIR%%/file_magic.rules +%%ETCDIR%%/inline.lua %%ETCDIR%%/max_detect.lua %%ETCDIR%%/security.lua %%ETCDIR%%/sensitive_data.rules %%ETCDIR%%/snort.lua %%ETCDIR%%/snort_defaults.lua %%ETCDIR%%/talos.lua -include/snort/actions/actions.h include/snort/codecs/codec_module.h include/snort/control/control.h include/snort/daq/daq_user.h include/snort/decompress/file_decomp.h -include/snort/detection/detect.h -include/snort/detection/detect_trace.h +include/snort/detection/detection_buf.h include/snort/detection/detection_engine.h -include/snort/detection/detection_options.h -include/snort/detection/detection_util.h +include/snort/detection/extract.h include/snort/detection/ips_context.h include/snort/detection/ips_context_chain.h include/snort/detection/ips_context_data.h include/snort/detection/pattern_match_data.h -include/snort/detection/regex_offload.h include/snort/detection/rule_option_types.h -include/snort/detection/rules.h -include/snort/detection/signature.h -include/snort/detection/treenodes.h include/snort/events/event.h -include/snort/events/event_queue.h include/snort/file_api/file_api.h include/snort/file_api/file_capture.h -include/snort/file_api/file_config.h include/snort/file_api/file_flows.h -include/snort/file_api/file_identifier.h include/snort/file_api/file_lib.h -include/snort/file_api/file_module.h -include/snort/file_api/file_segment.h include/snort/file_api/file_service.h include/snort/flow/deferred_trust.h -include/snort/flow/expect_cache.h +include/snort/flow/expect_flow.h include/snort/flow/flow.h include/snort/flow/flow_data.h include/snort/flow/flow_key.h @@ -52,9 +40,9 @@ include/snort/flow/flow_stash.h include/snort/flow/ha.h include/snort/flow/session.h include/snort/flow/stash_item.h +include/snort/flow/stream_flow.h include/snort/framework/api_options.h include/snort/framework/base_api.h -include/snort/framework/bits.h include/snort/framework/codec.h include/snort/framework/connector.h include/snort/framework/counts.h @@ -66,43 +54,45 @@ include/snort/framework/inspector.h include/snort/framework/ips_action.h include/snort/framework/ips_option.h include/snort/framework/logger.h -include/snort/framework/lua_api.h include/snort/framework/module.h include/snort/framework/mpse.h include/snort/framework/mpse_batch.h -include/snort/framework/packet_constraints.h include/snort/framework/parameter.h include/snort/framework/pdu_section.h +include/snort/framework/pig_pen.h +include/snort/framework/plugins.h include/snort/framework/policy_selector.h include/snort/framework/range.h +include/snort/framework/snort_api.h include/snort/framework/so_rule.h include/snort/framework/value.h -include/snort/hash/ghash.h -include/snort/hash/hash_defs.h include/snort/hash/hash_key_operations.h include/snort/hash/hashes.h -%%HYPERSCAN%%include/snort/helpers/hyper_scratch_allocator.h -%%HYPERSCAN%%include/snort/helpers/hyper_search.h -include/snort/helpers/process.h -include/snort/helpers/sigsafe.h include/snort/hash/lru_cache_local.h -include/snort/hash/lru_segmented_cache_shared.h include/snort/hash/lru_cache_shared.h +include/snort/hash/lru_segmented_cache_shared.h include/snort/hash/xhash.h include/snort/helpers/base64_encoder.h +include/snort/helpers/ber.h include/snort/helpers/bitop.h +include/snort/helpers/boyer_moore.h include/snort/helpers/boyer_moore_search.h include/snort/helpers/buffer_data.h +include/snort/helpers/event_gen.h +include/snort/helpers/hyper_scratch_allocator.h +include/snort/helpers/hyper_search.h +include/snort/helpers/infractions.h include/snort/helpers/json_stream.h include/snort/helpers/literal_search.h +include/snort/helpers/memcap_allocator.h include/snort/helpers/scratch_allocator.h +include/snort/helpers/sigsafe.h +include/snort/helpers/utf.h include/snort/host_tracker/cache_allocator.h include/snort/host_tracker/cache_interface.h include/snort/host_tracker/host_cache.h -include/snort/host_tracker/host_cache_segmented.h include/snort/host_tracker/host_tracker.h -include/snort/ips_options/extract.h -include/snort/log/log.h +include/snort/log/log_stats.h include/snort/log/log_text.h include/snort/log/messages.h include/snort/log/obfuscator.h @@ -110,26 +100,19 @@ include/snort/log/text_log.h include/snort/log/u2_packet.h include/snort/log/unified2.h include/snort/lua/snort_plugin.lua -include/snort/main/analyzer.h include/snort/main/analyzer_command.h include/snort/main/policy.h -include/snort/main/reload_tuner.h include/snort/main/reload_tracker.h -include/snort/main/snort.h +include/snort/main/reload_tuner.h include/snort/main/snort_config.h include/snort/main/snort_types.h -include/snort/main/swapper.h include/snort/main/thread.h include/snort/main/thread_config.h -include/snort/managers/codec_manager.h -include/snort/managers/event_manager.h -include/snort/managers/inspector_manager.h include/snort/memory/heap_interface.h include/snort/memory/memory_cap.h include/snort/mime/decode_b64.h include/snort/mime/decode_base.h include/snort/mime/file_mime_config.h -include/snort/mime/file_mime_context_data.h include/snort/mime/file_mime_decode.h include/snort/mime/file_mime_log.h include/snort/mime/file_mime_paf.h @@ -145,28 +128,24 @@ include/snort/network_inspectors/appid/application_ids.h include/snort/network_inspectors/appid/tp_appid_module_api.h include/snort/network_inspectors/appid/tp_appid_session_api.h include/snort/network_inspectors/appid/tp_appid_types.h -include/snort/service_inspectors/http_inspect/http_common.h -include/snort/service_inspectors/http_inspect/http_field.h -include/snort/service_inspectors/http_inspect/http_inspect_base.h -include/snort/service_inspectors/http_inspect/http_stream_splitter_base.h -include/snort/service_inspectors/netflow/netflow.h -include/snort/network_inspectors/packet_tracer/packet_tracer.h include/snort/network_inspectors/reputation/reputation_common.h include/snort/network_inspectors/rna/rna_cpe_os.h include/snort/network_inspectors/rna/rna_fingerprint.h include/snort/network_inspectors/rna/rna_fingerprint_smb.h include/snort/network_inspectors/rna/rna_fingerprint_tcp.h -include/snort/network_inspectors/rna/rna_fingerprint_udp.h include/snort/network_inspectors/rna/rna_fingerprint_ua.h -include/snort/network_inspectors/rna/rna_flow.h +include/snort/network_inspectors/rna/rna_fingerprint_udp.h include/snort/network_inspectors/rna/rna_inspector.h -include/snort/network_inspectors/rna/rna_logger.h +include/snort/network_inspectors/rna/rna_logger_event.h include/snort/network_inspectors/rna/rna_name.h +include/snort/network_inspectors/rna/rna_tracker.h include/snort/packet_io/active.h +include/snort/packet_io/active_action.h +include/snort/packet_io/packet_constraints.h +include/snort/packet_io/packet_tracer.h include/snort/packet_io/sfdaq.h include/snort/packet_io/sfdaq_instance.h include/snort/payload_injector/payload_injector.h -include/snort/profiler/memory_context.h include/snort/profiler/memory_defs.h include/snort/profiler/memory_profiler_defs.h include/snort/profiler/profiler.h @@ -202,8 +181,8 @@ include/snort/protocols/udp.h include/snort/protocols/vlan.h include/snort/protocols/wlan.h include/snort/pub_sub/appid_debug_log_event.h -include/snort/pub_sub/appid_events.h include/snort/pub_sub/appid_event_ids.h +include/snort/pub_sub/appid_events.h include/snort/pub_sub/assistant_gadget_event.h include/snort/pub_sub/cip_events.h include/snort/pub_sub/daq_message_event.h @@ -215,8 +194,8 @@ include/snort/pub_sub/eve_process_event.h include/snort/pub_sub/expect_events.h include/snort/pub_sub/external_event_ids.h include/snort/pub_sub/finalize_packet_event.h -include/snort/pub_sub/http_events.h include/snort/pub_sub/http_event_ids.h +include/snort/pub_sub/http_events.h include/snort/pub_sub/http_request_body_event.h include/snort/pub_sub/intrinsic_event_ids.h include/snort/pub_sub/netflow_event.h @@ -236,10 +215,11 @@ include/snort/service_inspectors/http2_inspect/http2_varlen_int_decode.h include/snort/service_inspectors/http2_inspect/http2_varlen_int_decode_impl.h include/snort/service_inspectors/http2_inspect/http2_varlen_string_decode.h include/snort/service_inspectors/http2_inspect/http2_varlen_string_decode_impl.h +include/snort/service_inspectors/http_inspect/http_common.h +include/snort/service_inspectors/http_inspect/http_field.h +include/snort/service_inspectors/http_inspect/http_inspect_base.h +include/snort/service_inspectors/http_inspect/http_stream_splitter_base.h include/snort/service_inspectors/http_inspect/http_test_manager.h -include/snort/service_inspectors/netflow/netflow_cache.h -include/snort/service_inspectors/netflow/netflow_headers.h -include/snort/service_inspectors/netflow/netflow_module.h include/snort/service_inspectors/netflow/netflow_record.h include/snort/service_inspectors/ssl/ssl_flow_data.h include/snort/sfip/sf_cidr.h @@ -248,9 +228,6 @@ include/snort/sfip/sf_returns.h include/snort/stream/paf.h include/snort/stream/stream.h include/snort/stream/stream_splitter.h -include/snort/stream/udp/stream_udp.h -include/snort/stream/udp/udp_ha.h -include/snort/stream/udp/udp_module.h include/snort/stream/udp/udp_session.h include/snort/target_based/snort_protocols.h include/snort/time/clock_defs.h @@ -260,23 +237,13 @@ include/snort/time/stopwatch.h include/snort/trace/trace.h include/snort/trace/trace_api.h include/snort/trace/trace_logger.h -include/snort/utils/boyer_moore.h +include/snort/utils/bits.h include/snort/utils/cpp_macros.h include/snort/utils/endian.h -include/snort/utils/event_gen.h -include/snort/utils/infractions.h -include/snort/utils/kmap.h -include/snort/utils/memcap_allocator.h -include/snort/utils/primed_allocator.h include/snort/utils/safec.h -include/snort/utils/sflsq.h -include/snort/utils/stats.h include/snort/utils/util.h -include/snort/utils/util_ber.h include/snort/utils/util_cstring.h -include/snort/utils/util_numa.h include/snort/utils/util_unfold.h -include/snort/utils/util_utf.h lib/snort/daq/daq_file.so lib/snort/daq/daq_hext.so libdata/pkgconfig/snort.pc @@ -306,8 +273,8 @@ libdata/pkgconfig/snort.pc %%PORTDOCS%%%%DOCSDIR%%/file_processing.txt %%PORTDOCS%%%%DOCSDIR%%/ftp.txt %%PORTDOCS%%%%DOCSDIR%%/high_availability.txt -%%PORTDOCS%%%%DOCSDIR%%/http_inspect.txt %%PORTDOCS%%%%DOCSDIR%%/http2_inspect.txt +%%PORTDOCS%%%%DOCSDIR%%/http_inspect.txt %%PORTDOCS%%%%DOCSDIR%%/iec104.txt %%PORTDOCS%%%%DOCSDIR%%/js_norm.txt %%PORTDOCS%%%%DOCSDIR%%/mms.txt @@ -319,6 +286,9 @@ libdata/pkgconfig/snort.pc %%PORTDOCS%%%%DOCSDIR%%/sensitive_data.txt %%PORTDOCS%%%%DOCSDIR%%/side_channel.txt %%PORTDOCS%%%%DOCSDIR%%/smtp.txt +%%PORTDOCS%%%%DOCSDIR%%/snort2lua.txt +%%PORTDOCS%%%%DOCSDIR%%/snort2x.png +%%PORTDOCS%%%%DOCSDIR%%/snort3x.png %%PORTDOCS%%%%DOCSDIR%%/snort_devel.txt %%PORTDOCS%%%%DOCSDIR%%/snort_reference.text %%PORTDOCS%%%%DOCSDIR%%/snort_reference.txt @@ -326,9 +296,6 @@ libdata/pkgconfig/snort.pc %%PORTDOCS%%%%DOCSDIR%%/snort_upgrade.txt %%PORTDOCS%%%%DOCSDIR%%/snort_user.text %%PORTDOCS%%%%DOCSDIR%%/snort_user.txt -%%PORTDOCS%%%%DOCSDIR%%/snort2lua.txt -%%PORTDOCS%%%%DOCSDIR%%/snort2x.png -%%PORTDOCS%%%%DOCSDIR%%/snort3x.png %%PORTDOCS%%%%DOCSDIR%%/snorty.png %%PORTDOCS%%%%DOCSDIR%%/style.txt %%PORTDOCS%%%%DOCSDIR%%/telnet.txt @@ -336,4 +303,5 @@ libdata/pkgconfig/snort.pc %%PORTDOCS%%%%DOCSDIR%%/trace.txt %%PORTDOCS%%%%DOCSDIR%%/tutorial.txt %%PORTDOCS%%%%DOCSDIR%%/usage.txt +%%PORTDOCS%%%%DOCSDIR%%/versions.txt %%PORTDOCS%%%%DOCSDIR%%/wizard.txt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405271639.44RGdali011626>