git: ff504a992317 - main - www/nginx-devel: manage third-party modules
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 11 Jul 2022 01:58:44 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ff504a992317cee4a30b5060220a0281c4d15920
commit ff504a992317cee4a30b5060220a0281c4d15920
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2022-07-11 01:55:30 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2022-07-11 01:58:37 +0000
www/nginx-devel: manage third-party modules
Remove third-party http_response module, no updates since Jan 10, 2011.
Update third-party upload_progress module to its recent version,
a patch still requires to build with 1.23.0.
Bump PORTREVISION.
---
www/nginx-devel/Makefile | 3 +--
www/nginx-devel/Makefile.extmod | 14 ++++----------
www/nginx-devel/distinfo | 8 +++-----
www/nginx-devel/files/extra-patch-ngx_http_response-config | 11 -----------
www/nginx-devel/pkg-plist | 1 -
5 files changed, 8 insertions(+), 29 deletions(-)
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 2bff3fa2fcf9..46221d8853d4 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -2,7 +2,7 @@
PORTNAME?= nginx
PORTVERSION= 1.23.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
@@ -247,7 +247,6 @@ NJS_CONFIGURE_ARGS= --no-pcre2
.if ${PORT_OPTIONS:MCLOJURE} || \
${PORT_OPTIONS:MHTTP_REDIS} || \
- ${PORT_OPTIONS:MHTTP_RESPONSE} || \
${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS}
IGNORE= a patch requires
.endif
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 3eadbd435607..505a11f8915f 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -8,10 +8,9 @@ OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE COOKIE_FLAG
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 HTTP_MP4_H264 HTTP_NOTICE HTTP_PUSH \
- 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 \
+ HTTP_PUSH_STREAM HTTP_REDIS 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 \
MODSECURITY3 NAXSI OPENTRACING PASSENGER POSTGRES RDS_CSV RDS_JSON \
REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT SRCACHE \
VOD VTS XSS WEBSOCKIFY
@@ -165,11 +164,6 @@ HTTP_REDIS_MASTER_SITES= LOCAL/osa:redis
HTTP_REDIS_DISTFILES= ngx_http_redis-0.3.9.tar.gz:redis
HTTP_REDIS_VARS= DSO_EXTDIRS+=ngx_http_redis-0.3.9
-HTTP_RESPONSE_MASTER_SITES= http://catap.ru/downloads/nginx/:response
-HTTP_RESPONSE_DISTFILES= ngx_http_response-0.3.tar.gz:response
-HTTP_RESPONSE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_response-config
-HTTP_RESPONSE_VARS= DSO_EXTDIRS+=ngx_http_response-0.3
-
HTTP_SLICE_AHEAD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c
HTTP_SUBS_FILTER_GH_TUPLE= yaoweibin:ngx_http_substitutions_filter_module:c6f825f:subs_filter
@@ -184,7 +178,7 @@ HTTP_TARANTOOL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config
HTTP_UPLOAD_GH_TUPLE= fdintino:nginx-upload-module:643b4c1:upload
HTTP_UPLOAD_VARS= DSO_EXTMODS+=upload
-HTTP_UPLOAD_PROGRESS_GH_TUPLE= masterzen:nginx-upload-progress-module:afb2d31:uploadprogress
+HTTP_UPLOAD_PROGRESS_GH_TUPLE= masterzen:nginx-upload-progress-module:68b3ab3:uploadprogress
HTTP_UPLOAD_PROGRESS_VARS= DSO_EXTMODS+=uploadprogress
HTTP_UPSTREAM_CHECK_GH_TUPLE= yaoweibin:nginx_upstream_check_module:9aecf15:upstreamcheck
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 9a7d3b0a8b2d..c42bcd21dcd9 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1657502668
+TIMESTAMP = 1657504169
SHA256 (nginx-1.23.0.tar.gz) = 820acaa35b9272be9e9e72f6defa4a5f2921824709f8aa4772c78ab31ed94cd1
SIZE (nginx-1.23.0.tar.gz) = 1102940
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -7,8 +7,6 @@ SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401
SIZE (nginx_mod_h264_streaming-2.2.7.tar.gz) = 44012
SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b255ef14f9c26e3847a6f26f46
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 (passenger-6.0.12.tar.gz) = 4d15063dea6bce195e251d2b42e7bb67fab0049b8d6c423188566bc11ce9a8ad
SIZE (passenger-6.0.12.tar.gz) = 8234023
SHA256 (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 522e94c59f5783f281d868ede2adf325bf2f8ffb9e62cf8451d4b9ac0516916c
@@ -83,8 +81,8 @@ SHA256 (tarantool-nginx_upstream_module-aeb8696_GH0.tar.gz) = 514aa57155c73c2e3f
SIZE (tarantool-nginx_upstream_module-aeb8696_GH0.tar.gz) = 75708
SHA256 (fdintino-nginx-upload-module-643b4c1_GH0.tar.gz) = a5bb48589b5c242683da33a9f1acc7847acc3ce4f2c4213ea524858aa789a6e9
SIZE (fdintino-nginx-upload-module-643b4c1_GH0.tar.gz) = 42571
-SHA256 (masterzen-nginx-upload-progress-module-afb2d31_GH0.tar.gz) = 6318851cc3a624aaad3b1f4cd9f51f79c86575c53dfe0c28bbdcf9470b6a33e6
-SIZE (masterzen-nginx-upload-progress-module-afb2d31_GH0.tar.gz) = 17269
+SHA256 (masterzen-nginx-upload-progress-module-68b3ab3_GH0.tar.gz) = 35b506e57e19e780e01ecc7c3c31a64473c35e4a022f5a3f98092a60cd1c1602
+SIZE (masterzen-nginx-upload-progress-module-68b3ab3_GH0.tar.gz) = 17322
SHA256 (yaoweibin-nginx_upstream_check_module-9aecf15_GH0.tar.gz) = 4404c64e845e19feeb07a37976347987892a8e8680a961f793ff0d3ef96c07f4
SIZE (yaoweibin-nginx_upstream_check_module-9aecf15_GH0.tar.gz) = 130039
SHA256 (jaygooby-nginx-upstream-fair-10ecdcf_GH0.tar.gz) = 93f71b7cf0db9c6dbf97e3ee11cf8efbc149946c0949d7abd19c74c7620eea50
diff --git a/www/nginx-devel/files/extra-patch-ngx_http_response-config b/www/nginx-devel/files/extra-patch-ngx_http_response-config
deleted file mode 100644
index 3b39255595cd..000000000000
--- a/www/nginx-devel/files/extra-patch-ngx_http_response-config
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../ngx_http_response-0.3/config.orig 2020-04-27 11:41:14.626983000 -0400
-+++ ../ngx_http_response-0.3/config 2020-04-27 11:41:50.008905000 -0400
-@@ -1,3 +1,6 @@
- ngx_addon_name=ngx_http_response_module
--HTTP_MODULES="$HTTP_MODULES ngx_http_response_module"
--NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_response_module.c"
-+ngx_module_name="$ngx_addon_name"
-+ngx_module_type=HTTP
-+ngx_module_srcs="$ngx_addon_dir/ngx_http_response_module.c"
-+ngx_module_deps=""
-+. auto/module
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index 21af73d2e6d3..0580ca5cd00e 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -47,7 +47,6 @@
%%DSO%%%%HTTP_PUSH%%libexec/nginx/ngx_nchan_module.so
%%DSO%%%%HTTP_PUSH_STREAM%%libexec/nginx/ngx_http_push_stream_module.so
%%DSO%%%%HTTP_REDIS%%libexec/nginx/ngx_http_redis_module.so
-%%DSO%%%%HTTP_RESPONSE%%libexec/nginx/ngx_http_response_module.so
%%DSO%%%%HTTP_SUBS_FILTER%%libexec/nginx/ngx_http_subs_filter_module.so
%%DSO%%%%HTTP_TARANTOOL%%libexec/nginx/ngx_http_tnt_module.so
%%DSO%%%%HTTP_UPLOAD_PROGRESS%%libexec/nginx/ngx_http_uploadprogress_module.so