Date: Wed, 6 Nov 2019 11:13:22 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516875 - head/www/nginx-devel Message-ID: <201911061113.xA6BDMEq030078@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Wed Nov 6 11:13:22 2019 New Revision: 516875 URL: https://svnweb.freebsd.org/changeset/ports/516875 Log: Fix the issue with third-aprty modsecurity2 module, it is not being built into after selection. An additional useful file is installed now. Bump PORTREVISION. Submitted by: Felipe Zipitria <felipe.zipitria@owasp.org> (in a private mail) Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod head/www/nginx-devel/pkg-plist Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Wed Nov 6 11:01:46 2019 (r516874) +++ head/www/nginx-devel/Makefile Wed Nov 6 11:13:22 2019 (r516875) @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.17.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -344,6 +345,11 @@ do-install-DSO-on: do-install-FASTDFS-on: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fdfs ${INSTALL_DATA} ${WRKSRC_fastdfs}/src/mod_fastdfs.conf ${STAGEDIR}${PREFIX}/etc/fdfs/mod_fastdfs.conf.sample + +do-install-MODSECURITY-on: + ${INSTALL_DATA} \ + ${WRKDIR}/modsecurity-${MODSECURITY_VERSION}/unicode.mapping \ + ${STAGEDIR}${ETCDIR} do-install-NAXSI-on: ${INSTALL_DATA} \ Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Wed Nov 6 11:01:46 2019 (r516874) +++ head/www/nginx-devel/Makefile.extmod Wed Nov 6 11:13:22 2019 (r516875) @@ -222,6 +222,7 @@ MODSECURITY_MASTER_SITES= https://www.modsecurity.org/ 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:ecb255a:modsec Modified: head/www/nginx-devel/pkg-plist ============================================================================== --- head/www/nginx-devel/pkg-plist Wed Nov 6 11:01:46 2019 (r516874) +++ head/www/nginx-devel/pkg-plist Wed Nov 6 11:13:22 2019 (r516875) @@ -5,6 +5,7 @@ %%NAXSI%%%%ETCDIR%%/naxsi_core.rules @sample %%ETCDIR%%/scgi_params-dist %%ETCDIR%%/scgi_params @sample %%ETCDIR%%/uwsgi_params-dist %%ETCDIR%%/uwsgi_params +%%MODSECURITY%%%%ETCDIR%%/unicode.mapping %%ETCDIR%%/win-utf @sample %%ETCDIR%%/mime.types-dist %%ETCDIR%%/mime.types @sample %%ETCDIR%%/nginx.conf-dist %%ETCDIR%%/nginx.conf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911061113.xA6BDMEq030078>