]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #2052 in SNORT/snort3 from ~MIALTIZE/snort3:freebsd_osx to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 6 Mar 2020 00:21:31 +0000 (00:21 +0000)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 6 Mar 2020 00:21:31 +0000 (00:21 +0000)
commitbafa88dae9790039467f5cc6882c0a08ae3c8333
tree6343cccd917bb70aca758cb84ec2043217a775f5
parent88d2712ea0a0c7280e10c4576bc69dca9a3212b8
Merge pull request #2052 in SNORT/snort3 from ~MIALTIZE/snort3:freebsd_osx to master

Squashed commit of the following:

commit 23b466c713fcf8ffeed1c3c3f07dc04cdf506d4e
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Mar 2 10:07:34 2020 -0500

    build: Fix various build issues on FreeBSD and OS X

commit 0dd9359134dc17194fa31f75d65e6f752675c7af
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Mar 2 10:07:34 2020 -0500

    build: Fix LibUUID detection on OS X

commit 30ebcc7187ec3127571caaa8d18aa3fb6516170d
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Mar 2 10:07:34 2020 -0500

    http_inspect: Properly mock HttpModule::peg_counts in http_transaction_test
23 files changed:
cmake/FindUUID.cmake
cmake/sanity_checks.cmake
src/connectors/file_connector/test/file_connector_module_test.cc
src/connectors/file_connector/test/file_connector_test.cc
src/connectors/tcp_connector/test/tcp_connector_module_test.cc
src/connectors/tcp_connector/test/tcp_connector_test.cc
src/flow/test/ha_test.cc
src/flow/test/session_test.cc
src/host_tracker/test/host_cache_module_test.cc
src/host_tracker/test/host_cache_test.cc
src/ips_options/test/ips_regex_test.cc
src/main/analyzer.cc
src/managers/module_manager.cc
src/network_inspectors/appid/detector_plugins/http_url_patterns.cc
src/network_inspectors/appid/test/appid_mock_definitions.h
src/network_inspectors/appid/test/appid_mock_session.h
src/network_inspectors/appid/test/tp_mock.cc
src/network_inspectors/rna/rna_logger.cc
src/network_inspectors/rna/rna_pnd.cc
src/search_engines/test/hyperscan_test.cc
src/search_engines/test/search_tool_test.cc
src/service_inspectors/http_inspect/test/http_transaction_test.cc
src/service_inspectors/sip/test/sip_splitter_test.h