Index: head/security/suricata/Makefile =================================================================== --- head/security/suricata/Makefile (revision 372452) +++ head/security/suricata/Makefile (revision 372453) @@ -1,95 +1,111 @@ # Created by: Patrick Tracanelli # $FreeBSD$ PORTNAME= suricata -PORTVERSION= 2.0.3 +PORTVERSION= 2.0.4 CATEGORIES= security MASTER_SITES= http://www.openinfosecfoundation.org/download/ \ http://mirrors.rit.edu/zi/ MAINTAINER= koobs@FreeBSD.org COMMENT= High Performance Network IDS, IPS and Security Monitoring engine LICENSE= GPLv2 LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre \ - libhtp.so:${PORTSDIR}/devel/libhtp \ libnet.so:${PORTSDIR}/net/libnet \ libyaml.so:${PORTSDIR}/textproc/libyaml -OPTIONS_DEFINE= IPFW PRELUDE PORTS_PCAP TESTS -OPTIONS_DEFAULT=IPFW PRELUDE +OPTIONS_DEFINE= IPFW PRELUDE PORTS_PCAP TESTS JSON GEOIP HTP_PORT +OPTIONS_DEFAULT=IPFW PRELUDE HTP_PORT OPTIONS_SUB= yes IPFW_DESC= Enable IPFW and IP Divert support for inline IDP PRELUDE_DESC= Enable Prelude support for NIDS alerts PORTS_PCAP_DESC=Use libpcap from ports TESTS_DESC= Enable unit tests in suricata binary +JSON_DESC= Enable Suricata JSON output +GEOIP_DESC= Enable GeoIP support for Suricata +HTP_PORT_DESC= Use libhtp from ports instead of bundled -USES= gmake pkgconfig libtool +USES= gmake pkgconfig libtool pathfix USE_AUTOTOOLS= aclocal autoconf automake USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes IPFW_CONFIGURE_ON= --enable-ipfw PORTS_PCAP_CONFIGURE_ON= --with-libpcap-includes=${LOCALBASE}/include \ --with-libpcap-libraries=${LOCALBASE}/lib PORTS_PCAP_CONFIGURE_OFF= --with-libpcap-includes=/usr/include \ --with-libpcap-libraries=/usr/lib PORTS_PCAP_LIB_DEPENDS= libpcap.so:${PORTSDIR}/net/libpcap PRELUDE_LIB_DEPENDS= libprelude.so:${PORTSDIR}/security/libprelude PRELUDE_CONFIGURE_ENABLE= prelude PRELUDE_CONFIGURE_ON= --with-libprelude-prefix=${LOCALBASE} TESTS_CONFIGURE_ENABLE= unittests +JSON_CONFIGURE_OFF= --with-libjansson-includes=${LOCALBASE}/include \ + --with-libjansson-libraries=${LOCALBASE}/lib +JSON_LIB_DEPENDS= libjansson.so:${PORTSDIR}/devel/jansson +GEOIP_CONFIGURE_ON= --enable-geoip +GEOIP_LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP +HTP_PORT_CONFIGURE_ON= --enable-non-bundled-htp +HTP_PORT_LIB_DEPENDS= libhtp.so:${PORTSDIR}/devel/libhtp +HTP_PORT_CONFLICT_OFF= libhtp-[0-9]* libhtp-suricata SUB_FILES= pkg-message -CONFIGURE_ARGS+=--enable-non-bundled-htp --enable-gccprotect \ +CONFIGURE_ARGS+=--enable-gccprotect \ --with-libpcre-includes=${LOCALBASE}/include \ --with-libpcre-libraries=${LOCALBASE}/lib \ --with-libyaml-includes=${LOCALBASE}/include \ --with-libyaml-libraries=${LOCALBASE}/lib \ --with-libnet-includes=${LOCALBASE}/include/libnet11 \ --with-libnet-libraries=${LOCALBASE}/lib/libnet11 \ --with-libhtp-includes=${LOCALBASE}/include/ \ --with-libhtp-libraries=${LOCALBASE}/lib \ --localstatedir=/var/ CONFIGURE_ENV+= ac_cv_path_HAVE_PYTHON_CONFIG=no LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config CONFIG_DIR?= ${ETCDIR} CONFIG_FILES= suricata.yaml classification.config reference.config RULES_DIR= ${CONFIG_DIR}/rules LOGS_DIR?= /var/log/${PORTNAME} .include +.if ${PORT_OPTIONS:MHTP_PORT} +PLIST_SUB+= HTPPORT="@comment " +.else +PLIST_SUB+= HTPPORT="" +.endif + .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not compile on ia64, powerpc, or sparc64 .endif pre-patch: ${CP} ${FILESDIR}/ax_check_compile_flag.m4 ${WRKSRC}/m4 pre-install: @${REINPLACE_CMD} -e 's|/etc/suricata|${CONFIG_DIR}|g' ${WRKSRC}/suricata.yaml post-install: ${MKDIR} ${STAGEDIR}${CONFIG_DIR} ${MKDIR} ${STAGEDIR}${RULES_DIR} .for f in ${CONFIG_FILES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${CONFIG_DIR}/${f}-sample + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${CONFIG_DIR}/${f}.sample .endfor TMPDIR?= /tmp TESTDIR= ${TMPDIR}/${PORTNAME} regression-test: build ${RM} -rf ${TESTDIR} ${MKDIR} ${TESTDIR} cd ${WRKSRC}/src && ./suricata -u -l ${TESTDIR} ${RM} -rf ${TESTDIR} .include Index: head/security/suricata/distinfo =================================================================== --- head/security/suricata/distinfo (revision 372452) +++ head/security/suricata/distinfo (revision 372453) @@ -1,2 +1,2 @@ -SHA256 (suricata-2.0.3.tar.gz) = b6e554cbacb925bbcf88dd4554c9222b51b21796c39e198cdf5b0b9cdc1ed383 -SIZE (suricata-2.0.3.tar.gz) = 3083891 +SHA256 (suricata-2.0.4.tar.gz) = 677d97a829d9e05f664c82eb0372e870d5f6e9501ccee20130dfde4014bd5084 +SIZE (suricata-2.0.4.tar.gz) = 3085919 Index: head/security/suricata/pkg-plist =================================================================== --- head/security/suricata/pkg-plist (revision 372452) +++ head/security/suricata/pkg-plist (revision 372453) @@ -1,34 +1,55 @@ bin/suricata %%DOCSDIR%%/AUTHORS %%DOCSDIR%%/Basic_Setup.txt %%DOCSDIR%%/CentOS5.txt %%DOCSDIR%%/CentOS_56_Installation.txt %%DOCSDIR%%/Debian_Installation.txt %%DOCSDIR%%/Fedora_Core.txt %%DOCSDIR%%/FreeBSD_8.txt %%DOCSDIR%%/GITGUIDE %%DOCSDIR%%/HTP_library_installation.txt %%DOCSDIR%%/INSTALL %%DOCSDIR%%/INSTALL.PF_RING %%DOCSDIR%%/INSTALL.WINDOWS %%DOCSDIR%%/Installation_from_GIT_with_PCRE-JIT.txt %%DOCSDIR%%/Installation_from_GIT_with_PF_RING_on_Ubuntu_server_1104.txt %%DOCSDIR%%/Installation_with_CUDA_and_PFRING_on_Scientific_Linux_6.txt %%DOCSDIR%%/Installation_with_CUDA_and_PF_RING_on_Ubuntu_server_1104.txt %%DOCSDIR%%/Installation_with_CUDA_on_Scientific_Linux_6.txt %%DOCSDIR%%/Installation_with_CUDA_on_Ubuntu_server_1104.txt %%DOCSDIR%%/Installation_with_PF_RING.txt %%DOCSDIR%%/Mac_OS_X_106x.txt %%DOCSDIR%%/NEWS %%DOCSDIR%%/OpenBSD_Installation_from_GIT.txt %%DOCSDIR%%/README %%DOCSDIR%%/Setting_up_IPSinline_for_Linux.txt %%DOCSDIR%%/TODO %%DOCSDIR%%/Third_Party_Installation_Guides.txt %%DOCSDIR%%/Ubuntu_Installation.txt %%DOCSDIR%%/Ubuntu_Installation_from_GIT.txt %%DOCSDIR%%/Windows.txt -@sample etc/suricata/suricata.yaml-sample -@sample etc/suricata/classification.config-sample -@sample etc/suricata/reference.config-sample +%%HTPPORT%%include/htp/bstr.h +%%HTPPORT%%include/htp/bstr_builder.h +%%HTPPORT%%include/htp/htp.h +%%HTPPORT%%include/htp/htp_base64.h +%%HTPPORT%%include/htp/htp_config.h +%%HTPPORT%%include/htp/htp_connection_parser.h +%%HTPPORT%%include/htp/htp_core.h +%%HTPPORT%%include/htp/htp_decompressors.h +%%HTPPORT%%include/htp/htp_hooks.h +%%HTPPORT%%include/htp/htp_list.h +%%HTPPORT%%include/htp/htp_multipart.h +%%HTPPORT%%include/htp/htp_table.h +%%HTPPORT%%include/htp/htp_transaction.h +%%HTPPORT%%include/htp/htp_urlencoded.h +%%HTPPORT%%include/htp/htp_utf8_decoder.h +%%HTPPORT%%include/htp/htp_version.h +%%HTPPORT%%lib/libhtp-0.5.15.so.1 +%%HTPPORT%%lib/libhtp-0.5.15.so.1.0.0 +%%HTPPORT%%lib/libhtp.a +%%HTPPORT%%lib/libhtp.so +%%HTPPORT%%libdata/pkgconfig/htp.pc +@sample etc/suricata/suricata.yaml.sample +@sample etc/suricata/classification.config.sample +@sample etc/suricata/reference.config.sample @dir etc/suricata/rules