Index: security/snort3/Makefile =================================================================== --- security/snort3/Makefile +++ security/snort3/Makefile @@ -5,7 +5,7 @@ DISTVERSION= 3.0.3-6 PORTEPOCH= 1 CATEGORIES= security -PKGNAMESUFFIX= 3 +PKGNAMESUFFIX= 3-snort2lua MAINTAINER= bofh@FreeBSD.org COMMENT= Lightweight network intrusion detection system @@ -13,12 +13,12 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libpcre.so:devel/pcre \ - libdnet.so:net/libdnet \ - libpcap.so:net/libpcap \ - libhwloc.so:devel/hwloc \ - libuuid.so:misc/e2fsprogs-libuuid \ - libdaq.so:net/libdaq +BUILD_DEPENDS= pcre-config:devel/pcre \ + dnet-config:net/libdnet \ + pcap-config:net/libpcap \ + hwloc-annotate:devel/hwloc \ + uuidgen:misc/e2fsprogs-libuuid \ + daqtest:net/libdaq USES= cmake compiler:c++14-lang cpe localbase pathfix pkgconfig shebangfix ssl iconv USE_GITHUB= yes @@ -52,16 +52,16 @@ TSC_CMAKE_BOOL= ENABLE_TSC_CLOCK FLATBUFFERS_LIB_DEPENDS=libflatbuffers.so:devel/flatbuffers -HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan +#HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan -CONFLICTS= snort-2* +#CONFLICTS= snort-2* .include .if ${ARCH} == powerpc64 -LIB_DEPENDS+= libluajit-5.1.so:lang/luajit-openresty +BUILD_DEPENDS+= luajit:lang/luajit-openresty .else -LIB_DEPENDS+= libluajit-5.1.so:lang/luajit +BUILD_DEPENDS+= luajit:lang/luajit .endif .if ${PORT_OPTIONS:MHYPERSCAN} @@ -73,5 +73,8 @@ post-patch: ${REINPLACE_CMD} -e 's|_LIBDIR}/pkgconfig|_PREFIX}/libdata/pkgconfig|g' \ ${WRKSRC}/cmake/create_pkg_config.cmake + +do-install: + ${INSTALL_PROGRAM} ${WRKDIR}/.build/tools/snort2lua/snort2lua ${STAGEDIR}${PREFIX}/bin .include Index: security/snort3/pkg-plist =================================================================== --- security/snort3/pkg-plist +++ security/snort3/pkg-plist @@ -1,277 +1 @@ -bin/appid_detector_builder.sh -bin/snort bin/snort2lua -bin/u2boat -bin/u2spewfoo -%%ETCDIR%%/balanced.lua -%%ETCDIR%%/connectivity.lua -%%ETCDIR%%/file_magic.lua -%%ETCDIR%%/inline.lua -%%ETCDIR%%/max_detect.lua -%%ETCDIR%%/security.lua -%%ETCDIR%%/snort.lua -%%ETCDIR%%/snort_defaults.lua -%%ETCDIR%%/talos.lua -include/snort/actions/actions.h -include/snort/codecs/codec_module.h -include/snort/daqs/daq_user.h -include/snort/decompress/file_decomp.h -include/snort/detection/detect.h -include/snort/detection/detect_trace.h -include/snort/detection/detection_engine.h -include/snort/detection/detection_options.h -include/snort/detection/detection_util.h -include/snort/detection/ips_context.h -include/snort/detection/ips_context_chain.h -include/snort/detection/ips_context_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_policy.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/flow.h -include/snort/flow/flow_data.h -include/snort/flow/flow_key.h -include/snort/flow/flow_stash.h -include/snort/flow/ha.h -include/snort/flow/stash_item.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 -include/snort/framework/cursor.h -include/snort/framework/data_bus.h -include/snort/framework/decode_data.h -include/snort/framework/endianness.h -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/range.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/hash/lru_cache_shared.h -include/snort/hash/xhash.h -include/snort/helpers/base64_encoder.h -include/snort/helpers/boyer_moore_search.h -include/snort/helpers/json_stream.h -include/snort/helpers/literal_search.h -include/snort/helpers/scratch_allocator.h -include/snort/host_tracker/host_cache.h -include/snort/host_tracker/host_cache_allocator.h -include/snort/host_tracker/host_cache_interface.h -include/snort/host_tracker/host_tracker.h -include/snort/log/log.h -include/snort/log/log_text.h -include/snort/log/messages.h -include/snort/log/obfuscator.h -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_command.h -include/snort/main/policy.h -include/snort/main/request.h -include/snort/main/snort.h -include/snort/main/snort_config.h -include/snort/main/snort_debug.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/inspector_manager.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 -include/snort/mime/file_mime_process.h -include/snort/network_inspectors/appid/appid_api.h -include/snort/network_inspectors/appid/appid_app_descriptor.h -include/snort/network_inspectors/appid/appid_dns_session.h -include/snort/network_inspectors/appid/appid_http_session.h -include/snort/network_inspectors/appid/appid_session_api.h -include/snort/network_inspectors/appid/appid_types.h -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/network_inspectors/packet_tracer/packet_tracer.h -include/snort/network_inspectors/reputation/reputation_common.h -include/snort/network_inspectors/rna/rna_fingerprint.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_inspector.h -include/snort/network_inspectors/rna/rna_logger.h -include/snort/network_inspectors/rna/rna_name.h -include/snort/packet_io/active.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 -include/snort/profiler/profiler_defs.h -include/snort/profiler/rule_profiler_defs.h -include/snort/profiler/time_profiler_defs.h -include/snort/protocols/arp.h -include/snort/protocols/bpdu.h -include/snort/protocols/cdp.h -include/snort/protocols/cisco_meta_data.h -include/snort/protocols/eapol.h -include/snort/protocols/eth.h -include/snort/protocols/gre.h -include/snort/protocols/icmp4.h -include/snort/protocols/icmp6.h -include/snort/protocols/ip.h -include/snort/protocols/ipv4.h -include/snort/protocols/ipv4_options.h -include/snort/protocols/ipv6.h -include/snort/protocols/layer.h -include/snort/protocols/linux_sll.h -include/snort/protocols/mpls.h -include/snort/protocols/packet.h -include/snort/protocols/packet_manager.h -include/snort/protocols/protocol_ids.h -include/snort/protocols/ssl.h -include/snort/protocols/tcp.h -include/snort/protocols/tcp_options.h -include/snort/protocols/teredo.h -include/snort/protocols/token_ring.h -include/snort/protocols/udp.h -include/snort/protocols/vlan.h -include/snort/protocols/wlan.h -include/snort/pub_sub/appid_events.h -include/snort/pub_sub/cip_events.h -include/snort/pub_sub/daq_message_event.h -include/snort/pub_sub/data_decrypt_event.h -include/snort/pub_sub/dcerpc_events.h -include/snort/pub_sub/dhcp_events.h -include/snort/pub_sub/expect_events.h -include/snort/pub_sub/finalize_packet_event.h -include/snort/pub_sub/http_events.h -include/snort/pub_sub/opportunistic_tls_event.h -include/snort/pub_sub/sip_events.h -include/snort/search_engines/search_common.h -include/snort/search_engines/search_tool.h -include/snort/sfip/sf_cidr.h -include/snort/sfip/sf_ip.h -include/snort/sfip/sf_returns.h -include/snort/stream/paf.h -include/snort/stream/stream.h -include/snort/stream/stream_splitter.h -include/snort/target_based/snort_protocols.h -include/snort/time/clock_defs.h -include/snort/time/packet_time.h -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/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/util_ber.h -include/snort/utils/primed_allocator.h -include/snort/utils/safec.h -include/snort/utils/segment_mem.h -include/snort/utils/sflsq.h -include/snort/utils/stats.h -include/snort/utils/util.h -include/snort/utils/util_cstring.h -include/snort/utils/util_jsnorm.h -include/snort/utils/util_unfold.h -include/snort/utils/util_utf.h -lib/snort/daqs/daq_file.so -lib/snort/daqs/daq_hext.so -libdata/pkgconfig/snort.pc -%%PORTDOCS%%%%DOCSDIR%%/README.u2boat -%%PORTDOCS%%%%DOCSDIR%%/active.txt -%%PORTDOCS%%%%DOCSDIR%%/appendix.txt -%%PORTDOCS%%%%DOCSDIR%%/appid.txt -%%PORTDOCS%%%%DOCSDIR%%/binder.txt -%%PORTDOCS%%%%DOCSDIR%%/building.txt -%%PORTDOCS%%%%DOCSDIR%%/byte_extract.txt -%%PORTDOCS%%%%DOCSDIR%%/byte_jump.txt -%%PORTDOCS%%%%DOCSDIR%%/byte_math.txt -%%PORTDOCS%%%%DOCSDIR%%/byte_options.txt -%%PORTDOCS%%%%DOCSDIR%%/byte_test.txt -%%PORTDOCS%%%%DOCSDIR%%/concepts.txt -%%PORTDOCS%%%%DOCSDIR%%/config_changes.txt -%%PORTDOCS%%%%DOCSDIR%%/connectors.txt -%%PORTDOCS%%%%DOCSDIR%%/daq.txt -%%PORTDOCS%%%%DOCSDIR%%/dcerpc.txt -%%PORTDOCS%%%%DOCSDIR%%/differences.txt -%%PORTDOCS%%%%DOCSDIR%%/dump_config.txt -%%PORTDOCS%%%%DOCSDIR%%/enviro.txt -%%PORTDOCS%%%%DOCSDIR%%/errors.txt -%%PORTDOCS%%%%DOCSDIR%%/extending.txt -%%PORTDOCS%%%%DOCSDIR%%/features.txt -%%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%%/overview.txt -%%PORTDOCS%%%%DOCSDIR%%/params.txt -%%PORTDOCS%%%%DOCSDIR%%/perf_monitor.txt -%%PORTDOCS%%%%DOCSDIR%%/pop_imap.txt -%%PORTDOCS%%%%DOCSDIR%%/port_scan.txt -%%PORTDOCS%%%%DOCSDIR%%/sensitive_data.txt -%%PORTDOCS%%%%DOCSDIR%%/side_channel.txt -%%PORTDOCS%%%%DOCSDIR%%/smtp.txt -%%PORTDOCS%%%%DOCSDIR%%/snort_devel.txt -%%PORTDOCS%%%%DOCSDIR%%/snort_reference.text -%%PORTDOCS%%%%DOCSDIR%%/snort_reference.txt -%%PORTDOCS%%%%DOCSDIR%%/snort_upgrade.text -%%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 -%%PORTDOCS%%%%DOCSDIR%%/terms.txt -%%PORTDOCS%%%%DOCSDIR%%/trace.txt -%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt -%%PORTDOCS%%%%DOCSDIR%%/usage.txt -%%PORTDOCS%%%%DOCSDIR%%/wizard.txt