Attachment 208708 Details for Bug 241595 – Patch fixing mod_security2 inclusion in nginx

[patch] Patch fixing mod_security2 inclusion in nginx

fix-modsecurity2-nginx-build.patch (text/plain), 2.46 KB, created by Felipe Zipitria on 2019-10-30 20:12:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felipe Zipitria

Created: 2019-10-30 20:12:47 UTC

Size: 2.46 KB

patch

obsolete

>From 2e0b5745b1f9e8a993531fbc955674524aaba3ec Mon Sep 17 00:00:00 2001
>From: Felipe Zipitria <fzipitria@perceptyx.com>
>Date: Tue, 1 Oct 2019 09:19:49 -0300
>Subject: [PATCH 1/2] Include modsecurity module in build, if configured
>
>---
> www/nginx/Makefile.extmod | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
>index dbc1728bd1f3..7d860ed0016b 100644
>--- a/www/nginx/Makefile.extmod
>+++ b/www/nginx/Makefile.extmod
>@@ -224,6 +224,7 @@ MODSECURITY_MASTER_SITES=	http://www.modsecurity.org/tarball/${MODSECURITY_VERSI
> MODSECURITY_DISTFILES=		modsecurity-${MODSECURITY_VERSION}.tar.gz:modsecurity
> MODSECURITY_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-modsecurity-configure
> MODSECURITY_VARS=		WRKSRC_modsecurity=${WRKDIR}/modsecurity-${MODSECURITY_VERSION}
>+MODSECURITY_CONFIGURE_ON=	--add-module=${WRKDIR}/modsecurity-${MODSECURITY_VERSION}/nginx/modsecurity
> 
> MODSECURITY3_LIB_DEPENDS=	libmodsecurity.so:security/modsecurity3
> MODSECURITY3_GH_TUPLE=		SpiderLabs:ModSecurity-nginx:71ede63:modsec
>-- 
>2.21.0
>
>
>From 3629edc90f686a2c631d81878c1c8fdc6b77c553 Mon Sep 17 00:00:00 2001
>From: Felipe Zipitria <fzipitria@perceptyx.com>
>Date: Tue, 1 Oct 2019 09:20:33 -0300
>Subject: [PATCH 2/2] Add unicode.mapping to package if modsecurity2 configured
>
>---
> www/nginx/Makefile  | 5 +++++
> www/nginx/pkg-plist | 1 +
> 2 files changed, 6 insertions(+)
>
>diff --git a/www/nginx/Makefile b/www/nginx/Makefile
>index 9c95f9dbe4fc..ea5e08ab8350 100644
>--- a/www/nginx/Makefile
>+++ b/www/nginx/Makefile
>@@ -356,6 +356,11 @@ do-install-NAXSI-on:
> 	${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_config/naxsi_core.rules \
> 	${STAGEDIR}${ETCDIR}
> 
>+do-install-MODSECURITY-on:
>+	${INSTALL_DATA} \
>+  ${WRKDIR}/modsecurity-${MODSECURITY_VERSION}/unicode.mapping \
>+	${STAGEDIR}${ETCDIR}
>+
> post-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles
> 	cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles
>diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist
>index e6292a862fe2..62636f9572cf 100644
>--- a/www/nginx/pkg-plist
>+++ b/www/nginx/pkg-plist
>@@ -6,6 +6,7 @@
> @sample %%ETCDIR%%/scgi_params-dist %%ETCDIR%%/scgi_params
> @sample %%ETCDIR%%/uwsgi_params-dist %%ETCDIR%%/uwsgi_params
> %%ETCDIR%%/win-utf
>+%%MODSECURITY%%%%ETCDIR%%/unicode.mapping
> @sample %%ETCDIR%%/mime.types-dist %%ETCDIR%%/mime.types
> @sample %%ETCDIR%%/nginx.conf-dist %%ETCDIR%%/nginx.conf
> %%DSO%%%%ARRAYVAR%%libexec/nginx/ngx_http_array_var_module.so
>-- 
>2.21.0
>

Actions: View | Diff

Attachments on bug 241595: 208708