Attachment 151734 Details for Bug 196801 – suricata-2.0.6.patch (2nd attempt)

[patch] suricata-2.0.6.patch (2nd attempt)

suricata-2.0.6.patch (text/plain), 6.44 KB, created by cheffo on 2015-01-16 13:02:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: cheffo

Created: 2015-01-16 13:02:11 UTC

Size: 6.44 KB

patch

obsolete

>diff -urN security/suricata.orig/Makefile security/suricata/Makefile
>--- security/suricata.orig/Makefile	2015-01-12 14:15:09.359194408 +0200
>+++ security/suricata/Makefile	2015-01-16 14:45:20.168870894 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	suricata
>-PORTVERSION=	2.0.5
>+PORTVERSION=	2.0.6
> CATEGORIES=	security
> MASTER_SITES=	http://www.openinfosecfoundation.org/download/ \
> 		http://mirrors.rit.edu/zi/
>@@ -24,18 +24,21 @@
> INSTALL_TARGET=		install-strip
> PATHFIX_MAKEFILEIN=	Makefile.am
> 
>-OPTIONS_DEFINE=		GEOIP HTP_PORT IPFW JSON NSS PORTS_PCAP PRELUDE TESTS
>-OPTIONS_DEFAULT=	HTP_PORT IPFW PRELUDE
>+OPTIONS_DEFINE=		GEOIP HTP_PORT IPFW JSON LUAJIT NSS NSPR PORTS_PCAP PRELUDE SC TESTS
>+OPTIONS_DEFAULT=	GEOIP HTP_PORT IPFW JSON LUAJIT NSS NSPR PRELUDE SC
> OPTIONS_SUB=		yes
> 
> GEOIP_DESC=		Enable GeoIP support
> HTP_PORT_DESC=		Use libhtp from ports
> IPFW_DESC=		Enable IPFW and IP Divert support for inline IDP
> JSON_DESC=		Enable JSON output
>-NSS_DESC=		Enable file checksums and SSL/TLS fingerprinting
>+LUAJIT_DESC=		LuaJIT support
>+NSS_DESC=		NSS crypto driver support
>+NSPR_DESC=		NSPR support
> PORTS_PCAP_DESC=	Use libpcap from ports
> PRELUDE_DESC=		Enable Prelude support for NIDS alerts
>-TESTS_DESC=		Build Unit Tests
>+SC_DESC=		Build and install suricatasc
>+TESTS_DESC=		Enable unit tests in suricata binary
> 
> GEOIP_LIB_DEPENDS=		libGeoIP.so:${PORTSDIR}/net/GeoIP
> GEOIP_CONFIGURE_ON=		--enable-geoip
>@@ -59,12 +62,23 @@
> PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
> 
> JSON_LIB_DEPENDS=		libjansson.so:${PORTSDIR}/devel/jansson
>-JSON_CONFIGURE_OFF=		--with-libjansson-includes=${LOCALBASE}/include	\
>+JSON_CONFIGURE_ON=		--with-libjansson-includes=${LOCALBASE}/include \
> 				--with-libjansson-libraries=${LOCALBASE}/lib
> 
>+LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:${PORTSDIR}/lang/luajit
>+LUAJIT_CONFIGURE_ON=		--enable-luajit
>+
> NSS_LIB_DEPENDS=		libnss3.so:${PORTSDIR}/security/nss
> NSS_CONFIGURE_ON=		--with-libnss-includes=${LOCALBASE}/include/nss/nss \
>-				--with-libnss-libraries=${LOCALBASE}/lib/nss \
>+				--with-libnss-libraries=${LOCALBASE}/lib
>+
>+NSPR_LIB_DEPENDS=		libnspr4.so:${PORTSDIR}/devel/nspr
>+NSPR_CONFIGURE_ON=		--with-libnspr-libraries=${LOCALBASE}/lib \
>+				--with-libnspr-includes=${LOCALBASE}/include/nspr
>+
>+SC_USES=			python
>+SC_CONFIGURE_ENV=		ac_cv_path_HAVE_PYTHON_CONFIG=yes
>+SC_CONFIGURE_ENV_OFF=		ac_cv_path_HAVE_PYTHON_CONFIG=no
> 
> TESTS_CONFIGURE_ENABLE=		unittests
> 
>@@ -80,7 +94,6 @@
> 		--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}
>@@ -98,12 +111,10 @@
> 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}
>+	${MKDIR} ${STAGEDIR}${LOGS_DIR}
> .for f in ${CONFIG_FILES}
> 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${CONFIG_DIR}/${f}.sample
> .endfor
>@@ -111,6 +122,12 @@
> 	${INSTALL_DATA} ${WRKSRC}/rules/${f} ${STAGEDIR}${RULES_DIR}/${f}
> .endfor
> 
>+.if ${PORT_OPTIONS:MSC}
>+	(cd ${STAGEDIR}${PREFIX} \
>+	&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
>+	-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
>+.endif
>+
> TMPDIR?=	/tmp
> TESTDIR=	${TMPDIR}/${PORTNAME}
> 
>diff -urN security/suricata.orig/distinfo security/suricata/distinfo
>--- security/suricata.orig/distinfo	2015-01-12 14:15:09.359194408 +0200
>+++ security/suricata/distinfo	2015-01-15 12:02:30.904121000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (suricata-2.0.5.tar.gz) = 57b1120e91bd4e348e1a4cee9eb7b197d05fc25169e062f1a11f5dd4b9322c60
>-SIZE (suricata-2.0.5.tar.gz) = 3090118
>+SHA256 (suricata-2.0.6.tar.gz) = e833e35ea3b6029bbdef81660af22e8f563494eac85d97618d761ce1b69c78ec
>+SIZE (suricata-2.0.6.tar.gz) = 3090886
>diff -urN security/suricata.orig/files/patch-scripts_suricatasc_suricatasc.in security/suricata/files/patch-scripts_suricatasc_suricatasc.in
>--- security/suricata.orig/files/patch-scripts_suricatasc_suricatasc.in	1970-01-01 02:00:00.000000000 +0200
>+++ security/suricata/files/patch-scripts_suricatasc_suricatasc.in	2014-12-19 17:50:57.662156000 +0200
>@@ -0,0 +1,11 @@
>+--- scripts/suricatasc/suricatasc.in.orig	2014-12-19 17:49:20.651663649 +0200
>++++ scripts/suricatasc/suricatasc.in	2014-12-19 17:49:59.921665563 +0200
>+@@ -24,7 +24,7 @@
>+ args = parser.parse_args()
>+ 
>+ if args.socket != None:
>+-    SOCKET_PATH = "@e_localstatedir@/" + args.socket[0]
>++    SOCKET_PATH = args.socket
>+ else:
>+     SOCKET_PATH = "@e_localstatedir@/suricata-command.socket"
>+ 
>diff -urN security/suricata.orig/pkg-plist security/suricata/pkg-plist
>--- security/suricata.orig/pkg-plist	2015-01-12 14:15:09.359194408 +0200
>+++ security/suricata/pkg-plist	2015-01-16 14:51:59.493401246 +0200
>@@ -1,4 +1,5 @@
> bin/suricata
>+%%SC%%bin/suricatasc
> %%DOCSDIR%%/AUTHORS
> %%DOCSDIR%%/Basic_Setup.txt
> %%DOCSDIR%%/CentOS5.txt
>@@ -49,14 +50,24 @@
> %%NO_HTP_PORT%%lib/libhtp.a
> %%NO_HTP_PORT%%lib/libhtp.so
> %%NO_HTP_PORT%%libdata/pkgconfig/htp.pc
>-@sample etc/suricata/suricata.yaml.sample
>-@sample etc/suricata/classification.config.sample
>-@sample etc/suricata/reference.config.sample
>-etc/suricata/rules/decoder-events.rules
>-etc/suricata/rules/dns-events.rules
>-etc/suricata/rules/files.rules
>-etc/suricata/rules/http-events.rules
>-etc/suricata/rules/smtp-events.rules
>-etc/suricata/rules/stream-events.rules
>-etc/suricata/rules/tls-events.rules
>+%%NO_HTP_PORT%%@dir include/htp
>+%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc-0.9-py%%PYTHON_VER%%.egg-info
>+%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.py
>+%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/__init__.pyc
>+%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/suricatasc.py
>+%%SC%%%%PYTHON_SITELIBDIR%%/suricatasc/suricatasc.pyc
>+@sample %%ETCDIR%%/suricata.yaml.sample
>+@sample %%ETCDIR%%/classification.config.sample
>+@sample %%ETCDIR%%/reference.config.sample
>+%%ETCDIR%%/rules/decoder-events.rules
>+%%ETCDIR%%/rules/dns-events.rules
>+%%ETCDIR%%/rules/files.rules
>+%%ETCDIR%%/rules/http-events.rules
>+%%ETCDIR%%/rules/smtp-events.rules
>+%%ETCDIR%%/rules/stream-events.rules
>+%%ETCDIR%%/rules/tls-events.rules
> @dir etc/suricata/rules
>+@dir etc/suricata
>+@dir(root,wheel,0700) /var/log/suricata
>+@unexec if [ -d %D/%%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/suricata`` to remove any configuration files left."; fi
>+@dir %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 196801: 151729 | 151730 | 151734 | 151735