Merge r535197 from www/nginx-devel:

Remove legacy third-party modules:

o) modsecurity2
o) fastdfs

All modules, including all third-party modules, are dynamic now.

Sponsored by:	Netzkommune GmbH

8 files changed, 3 insertions, 150 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index a5afd5a31218..80eb6a5d2288 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.18.0
-PORTREVISION?=	12
+iPORTREVISION?=	13
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
@@ -80,7 +80,7 @@ OPTIONS_GROUP_HTTPGRP=	GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
 # External modules (arrayvar MUST appear after devel_kit for build-dep)
 OPTIONS_GROUP_HTTPGRP+=	AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE CT DEVEL_KIT \
 	ARRAYVAR DRIZZLE DYNAMIC_TLS DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION \
-	FASTDFS FORMINPUT GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE \
+	FORMINPUT GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE \
 	HTTP_AUTH_DIGEST HTTP_AUTH_JWT HTTP_AUTH_KRB5 HTTP_AUTH_LDAP \
 	HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL HTTP_FANCYINDEX HTTP_FOOTER \
 	HTTP_GEOIP2 HTTP_IP2LOCATION HTTP_IP2PROXY HTTP_JSON_STATUS HTTP_MOGILEFS \
@@ -88,7 +88,7 @@ OPTIONS_GROUP_HTTPGRP+=	AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE CT DEVEL_KIT \
 	HTTP_RESPONSE HTTP_SUBS_FILTER HTTP_TARANTOOL HTTP_UPLOAD \
 	HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR \
 	HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LINK LUA \
-	MEMC MODSECURITY MODSECURITY3 NAXSI NJS PASSENGER POSTGRES RDS_CSV \
+	MEMC MODSECURITY3 NAXSI NJS PASSENGER POSTGRES RDS_CSV \
 	RDS_JSON REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE \
 	SMALL_LIGHT SRCACHE VOD VTS XSS WEBSOCKIFY
 OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
@@ -284,11 +284,6 @@ post-patch-HTTP_ZIP-on:
 post-patch-ICONV-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config
 
-post-patch-MODSECURITY-on:
-	@${REINPLACE_CMD} \
-		's!%%PREFIX%%!${LOCALBASE}!g' \
-		${WRKSRC_MODSECURITY}/configure
-
 post-patch-PASSENGER-on:
 	@${REINPLACE_CMD} \
 		'177,179s!true!false!' \
@@ -315,13 +310,6 @@ post-patch-VOD-on:
 	's!%%PREFIX%%!${LOCALBASE}!g' \
 	${WRKSRC_vod}/config
 
-pre-configure-MODSECURITY-on:
-	( cd ${WRKSRC_MODSECURITY} && \
-		CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module \
-		--with-pcre=${LOCALBASE} --with-yajl=${LOCALBASE} \
-		--with-curl=${LOCALBASE} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} )
-
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
@@ -350,18 +338,9 @@ do-install-DSO-on:
 	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
 		-exec ${INSTALL_PROGRAM} {} ${STAGEDIR}${MODULESDIR} \;)
 
-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-LINK-on:
 	${INSTALL_DATA} ${WRKSRC_link}/src/ngx_link_func_module.h ${STAGEDIR}${PREFIX}/include
 
-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 8364120c4b46..da15e71132af 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -53,17 +53,6 @@ ENCRYPTSESSION_IMPLIES=		DEVEL_KIT
 ENCRYPTSESSION_GH_TUPLE=	openresty:encrypted-session-nginx-module:v0.08:encryptsession
 ENCRYPTSESSION_VARS=		DSO_EXTMODS+=encryptsession
 
-FASTDFS_GH_TUPLE=	happyfish100:fastdfs-nginx-module:8796a7d:fastdfs
-FASTDFS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-fastdfs-src-config \
-			${PATCHDIR}/extra-patch-fastdfs-src-mod_fastdfs.conf
-FASTDFS_BUILD_DEPENDS=	${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \
-			${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs
-FASTDFS_LIB_DEPENDS=	libfastcommon.so:devel/libfastcommon \
-			libfdfsclient.so:ftp/fastdfs
-FASTDFS_CONFIGURE_ON=	--with-cc-opt="-I ${LOCALBASE}/include/fastdfs \
-			-I ${LOCALBASE}/include/fastcommon"
-FASTDFS_VARS=		DSO_EXTMODS+=fastdfs FASTDFS_SUBDIR=/src 
-
 FORMINPUT_IMPLIES=	DEVEL_KIT
 FORMINPUT_GH_TUPLE=	calio:form-input-nginx-module:v0.12:forminput
 FORMINPUT_VARS=		DSO_EXTMODS+=forminput
@@ -230,20 +219,6 @@ LUA_VARS=		DSO_EXTMODS+=lua
 MEMC_GH_TUPLE=		openresty:memc-nginx-module:v0.18:memc
 MEMC_VARS=		DSO_EXTMODS+=memc
 
-MODSECURITY_LIB_DEPENDS=	libapr-1.so:devel/apr1 \
-				libcurl.so:ftp/curl \
-				libluajit-5.1.so:lang/luajit-openresty \
-				libpcre.so:devel/pcre \
-				libyajl.so:devel/yajl
-MODSECURITY_USE=		GNOME=libxml2
-MODSECURITY_VERSION=	2.9.3
-MODSECURITY_USES=		apache:2.4+ pkgconfig shebangfix
-MODSECURITY_MASTER_SITES=	http://www.modsecurity.org/tarball/${MODSECURITY_VERSION}/:modsecurity
-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_IMPLIES=	HTTP_ADDITION HTTP_IMAGE_FILTER HTTP_GUNZIP_FILTER HTTP_XSLT
 MODSECURITY3_LIB_DEPENDS=	libmodsecurity.so:security/modsecurity3
 MODSECURITY3_GH_TUPLE=		SpiderLabs:ModSecurity-nginx:v1.0.1:modsec
diff --git a/www/nginx/Makefile.options.desc b/www/nginx/Makefile.options.desc
index efca383a20a4..e270c76a1b01 100644
--- a/www/nginx/Makefile.options.desc
+++ b/www/nginx/Makefile.options.desc
@@ -16,7 +16,6 @@ DYNAMIC_TLS_DESC=		3rd party dynamic tls records patch
 DYNAMIC_UPSTREAM_DESC=		3rd party dynamic_upstream module
 ECHO_DESC=			3rd party echo module
 ENCRYPTSESSION_DESC=		3rd party encrypted_session module
-FASTDFS_DESC=			3rd party fastdfs module
 FILE_AIO_DESC=			Enable file aio
 FORMINPUT_DESC=			3rd party form_input module
 GOOGLE_PERFTOOLS_DESC=		Enable google perftools module
@@ -90,7 +89,6 @@ MAIL_SMTP_DESC=			Enable SMTP proxy module
 MAIL_SSL_DESC=			Enable mail_ssl module
 MEMC_DESC=			3rd party memc (memcached) module
 MODSECURITY3_DESC=		3rd party modsecurity3 module
-MODSECURITY_DESC=		3rd party mod_security module
 NAXSI_DESC=			3rd party naxsi module
 NJS_DESC=			Enable http_javascript module
 PASSENGER_DESC=			3rd party passenger module
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 14024bea3cfa..2d38b84598bf 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -11,8 +11,6 @@ SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b25
 SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051
 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
 SIZE (ngx_http_response-0.3.tar.gz) = 2244
-SHA256 (modsecurity-2.9.3.tar.gz) = 4192019d169d3f1dd82cc4714db6986df54c6ceb4ee1c8f253de78d1a6b62118
-SIZE (modsecurity-2.9.3.tar.gz) = 4307670
 SHA256 (passenger-6.0.4.tar.gz) = ec1e4b555c176642c1c316897177d54b6f7d369490280e8ee3e54644e40b250b
 SIZE (passenger-6.0.4.tar.gz) = 7347803
 SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316
@@ -37,8 +35,6 @@ SHA256 (openresty-echo-nginx-module-996412d_GH0.tar.gz) = 07074c1859a0e6e5bee129
 SIZE (openresty-echo-nginx-module-996412d_GH0.tar.gz) = 53347
 SHA256 (openresty-encrypted-session-nginx-module-v0.08_GH0.tar.gz) = 6e526ea097c6805ec2cf1d0d3d79ed24326bc2d0babe158c29edd07d8c0d106a
 SIZE (openresty-encrypted-session-nginx-module-v0.08_GH0.tar.gz) = 11802
-SHA256 (happyfish100-fastdfs-nginx-module-8796a7d_GH0.tar.gz) = 083fe7ecd484b9adce41c938f0f95b81ebe8336765896107e5864243c9789ef5
-SIZE (happyfish100-fastdfs-nginx-module-8796a7d_GH0.tar.gz) = 19872
 SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106
 SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
 SHA256 (technowledgy-nginx_http_gridfs_module-7970bab_GH0.tar.gz) = 3c53190c24a578c0d6d340d290cd87f139a651372c78b7518b617a037db60582
diff --git a/www/nginx/files/extra-patch-fastdfs-src-config b/www/nginx/files/extra-patch-fastdfs-src-config
deleted file mode 100644
index 2ee64de2c73d..000000000000
--- a/www/nginx/files/extra-patch-fastdfs-src-config
+++ /dev/null
@@ -1,17 +0,0 @@
---- ../fastdfs-nginx-module-8796a7d/src/config.orig	2018-07-19 07:14:11.958521000 +0200
-+++ ../fastdfs-nginx-module-8796a7d/src/config	2018-07-19 07:14:30.433965000 +0200
-@@ -7,12 +7,12 @@ if test -n "${ngx_module_link}"; then
-     ngx_module_libs="-lfastcommon -lfdfsclient"
-     ngx_module_srcs="$ngx_addon_dir/ngx_http_fastdfs_module.c"
-     ngx_module_deps=
--    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
-+    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
-     . auto/module
- else
-     HTTP_MODULES="$HTTP_MODULES ngx_http_fastdfs_module"
-     NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fastdfs_module.c"
-     CORE_INCS="$CORE_INCS /usr/local/include"
-     CORE_LIBS="$CORE_LIBS -lfastcommon -lfdfsclient"
--    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
-+    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
- fi
diff --git a/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf b/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf
deleted file mode 100644
index 7ce2f0d05997..000000000000
--- a/www/nginx/files/extra-patch-fastdfs-src-mod_fastdfs.conf
+++ /dev/null
@@ -1,46 +0,0 @@
---- ../fastdfs-nginx-module-8796a7d/src/mod_fastdfs.conf.orig	2018-07-19 19:22:45.973450000 +0200
-+++ ../fastdfs-nginx-module-8796a7d/src/mod_fastdfs.conf	2018-07-19 19:28:48.173589000 +0200
-@@ -59,8 +59,8 @@ store_path_count=1
- # store_path#, based 0, if store_path0 not exists, it's value is base_path
- # the paths must be exist
- # must same as storage.conf
--store_path0=/home/yuqing/fastdfs
--#store_path1=/home/yuqing/fastdfs1
-+store_path0=/var/db/fastdfs/storage
-+#store_path1=/var/db/fastdfs/storage2
- 
- # standard log level as syslog, case insensitive, value list:
- ### emerg for emergency
-@@ -92,6 +92,14 @@ if_alias_prefix=
- # NOTE: #include is an include directive, do NOT remove the # before include
- #include http.conf
- 
-+# HTTP default content type
-+http.default_content_type = application/octet-stream
-+
-+# MIME types mapping filename
-+# MIME types file format: MIME_type  extensions
-+# such as:  image/jpeg jpeg jpg jpe
-+# you can use apache's MIME file: mime.types
-+http.mime_types_filename=/usr/local/etc/nginx/mime.types
- 
- # if support flv
- # default value is false
-@@ -119,8 +127,8 @@ group_count = 0
- #group_name=group1
- #storage_server_port=23000
- #store_path_count=2
--#store_path0=/home/yuqing/fastdfs
--#store_path1=/home/yuqing/fastdfs1
-+#store_path0=/var/db/fastdfs/storage
-+#store_path1=/var/db/fastdfs/storage2
- 
- # group settings for group #2
- # since v1.14
-@@ -129,5 +137,4 @@ group_count = 0
- #group_name=group2
- #storage_server_port=23000
- #store_path_count=1
--#store_path0=/home/yuqing/fastdfs
--
-+#store_path0=/var/db/fastdfs/storage
diff --git a/www/nginx/files/extra-patch-nginx-modsecurity-configure b/www/nginx/files/extra-patch-nginx-modsecurity-configure
deleted file mode 100644
index 993e9c510086..000000000000
--- a/www/nginx/files/extra-patch-nginx-modsecurity-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../modsecurity-2.9.3/configure.orig	2018-07-17 14:12:34.223173000 +0200
-+++ ../modsecurity-2.9.3/configure	2018-07-17 14:16:23.284534000 +0200
-@@ -15715,7 +15715,7 @@ LUA_CPPFLAGS=""
- LUA_LDADD=""
- LUA_LDFLAGS=""
- LUA_CONFIG=${PKG_CONFIG}
--LUA_PKGNAMES="lua5.1 lua-5.1 lua_5.1 lua-51 lua_51 lua51 lua5 lua lua5.2 lua-5.2 lua_5.2 lua-52 lua_52 lua52 lua5.3 lua-5.3 lua_5.3 lua-53 lua_53 lua53 "
-+LUA_PKGNAMES="luajit "
- LUA_SONAMES="so la sl dll dylib a"
- 
- 
-@@ -15731,7 +15731,7 @@ case "${with_lua}" in #(
-   no) :
-     test_paths= ;; #(
-   yes) :
--    test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr" ;; #(
-+    test_paths="%%PREFIX%%/include/luajit-2.0" ;; #(
-   *) :
-     test_paths="${with_lua}" ;;
- esac
-@@ -15785,7 +15785,7 @@ $as_echo "$as_me: lua CFLAGS: $LUA_CFLAG
-     LUA_LDADD="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-l`"
-     if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: lua LDADD: $LUA_LDADD" >&5
- $as_echo "$as_me: lua LDADD: $LUA_LDADD" >&6;}; fi
--    LUA_LDFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-L --libs-only-other`"
-+    LUA_LDFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-L --libs-only-other | sed 's/\/lua51//'`"
-     if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: lua LDFLAGS: $LUA_LDFLAGS" >&5
- $as_echo "$as_me: lua LDFLAGS: $LUA_LDFLAGS" >&6;}; fi
- else
diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist
index 5e1fe66f0884..7b062a55adda 100644
--- a/www/nginx/pkg-plist
+++ b/www/nginx/pkg-plist
@@ -1,9 +1,7 @@
-%%FASTDFS%%@sample etc/fdfs/mod_fastdfs.conf.sample
 @sample %%ETCDIR%%/fastcgi_params-dist %%ETCDIR%%/fastcgi_params
 %%ETCDIR%%/koi-utf
 %%ETCDIR%%/koi-win
 %%LINK%%include/ngx_link_func_module.h
-%%MODSECURITY%%%%ETCDIR%%/unicode.mapping
 %%NAXSI%%%%ETCDIR%%/naxsi_core.rules
 @sample %%ETCDIR%%/scgi_params-dist %%ETCDIR%%/scgi_params
 @sample %%ETCDIR%%/uwsgi_params-dist %%ETCDIR%%/uwsgi_params
@@ -22,7 +20,6 @@
 %%DSO%%%%DEVEL_KIT%%libexec/nginx/ndk_http_module.so
 %%DSO%%%%DRIZZLE%%libexec/nginx/ngx_http_drizzle_module.so
 %%DSO%%%%ENCRYPTSESSION%%libexec/nginx/ngx_http_encrypted_session_module.so
-%%DSO%%%%FASTDFS%%libexec/nginx/ngx_http_fastdfs_module.so
 %%DSO%%%%FORMINPUT%%libexec/nginx/ngx_http_form_input_module.so
 %%DSO%%%%GRIDFS%%libexec/nginx/ngx_http_gridfs_module.so
 %%DSO%%%%HEADERS_MORE%%libexec/nginx/ngx_http_headers_more_filter_module.so