FreeBSD Bugzilla – Attachment 147629 Details for
Bug 193220
security/suricata: Update to 2.0.4, Add OPTIONS: JSON GEOIP & HTP_PORT
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to bring suricata to version 2.0.4
suricata-2.0.4.patch (text/plain), 4.59 KB, created by
cheffo
on 2014-09-24 07:23:08 UTC
(
hide
)
Description:
Patch to bring suricata to version 2.0.4
Filename:
MIME Type:
Creator:
cheffo
Created:
2014-09-24 07:23:08 UTC
Size:
4.59 KB
patch
obsolete
>diff -urN /usr/ports/security/suricata/Makefile /usr/local/poudriere/ports/default/local/suricata/Makefile >--- /usr/ports/security/suricata/Makefile 2014-08-23 15:08:16.000000000 +0300 >+++ /usr/local/poudriere/ports/default/local/suricata/Makefile 2014-09-24 10:10:08.700207195 +0300 >@@ -2,7 +2,7 @@ > # $FreeBSD: head/security/suricata/Makefile 365723 2014-08-23 12:08:16Z koobs $ > > PORTNAME= suricata >-PORTVERSION= 2.0.3 >+PORTVERSION= 2.0.4 > CATEGORIES= security > MASTER_SITES= http://www.openinfosecfoundation.org/download/ \ > http://mirrors.rit.edu/zi/ >@@ -13,20 +13,22 @@ > 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} >@@ -43,10 +45,18 @@ > 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 \ >@@ -66,6 +76,12 @@ > > .include <bsd.port.pre.mk> > >+.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 >diff -urN /usr/ports/security/suricata/distinfo /usr/local/poudriere/ports/default/local/suricata/distinfo >--- /usr/ports/security/suricata/distinfo 2014-08-23 15:08:16.000000000 +0300 >+++ /usr/local/poudriere/ports/default/local/suricata/distinfo 2014-09-24 10:10:36.669185096 +0300 >@@ -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 >diff -urN /usr/ports/security/suricata/pkg-plist /usr/local/poudriere/ports/default/local/suricata/pkg-plist >--- /usr/ports/security/suricata/pkg-plist 2013-11-17 05:09:13.000000000 +0200 >+++ /usr/local/poudriere/ports/default/local/suricata/pkg-plist 2014-09-02 10:03:20.821756093 +0300 >@@ -28,6 +28,28 @@ > %%DOCSDIR%%/Ubuntu_Installation.txt > %%DOCSDIR%%/Ubuntu_Installation_from_GIT.txt > %%DOCSDIR%%/Windows.txt >+%%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 >+%%HTPPORT%%@dirrmtry include/htp > @unexec if cmp -s %D/etc/suricata/suricata.yaml-sample %D/etc/suricata/suricata.yaml; then rm -f %D/etc/suricata/suricata.yaml; fi > etc/suricata/suricata.yaml-sample > @exec if [ ! -f %D/etc/suricata/suricata.yaml ] ; then cp -p %D/%F %B/suricata.yaml; fi
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 193220
:
146629
|
146636
| 147629 |
148029