Attachment 146636 Details for Bug 193220 – new patch

[patch] new patch

suricata-2.0.3_1.patch (text/plain), 3.78 KB, created by cheffo on 2014-09-01 18:53:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: cheffo

Created: 2014-09-01 18:53:14 UTC

Size: 3.78 KB

patch

obsolete

>diff -uN suricata.orig/Makefile suricata/Makefile
>--- suricata.orig/Makefile	2014-08-23 12:08:16.000000000 +0000
>+++ suricata/Makefile	2014-09-01 21:06:28.185907822 +0000
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	suricata
> PORTVERSION=	2.0.3
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://www.openinfosecfoundation.org/download/ \
> 		http://mirrors.rit.edu/zi/
>@@ -13,20 +14,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 +46,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 +77,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
>Common subdirectories: suricata.orig/files and suricata/files
>diff -uN suricata.orig/pkg-plist suricata/pkg-plist
>--- suricata.orig/pkg-plist	2013-11-17 03:09:13.000000000 +0000
>+++ suricata/pkg-plist	2014-09-01 21:00:51.312932556 +0000
>@@ -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

Actions: View | Diff

Attachments on bug 193220: 146629 | 146636 | 147629 | 148029