diff options
| author | Jochen Neumeister <joneum@FreeBSD.org> | 2019-11-14 14:55:15 +0000 |
|---|---|---|
| committer | Jochen Neumeister <joneum@FreeBSD.org> | 2019-11-14 14:55:15 +0000 |
| commit | c0f40e6c966b410bf4d188e9c41c980fd22098be (patch) | |
| tree | c4008966c6c6ca6dfa284a680ac24b48b71ed7ae | |
| parent | Update to 2.9.15 (diff) | |
Fix the issue with third-aprty modsecurity2 module, it is not
being built into after selection.
An additional useful file is installed now.
Submitted by: Felipe Zipitria <felipe.zipitria@owasp.org> (in a private mail)
Sponsored by: Netzkommune GmbH
Notes
Notes:
svn path=/head/; revision=517568
| -rw-r--r-- | www/nginx/Makefile | 7 | ||||
| -rw-r--r-- | www/nginx/Makefile.extmod | 1 | ||||
| -rw-r--r-- | www/nginx/pkg-plist | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 6664edf9f2b2..de29ebb30de9 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.16.1 -PORTREVISION?= 4 +PORTREVISION?= 5 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ @@ -351,6 +351,11 @@ 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} \ ${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_config/naxsi_core.rules \ 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 diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist index e6292a862fe2..62419d13c0ab 100644 --- a/www/nginx/pkg-plist +++ b/www/nginx/pkg-plist @@ -3,6 +3,7 @@ %%ETCDIR%%/koi-utf %%ETCDIR%%/koi-win %%NAXSI%%%%ETCDIR%%/naxsi_core.rules +%%MODSECURITY%%%%ETCDIR%%/unicode.mapping @sample %%ETCDIR%%/scgi_params-dist %%ETCDIR%%/scgi_params @sample %%ETCDIR%%/uwsgi_params-dist %%ETCDIR%%/uwsgi_params %%ETCDIR%%/win-utf |