Attachment 231054 Details for Bug 261254 – patch for modsecurity3-nginx 1.0.2

[patch] patch for modsecurity3-nginx 1.0.2

modsecurity3-nginx.diff (text/plain), 4.49 KB, created by Chris Moerz on 2022-01-16 19:53:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Moerz

Created: 2022-01-16 19:53:44 UTC

Size: 4.49 KB

patch

obsolete

>diff --git a/security/modsecurity3-nginx/Makefile b/security/modsecurity3-nginx/Makefile
>index 6bc7daebbb..fbcc77928a 100644
>--- a/security/modsecurity3-nginx/Makefile
>+++ b/security/modsecurity3-nginx/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	modsecurity3-nginx
> DISTVERSION=	1.0.2
>-PORTREVISION=	0
>+PORTREVISION=	1
> CATEGORIES=	security www
> MASTER_SITES=	http://nginx.org/download/
> DISTFILES=	${_NGINX_DISTNAME}${EXTRACT_SUFX}
>@@ -21,48 +21,25 @@ GH_TUPLE=	SpiderLabs:ModSecurity-nginx:v1.0.1:modsecurity3
> 
> HAS_CONFIGURE=	yes
> # Most arguments should be derived from www/nginx's Makefile to be in sync
>-CONFIGURE_ARGS+=	--prefix=${PREFIX}/etc/nginx \
>-			--with-cc-opt="-I ${LOCALBASE}/include" \
>-			--with-ld-opt="-L ${LOCALBASE}/lib" \
>-			--conf-path=${PREFIX}/etc/nginx.conf \
>-			--sbin-path=${PREFIX}/sbin/nginx \
>-			--pid-path=${_NGINX_RUNDIR}/nginx.pid \
>-			--error-log-path=${_NGINX_ERRORLOG} \
>-			--user=${WWWOWN} --group=${WWWGRP} \
>-			--modules-path=${_MODULESDIR} \
>-			--with-file-aio \
>-			--http-client-body-temp-path=${_NGINX_TMPDIR}/client_body_temp \
>-			--http-fastcgi-temp-path=${_NGINX_TMPDIR}/fastcgi_temp \
>-			--http-proxy-temp-path=${_NGINX_TMPDIR}/proxy_temp \
>-			--http-scgi-temp-path=${_NGINX_TMPDIR}/scgi_temp \
>-			--http-uwsgi-temp-path=${_NGINX_TMPDIR}/uwsgi_temp \
>-			--http-log-path=${_NGINX_ACCESSLOG} \
>-			--with-http_v2_module \
>-			--with-http_addition_module \
>-			--with-http_auth_request_module \
>-			--with-http_dav_module \
>-			--with-http_flv_module \
>-			--with-http_gunzip_module \
>-			--with-http_gzip_static_module \
>-			--with-http_mp4_module \
>-			--with-http_random_index_module \
>-			--with-http_realip_module \
>-			--with-pcre \
>-			--with-http_secure_link_module \
>-			--with-http_slice_module \
>-			--with-http_ssl_module \
>-			--with-http_stub_status_module \
>-			--with-http_sub_module \
>-			--without-mail_imap_module \
>-			--without-mail_pop3_module \
>-			--without-mail_smtp_module \
>-			--with-mail_ssl_module \
>-			--with-stream_ssl_module \
>-			--with-stream_ssl_preread_module \
>-			--with-threads \
>-			--with-mail=dynamic \
>-			--with-stream=dynamic \
>-			--add-dynamic-module=${WRKSRC_modsecurity3}
>+CONFIGURE_ARGS+=--prefix=${PREFIX}/etc/nginx --with-cc-opt="-I ${PREFIX}/include" \
>+		--with-ld-opt="-L ${PREFIX}/lib" --conf-path=${PREFIX}/etc/nginx/nginx.conf \
>+		--sbin-path=${PREFIX}/sbin/nginx --pid-path=${_NGINX_RUNDIR}/nginx.pid --error-log-path=${_NGINX_ERRORLOG} \
>+		--user=${WWWOWN} --group=${WWWGRP} --modules-path=${PREFIX}/libexec/nginx --with-file-aio \
>+		--http-client-body-temp-path=${_NGINX_TMPDIR}/client_body_temp \
>+		--http-fastcgi-temp-path=${_NGINX_TMPDIR}/fastcgi_temp \
>+		--http-proxy-temp-path=${_NGINX_TMPDIR}/proxy_temp \
>+		--http-scgi-temp-path=${_NGINX_TMPDIR}/scgi_temp --http-uwsgi-temp-path=${_NGINX_TMPDIR}/uwsgi_temp \
>+		--http-log-path=${_NGINX_ACCESSLOG} --with-http_v2_module \
>+		--with-http_addition_module --with-http_auth_request_module \
>+		--with-http_dav_module --with-http_flv_module --with-http_gunzip_module \
>+		--with-http_gzip_static_module --with-http_mp4_module --with-http_random_index_module \
>+		--with-http_realip_module --with-pcre --with-http_secure_link_module \
>+		--with-http_slice_module --with-http_ssl_module \
>+		--with-http_stub_status_module --with-http_sub_module --without-mail_imap_module \
>+		--without-mail_pop3_module --without-mail_smtp_module \
>+		--with-mail_ssl_module --with-stream_ssl_module --with-stream_ssl_preread_module \
>+		--with-threads --with-mail=dynamic --with-stream=dynamic \
>+		--with-compat --add-dynamic-module=${WRKSRC_modsecurity3}
> 
> ALL_TARGET=
> 
>@@ -80,7 +57,7 @@ _NGINX_TMPDIR=		${_NGINX_VARDIR}/tmp/nginx
> _NGINX_VARDIR=	/var
> 
> _NGINX_PORTNAME=	nginx
>-_NGINX_PORTVERSION=	1.20.0
>+_NGINX_PORTVERSION=	1.20.2
> _NGINX_DISTNAME=	${_NGINX_PORTNAME}-${_NGINX_PORTVERSION}
> 
> do-install:
>diff --git a/security/modsecurity3-nginx/distinfo b/security/modsecurity3-nginx/distinfo
>index 96c3635b7c..6dd658be66 100644
>--- a/security/modsecurity3-nginx/distinfo
>+++ b/security/modsecurity3-nginx/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1634058703
>-SHA256 (nginx-1.20.0.tar.gz) = 54ef91ec8ebcaa486c640c09c92d832eaeaff149b10ee52ef140f407b1b04d1c
>-SIZE (nginx-1.20.0.tar.gz) = 1061070
>+TIMESTAMP = 1642359085
>+SHA256 (nginx-1.20.2.tar.gz) = 958876757782190a1653e14dc26dfc7ba263de310e04c113e11e97d1bef45a42
>+SIZE (nginx-1.20.2.tar.gz) = 1062124
> SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz) = c969a78659bb47c84929de0b9adc1f8c512a51ec9dd3b162cb568ae228d3d59e
> SIZE (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz) = 31920

Flags:

freebsd: maintainer-approval?

Actions: View | Diff

Attachments on bug 261254: 231054 | 231055