Remove legacy third-party modules:
o) modsecurity2 o) fastdfs All modules, including all third-party modules, are dynamic now. Bump PORTREVISION.
This commit is contained in:
Sergey A. Osokin
parent
43ed89ec3c
commit
020bb7cc05
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=535197
8 changed files with 4 additions and 157 deletions
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= nginx
|
||||
PORTVERSION= 1.18.0
|
||||
PORTREVISION= 15
|
||||
PORTREVISION= 16
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= https://nginx.org/download/ \
|
||||
LOCAL/osa
|
||||
|
|
@ -80,7 +80,7 @@ OPTIONS_GROUP_STREAMGRP= STREAM STREAM_REALIP STREAM_SSL \
|
|||
|
||||
# External modules (arrayvar MUST appear after devel_kit for build-dep)
|
||||
OPTIONS_GROUP_HTTPGRP+= AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE COOKIE_FLAG CT \
|
||||
DEVEL_KIT ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION FASTDFS \
|
||||
DEVEL_KIT ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION \
|
||||
FORMINPUT GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST \
|
||||
HTTP_AUTH_KRB5 HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL \
|
||||
HTTP_FANCYINDEX HTTP_FOOTER HTTP_GEOIP2 HTTP_IP2LOCATION HTTP_IP2PROXY \
|
||||
|
|
@ -88,7 +88,7 @@ OPTIONS_GROUP_HTTPGRP+= AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE COOKIE_FLAG CT \
|
|||
HTTP_PUSH_STREAM HTTP_REDIS HTTP_RESPONSE HTTP_SLICE_AHEAD \
|
||||
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 \
|
||||
HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LINK LUA MEMC \
|
||||
MODSECURITY3 NAXSI NJS OPENTRACING PASSENGER POSTGRES RDS_CSV RDS_JSON \
|
||||
REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT SRCACHE \
|
||||
VOD VTS XSS WEBSOCKIFY
|
||||
|
|
@ -290,11 +290,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!' \
|
||||
|
|
@ -321,13 +316,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 )
|
||||
|
||||
|
|
@ -356,18 +344,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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -226,20 +215,6 @@ LINK_VARS= DSO_EXTMODS+=link
|
|||
MEMC_GH_TUPLE= openresty:memc-nginx-module:v0.19: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.2+ pkgconfig shebangfix
|
||||
MODSECURITY_MASTER_SITES= https://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:modsecurity3
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ DSO_DESC= Enable dynamic modules support
|
|||
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
|
||||
OPENTRACING_DESC= 3rd party opentracing module
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
TIMESTAMP = 1588902199
|
||||
TIMESTAMP = 1589060817
|
||||
SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
|
||||
SIZE (nginx-1.18.0.tar.gz) = 1039530
|
||||
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
|
||||
|
|
@ -9,8 +9,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-a964a0b_GH0.tar.gz) = 0c786660ce2e5c6d23cf02e957786ad581a04cc6315145eb144ec271f7f81326
|
||||
|
|
@ -39,8 +37,6 @@ SHA256 (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz) = aea1d10d9175a6471b34d4
|
|||
SIZE (openresty-echo-nginx-module-c65f5c6_GH0.tar.gz) = 53121
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
--- ../fastdfs-nginx-module-8796a7d/src/config.orig 2018-07-16 05:05:22.000000000 -0400
|
||||
+++ ../fastdfs-nginx-module-8796a7d/src/config 2019-10-22 14:20:23.138241000 -0400
|
||||
@@ -3,16 +3,16 @@
|
||||
if test -n "${ngx_module_link}"; then
|
||||
ngx_module_type=HTTP
|
||||
ngx_module_name=$ngx_addon_name
|
||||
- ngx_module_incs="/usr/local/include"
|
||||
+ ngx_module_incs="%%LOCALBASE%%/include"
|
||||
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_INCS="$CORE_INCS %%LOCALBASE%%/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
|
||||
|
|
@ -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
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
--- ../modsecurity-2.9.3/configure.orig 2016-02-07 12:45:53.346098000 -0500
|
||||
+++ ../modsecurity-2.9.3/configure 2016-02-07 12:47:50.081558000 -0500
|
||||
@@ -14949,7 +14949,7 @@
|
||||
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"
|
||||
|
||||
|
||||
@@ -14965,7 +14965,7 @@
|
||||
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.1" ;; #(
|
||||
*) :
|
||||
test_paths="${with_lua}" ;;
|
||||
esac
|
||||
@@ -15019,7 +15019,7 @@
|
||||
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
|
||||
|
|
@ -1,9 +1,7 @@
|
|||
%%ETCDIR%%/koi-utf
|
||||
%%ETCDIR%%/koi-win
|
||||
%%ETCDIR%%/win-utf
|
||||
%%FASTDFS%%@sample etc/fdfs/mod_fastdfs.conf.sample
|
||||
%%LINK%%include/ngx_link_func_module.h
|
||||
%%MODSECURITY%%%%ETCDIR%%/unicode.mapping
|
||||
%%NAXSI%%%%ETCDIR%%/naxsi_core.rules
|
||||
@sample %%ETCDIR%%/fastcgi_params-dist %%ETCDIR%%/fastcgi_params
|
||||
@sample %%ETCDIR%%/mime.types-dist %%ETCDIR%%/mime.types
|
||||
|
|
@ -25,7 +23,6 @@
|
|||
%%DSO%%%%DYNAMIC_UPSTREAM%%libexec/nginx/ngx_dynamic_upstream_module.so
|
||||
%%DSO%%%%ECHO%%libexec/nginx/ngx_http_echo_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
|
||||
|
|
|
|||
Loading…
Reference in a new issue