From nobody Sat Oct 09 06:30:10 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 39E9E12D9DDC; Sat, 9 Oct 2021 06:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HRFXz0s89z3k9w; Sat, 9 Oct 2021 06:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1F1815D91; Sat, 9 Oct 2021 06:30:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1996UAX5051772; Sat, 9 Oct 2021 06:30:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1996UAEe051768; Sat, 9 Oct 2021 06:30:10 GMT (envelope-from git) Date: Sat, 9 Oct 2021 06:30:10 GMT Message-Id: <202110090630.1996UAEe051768@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 6c439b5b0b8b - main - www/nginx: Update 3rd party modules List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c439b5b0b8b43bcebd68a2fc1b9e8db3f9c36e8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=6c439b5b0b8b43bcebd68a2fc1b9e8db3f9c36e8 commit 6c439b5b0b8b43bcebd68a2fc1b9e8db3f9c36e8 Author: Jochen Neumeister AuthorDate: 2021-10-09 06:29:18 +0000 Commit: Jochen Neumeister CommitDate: 2021-10-09 06:30:04 +0000 www/nginx: Update 3rd party modules Sponsored by: Netzkommune GmbH --- www/nginx/Makefile | 2 +- www/nginx/Makefile.extmod | 6 ++---- www/nginx/distinfo | 10 +++++----- www/nginx/files/extra-patch-nchan-store-private.h | 10 ---------- .../files/extra-patch-nchan-store-redis-redis_lua_commands.h | 12 ------------ 5 files changed, 8 insertions(+), 32 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 8394d25ec230..d0de8afabe2a 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -2,7 +2,7 @@ PORTNAME= nginx PORTVERSION= 1.20.1 -PORTREVISION?= 3 +PORTREVISION?= 4 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index cbf91f2c35b3..6fb27976f520 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -139,10 +139,8 @@ HTTP_NOTICE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_notice_module.c \ ${PATCHDIR}/extra-patch-nginx-notice-config HTTP_NOTICE_VARS= DSO_EXTMODS+=notice -HTTP_PUSH_GH_TUPLE= slact:nchan:v1.2.7:push +HTTP_PUSH_GH_TUPLE= slact:nchan:v1.2.12:push HTTP_PUSH_VARS= DSO_EXTMODS+=push -HTTP_PUSH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nchan-store-private.h \ - ${PATCHDIR}/extra-patch-nchan-store-redis-redis_lua_commands.h HTTP_PUSH_STREAM_GH_TUPLE= wandenberg:nginx-push-stream-module:0.5.4:pushstream HTTP_PUSH_STREAM_VARS= DSO_EXTMODS+=pushstream @@ -275,7 +273,7 @@ RDS_JSON_VARS= DSO_EXTMODS+=rdsjson REDIS2_GH_TUPLE= openresty:redis2-nginx-module:v0.15:redis2 REDIS2_VARS= DSO_EXTMODS+=redis2 -RTMP_GH_TUPLE= ut0mt8:nginx-rtmp-module:791b613:rtmp +RTMP_GH_TUPLE= ut0mt8:nginx-rtmp-module:2d4613c:rtmp RTMP_VARS= DSO_EXTMODS+=rtmp SET_MISC_IMPLIES= DEVEL_KIT diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 73d13930485e..3ce7f1933730 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1631279314 +TIMESTAMP = 1633707651 SHA256 (nginx-1.20.1.tar.gz) = e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49 SIZE (nginx-1.20.1.tar.gz) = 1061461 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -75,8 +75,8 @@ SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736 SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885 SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343 -SHA256 (slact-nchan-v1.2.7_GH0.tar.gz) = 8bb5d1749af759bb5e9cc5476a9c4b44d51bee6096bb89ab5ff53e85367b490b -SIZE (slact-nchan-v1.2.7_GH0.tar.gz) = 673406 +SHA256 (slact-nchan-v1.2.12_GH0.tar.gz) = 3fd9c51446a65bddabfaf7a0cba8435e3ce6084d0585b6f0eba1a950f14d56a2 +SIZE (slact-nchan-v1.2.12_GH0.tar.gz) = 716150 SHA256 (wandenberg-nginx-push-stream-module-0.5.4_GH0.tar.gz) = 5253bb8a804ea679e514137a234637298f044c3ef63c053670bf3802ff3535b1 SIZE (wandenberg-nginx-push-stream-module-0.5.4_GH0.tar.gz) = 183493 SHA256 (yaoweibin-ngx_http_substitutions_filter_module-b8a71ea_GH0.tar.gz) = 08f966328fc1b77e0dbbcacd9532c3905060c20c45b6461b6f2075cd844d0891 @@ -123,8 +123,8 @@ SHA256 (openresty-rds-json-nginx-module-v0.15_GH0.tar.gz) = eaf18f60e981ea2442a7 SIZE (openresty-rds-json-nginx-module-v0.15_GH0.tar.gz) = 34744 SHA256 (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = d255571bcfb9939b78099df39cb4d42f174d789aec8c8e5e47b93942b0299438 SIZE (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = 25471 -SHA256 (ut0mt8-nginx-rtmp-module-791b613_GH0.tar.gz) = 07494d3931d7e2cd7f76682975bd7c016f0b4da53b6da24343779054487e2adc -SIZE (ut0mt8-nginx-rtmp-module-791b613_GH0.tar.gz) = 519956 +SHA256 (ut0mt8-nginx-rtmp-module-2d4613c_GH0.tar.gz) = c641d435d2f05a757a4dd46038aac94498f5cadc16c9ef29e4ef7f532b6118e2 +SIZE (ut0mt8-nginx-rtmp-module-2d4613c_GH0.tar.gz) = 549469 SHA256 (openresty-set-misc-nginx-module-4667684_GH0.tar.gz) = c11a71bd753a7e01b428c715fb2113e3eaf71a3704e5e297f0e7d7e54c86582c SIZE (openresty-set-misc-nginx-module-4667684_GH0.tar.gz) = 29338 SHA256 (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 95efdb1f6cfd6c32c577707f693eb6795c6f21ae062842bf84fe762d8b842955 diff --git a/www/nginx/files/extra-patch-nchan-store-private.h b/www/nginx/files/extra-patch-nchan-store-private.h deleted file mode 100644 index 72d3f5e75afd..000000000000 --- a/www/nginx/files/extra-patch-nchan-store-private.h +++ /dev/null @@ -1,10 +0,0 @@ ---- ../nchan-1.2.7/src/store/memory/store-private.h.orig 2020-09-20 13:11:33.781569000 +0200 -+++ ../nchan-1.2.7/src/store/memory/store-private.h 2020-09-20 13:11:48.679855000 +0200 -@@ -172,6 +172,6 @@ - void memstore_chanhead_release(memstore_channel_head_t *ch, char *label); - void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *label); - --uint16_t memstore_worker_generation; //times nginx has been restarted + 1 -+extern uint16_t memstore_worker_generation; //times nginx has been restarted + 1 - - #endif /*MEMSTORE_PRIVATE_HEADER*/ diff --git a/www/nginx/files/extra-patch-nchan-store-redis-redis_lua_commands.h b/www/nginx/files/extra-patch-nchan-store-redis-redis_lua_commands.h deleted file mode 100644 index 9923e5984822..000000000000 --- a/www/nginx/files/extra-patch-nchan-store-redis-redis_lua_commands.h +++ /dev/null @@ -1,12 +0,0 @@ ---- ../nchan-1.2.7/src/store/redis/redis_lua_commands.h.orig 2020-09-30 23:51:52.116513000 +0800 -+++ ../nchan-1.2.7/src/store/redis/redis_lua_commands.h 2020-09-30 23:52:11.164617000 +0800 -@@ -63,7 +63,7 @@ typedef struct { - redis_lua_script_t subscriber_unregister; - - } redis_lua_scripts_t; --redis_lua_scripts_t redis_lua_scripts; --const int redis_lua_scripts_count; -+extern redis_lua_scripts_t redis_lua_scripts; -+extern const int redis_lua_scripts_count; - #define REDIS_LUA_SCRIPTS_EACH(script) \ - for((script)=(redis_lua_script_t *)&redis_lua_scripts; (script) < (redis_lua_script_t *)(&redis_lua_scripts + 1); (script)++)