summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/nginx-devel/Makefile6
-rw-r--r--www/nginx-devel/Makefile.extmod1
-rw-r--r--www/nginx-devel/pkg-plist1
3 files changed, 8 insertions, 0 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 234be7753d44..87529f468c3d 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.17.5
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
@@ -345,6 +346,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-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index a0a7340c941f..15d58bfcde68 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -222,6 +222,7 @@ MODSECURITY_MASTER_SITES= https://www.modsecurity.org/tarball/${MODSECURITY_VERS
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
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index 7ef0b6edcc7c..2b64ef71ab1d 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -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