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

3 files changed, 0 insertions, 92 deletions

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