Attachment 221451 Details for Bug 252571 – patch to the ports tree

[patch] patch to the ports tree

security_suricata.svndiff (text/plain), 4.95 KB, created by Fernando Apesteguía on 2021-01-11 10:01:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Apesteguía

Created: 2021-01-11 10:01:04 UTC

Size: 4.95 KB

patch

obsolete

>Index: security/suricata/Makefile
>===================================================================
>--- security/suricata/Makefile	(revisiÃ³n: 561189)
>+++ security/suricata/Makefile	(copia de trabajo)
>@@ -19,30 +19,37 @@
> 		liblz4.so:archivers/liblz4 \
> 		libyaml.so:textproc/libyaml
> 
>-USES=		autoreconf cpe gmake iconv:translit libtool pathfix pkgconfig
>+USES=		autoreconf cpe gmake iconv:translit libtool localbase \
>+		pathfix pkgconfig
> 
>-CONFLICTS_INSTALL=	libhtp
>+CPE_VENDOR=	openinfosecfoundation
> 
> USE_LDCONFIG=	yes
> USE_RC_SUBR=	${PORTNAME}
>-PLIST_SUB=	PORTVERSION=${DISTVERSION:C/-/_/g}
> 
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS+=--enable-gccprotect \
>+		--enable-bundled-htp \
>+	        --disable-gccmarch-native
> 
>-CPE_VENDOR=	openinfosecfoundation
>-
> INSTALL_TARGET=		install-strip
> TEST_TARGET=		check
> 
>+CONFLICTS_INSTALL=	libhtp
>+
>+SUB_FILES=	pkg-message
>+PLIST_SUB=	PORTVERSION=${DISTVERSION:C/-/_/g}
>+
> OPTIONS_DEFINE=		GEOIP IPFW NETMAP NSS PORTS_PCAP PRELUDE \
> 			PYTHON REDIS TESTS
> OPTIONS_DEFINE_amd64=	HYPERSCAN
> OPTIONS_DEFAULT=	IPFW NETMAP PYTHON
>-OPTIONS_SUB=		yes
> 
> OPTIONS_RADIO=		SCRIPTS
> OPTIONS_RADIO_SCRIPTS=	LUA LUAJIT
> 
>+OPTIONS_SUB=		yes
>+
> GEOIP_DESC=		GeoIP support
> HYPERSCAN_DESC=		Hyperscan support
> IPFW_DESC=		IPFW and IP Divert support for inline IDP
>@@ -61,34 +68,22 @@
> GEOIP_CONFIGURE_ON=		--enable-geoip
> 
> HYPERSCAN_LIB_DEPENDS=		libhs.so:devel/hyperscan
>-HYPERSCAN_CONFIGURE_ON=		--with-libhs-includes=${LOCALBASE}/include \
>-				--with-libhs-libraries=${LOCALBASE}/lib
> 
> IPFW_CONFIGURE_ON=		--enable-ipfw
> 
>+LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:lang/luajit
>+LUAJIT_CONFIGURE_ON=		--enable-luajit
>+
> LUA_USES=			lua:51
> LUA_CONFIGURE_ON=		--enable-lua \
>-				--with-liblua-includes=${LUA_INCDIR} \
>-				--with-liblua-libraries=${LUA_LIBDIR}
> 
>-LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:lang/luajit
>-LUAJIT_CONFIGURE_ON=		--enable-luajit
>+NETMAP_CONFIGURE_ENABLE=	netmap
> 
> NSS_LIB_DEPENDS=		libnss3.so:security/nss \
> 				libnspr4.so:devel/nspr
> NSS_CONFIGURE_OFF=		--disable-nss --disable-nspr
>-NSS_CONFIGURE_ON=		--with-libnss-includes=${LOCALBASE}/include/nss/nss \
>-				--with-libnss-libraries=${LOCALBASE}/lib \
>-				--with-libnspr-libraries=${LOCALBASE}/lib \
>-				--with-libnspr-includes=${LOCALBASE}/include/nspr
> 
>-NETMAP_CONFIGURE_ENABLE=	netmap
>-
> PORTS_PCAP_LIB_DEPENDS=		libpcap.so.1:net/libpcap
>-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
> 
> PRELUDE_LIB_DEPENDS=		libprelude.so:security/libprelude \
> 				libgnutls.so:security/gnutls \
>@@ -95,44 +90,26 @@
> 				libgcrypt.so:security/libgcrypt \
> 				libgpg-error.so:security/libgpg-error \
> 				libltdl.so:devel/libltdl
>+PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
> PRELUDE_CONFIGURE_ENABLE=	prelude
>-PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
> 
>+PYTHON_BUILD_DEPENDS=		${PYTHON_RUN_DEPENDS}
>+PYTHON_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
> PYTHON_USES=			python
> PYTHON_USE=			PYTHON=py3kplist
> PYTHON_CONFIGURE_ENABLE=	python
>-PYTHON_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
>-PYTHON_BUILD_DEPENDS=		${PYTHON_RUN_DEPENDS}
> 
> REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
> REDIS_CONFIGURE_ON=		--enable-hiredis \
>-				--with-libhiredis-includes=${LOCALBASE}/include \
>-				--with-libhiredis-libraries=${LOCALBASE}/lib
> 
> TESTS_CONFIGURE_ENABLE=		unittests
> 
>-SUB_FILES=	pkg-message
>-
>-CONFIGURE_ARGS+=--enable-gccprotect \
>-		--enable-bundled-htp \
>-		--with-libjansson-includes=${LOCALBASE}/include \
>-		--with-libjansson-libraries=${LOCALBASE}/lib \
>-		--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 \
>-		--with-libnet-libraries=${LOCALBASE}/lib \
>-		--with-libhtp-includes=${LOCALBASE}/include/ \
>-		--with-libhtp-libraries=${LOCALBASE}/lib \
>-	        --disable-gccmarch-native
>-
> pre-patch:
> 	@${CP} ${FILESDIR}/ax_check_compile_flag.m4 ${WRKSRC}/m4
> 
> post-patch-PYTHON-on:
> 	@${REINPLACE_CMD} -e "/AC_PATH_PROGS.*HAVE_PYTHON/ s/python[^,]*,/${PYTHON_VERSION},/g" \
>-		${WRKSRC}/configure.ac
>+       		${WRKSRC}/configure.ac
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/var/log/suricata
>Index: security/suricata/files/patch-src_suricata-common.h
>===================================================================
>--- security/suricata/files/patch-src_suricata-common.h	(revisiÃ³n: 561189)
>+++ security/suricata/files/patch-src_suricata-common.h	(copia de trabajo)
>@@ -1,5 +1,5 @@
>---- src/suricata-common.h-orig	2020-10-25 16:56:49.454317000 +0100
>-+++ src/suricata-common.h	2020-10-25 16:57:06.035153000 +0100
>+--- src/suricata-common.h.orig	2020-12-04 07:11:05 UTC
>++++ src/suricata-common.h
> @@ -36,6 +36,8 @@
>  #define _GNU_SOURCE
>  #define __USE_GNU

Actions: View | Diff

Attachments on bug 252571: 221451