From nobody Fri Jun 17 08:00:01 2022 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 CD059846434; Fri, 17 Jun 2022 08:00:01 +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 4LPWfn5FkDz4Rck; Fri, 17 Jun 2022 08:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655452801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w+46tWaT/IPDezJ8SNiPoSHXT+kXe2dP4t1JDyIoFx0=; b=RjYEl5CDOID76PZVCvDEzGgxg1fpbv0EJSm4kHZuss+8ZSgdven69cLfkjzZ4lFhz6sU9U Z+EK5y2Y4eMASI3Mb/UHmRAO67PaynsG5GsjMyObfhqwlAObNVxkI8qnUkAnNITpEL4NDb 077Pv5mElb0sKhcw07ajSgC9yBtDIzPNb91gK7oCXbKrMcNUASv6Vq7zXOMXLgB9rzhxz1 GkKRNKS6926OslvCDIQ8r12HRZ5LFucAwCvgq+WyPakOTU2Leo7VcG2o2BbqkKiD2ZRVnB tJi+FeL70k3gLz9izXLHiDAP58wNIrKTiri2nU7blelkLPkGHmcEV+U8svyh+A== 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 90A001BD98; Fri, 17 Jun 2022 08:00:01 +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 25H8011w066983; Fri, 17 Jun 2022 08:00:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25H801ml066975; Fri, 17 Jun 2022 08:00:01 GMT (envelope-from git) Date: Fri, 17 Jun 2022 08:00:01 GMT Message-Id: <202206170800.25H801ml066975@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: 35a55b604e4f - main - www/nginx: Update 3rd party Module 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: 35a55b604e4ff9050b31efcc5f22f94c4ff8f97c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655452801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w+46tWaT/IPDezJ8SNiPoSHXT+kXe2dP4t1JDyIoFx0=; b=gtLV6iXuvUuTfrf4hGc5kkQJKTNfx1Y5XD0lWcKs7hVPSmTmrXti1NeVTE1tjFFduUjBpJ BL4rhxoLfqkOPNTvewpv9hJtCnZuKjw5f3tG4Jidw5ak/DjFqoefsaKpyVYkp66uTQjlge UwgFhKgH431BP9xDPP2VCdDy4CKOjE+93wjl7T4MUt11f2yztQf5h0bNvnAisdTRLErs5P AL2ULtbKNVbt8AmV6KNJTWzcjXJXMWv7C07I3ScWtO4R9ilYpfnTphRdYCMR0PTFiRtQyi rNWeJVM96PVR68wtT3Q0DvcSdW1UPw6iY4gRqtqwemdot2//3bvCUBp2y+scEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655452801; a=rsa-sha256; cv=none; b=F4GN/VK+fhRBuKfZ1fE7F4AnLPTelUytR30bcXuHCt9QuFZzXspUMxbmowThxWBo8nzSbu nBGAcbAvYhxF3taugVrfjjmL5alF8+vpi34mwARzOcbEfYqr+mzEVzFDN13O65l0XqxWMC bqFRr6OauUgCAACYypSwXqM8jWSydDK8ZOsNeHKhRzAbg5KnBwp2D3tlcCAq+8rQAWLnYy KuVLzsRqI7gvrzo8QcVHH2cCAFVxPPAsG0ng+CjmNslV6dJjHLD5ti2bUrSwV8ea0Scr53 Yk/8/gCo+eh/+gFaue+wshlggFVKO03mAn9yEMRZ4wDJnUt3cf3TogWNEvTgAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=35a55b604e4ff9050b31efcc5f22f94c4ff8f97c commit 35a55b604e4ff9050b31efcc5f22f94c4ff8f97c Author: Jochen Neumeister AuthorDate: 2022-06-17 07:57:53 +0000 Commit: Jochen Neumeister CommitDate: 2022-06-17 07:59:55 +0000 www/nginx: Update 3rd party Module Update the 3rd Party Module PUSH and TARANTOOL While here, fix the KRB5 Module Sponsored by: Netzkommune GmbH --- www/nginx/Makefile | 2 +- www/nginx/Makefile.extmod | 8 +++--- www/nginx/distinfo | 10 ++++---- .../files/extra-patch-ngx_http_tarantool-config | 30 ++++++++++++---------- ...tra-patch-ngx_http_tarantool-src-tp_transcode.c | 13 ---------- 5 files changed, 27 insertions(+), 36 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index f6b38a4a09d2..0bb07dd942c2 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -2,7 +2,7 @@ PORTNAME= nginx PORTVERSION= 1.22.0 -PORTREVISION?= 4 +PORTREVISION?= 5 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index de86f93b8e03..e6c07047d094 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -80,6 +80,7 @@ HTTP_AUTH_KRB5_GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:c626163:auth_krb HTTP_AUTH_KRB5_VARS= DSO_EXTMODS+=auth_krb5 HTTP_AUTH_KRB5_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config \ ${PATCHDIR}/extra-patch-ngx_http_auth_spnego_module.c +HTTP_AUTH_KRB5_USES= gssapi:mit HTTP_AUTH_LDAP_GH_TUPLE= kvspb:nginx-auth-ldap:42d195d:http_auth_ldap HTTP_AUTH_LDAP_VARS= DSO_EXTMODS+=http_auth_ldap @@ -139,7 +140,7 @@ 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.15:push +HTTP_PUSH_GH_TUPLE= slact:nchan:v1.3.0:push HTTP_PUSH_VARS= DSO_EXTMODS+=push HTTP_PUSH_STREAM_GH_TUPLE= wandenberg:nginx-push-stream-module:0.5.4:pushstream @@ -161,10 +162,9 @@ HTTP_SUBS_FILTER_VARS= DSO_EXTMODS+=subs_filter HTTP_TARANTOOL_LIB_DEPENDS= libmsgpuck.so:devel/msgpuck \ libyajl.so:devel/yajl -HTTP_TARANTOOL_GH_TUPLE= tarantool:nginx_upstream_module:1278ee5:nginx_tarantool +HTTP_TARANTOOL_GH_TUPLE= tarantool:nginx_upstream_module:aeb8696:nginx_tarantool HTTP_TARANTOOL_VARS= DSO_EXTMODS+=nginx_tarantool -HTTP_TARANTOOL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config \ - ${PATCHDIR}/extra-patch-ngx_http_tarantool-src-tp_transcode.c +HTTP_TARANTOOL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config HTTP_UPLOAD_GH_TUPLE= fdintino:nginx-upload-module:aa42509:upload HTTP_UPLOAD_VARS= DSO_EXTMODS+=upload diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 873509ec6205..1f7f2b65a9ca 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1653895106 +TIMESTAMP = 1655449803 SHA256 (nginx-1.22.0.tar.gz) = b33d569a6f11a01433a57ce17e83935e953ad4dc77cdd4d40f896c88ac26eb53 SIZE (nginx-1.22.0.tar.gz) = 1073322 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -75,14 +75,14 @@ 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.15_GH0.tar.gz) = dbb05bec6a4cf6ad1c1a4e613a2c832669c0eb87847e70ab26bc6c590361a818 -SIZE (slact-nchan-v1.2.15_GH0.tar.gz) = 734488 +SHA256 (slact-nchan-v1.3.0_GH0.tar.gz) = 70ffed635d24aab0ff1ebb595d8b41fde105127dfd50cecac6df86b558778537 +SIZE (slact-nchan-v1.3.0_GH0.tar.gz) = 745161 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 SIZE (yaoweibin-ngx_http_substitutions_filter_module-b8a71ea_GH0.tar.gz) = 94039 -SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 34d51afcd464582e6011a5d3abe6829c5690ddb9b50c993dfdafb4c725a4803a -SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 48378 +SHA256 (tarantool-nginx_upstream_module-aeb8696_GH0.tar.gz) = 514aa57155c73c2e3f7bdfe00c580183df343f2fa4b34e77f040cf6557caffae +SIZE (tarantool-nginx_upstream_module-aeb8696_GH0.tar.gz) = 75708 SHA256 (fdintino-nginx-upload-module-aa42509_GH0.tar.gz) = 2285245bdef11656e5bcc866e693e48f84b7443d36924f45a6fb8647cd35319a SIZE (fdintino-nginx-upload-module-aa42509_GH0.tar.gz) = 42221 SHA256 (masterzen-nginx-upload-progress-module-afb2d31_GH0.tar.gz) = 6318851cc3a624aaad3b1f4cd9f51f79c86575c53dfe0c28bbdcf9470b6a33e6 diff --git a/www/nginx/files/extra-patch-ngx_http_tarantool-config b/www/nginx/files/extra-patch-ngx_http_tarantool-config index ce805292837b..196a8135ca2d 100644 --- a/www/nginx/files/extra-patch-ngx_http_tarantool-config +++ b/www/nginx/files/extra-patch-ngx_http_tarantool-config @@ -1,20 +1,24 @@ ---- ../nginx_upstream_module-1278ee5/config.orig 2016-08-07 15:39:47.000000000 -0400 -+++ ../nginx_upstream_module-1278ee5/config 2016-08-07 16:38:59.298414000 -0400 -@@ -1,14 +1,14 @@ - ngx_addon_name="ngx_http_tnt_module" - --__lib_yajl="$ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a" -+__lib_yajl="%%PREFIX%%/lib/libyajl.so" - - __module_src_dir="$ngx_addon_dir/src" - - __include_paths=" \ - $ngx_addon_dir/src \ +--- ../nginx_upstream_module-aeb8696/config.orig 2017-09-18 11:54:00.000000000 -0400 ++++ ../nginx_upstream_module-aeb8696/config 2017-12-04 21:56:41.978227000 -0500 +@@ -7,18 +7,10 @@ $ngx_addon_dir/third_party \ + " + +-test -f $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a && +-test -f $ngx_addon_dir/third_party/msgpuck/libmsgpuck.a && { +- libs=" \ +- $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a \ +- $ngx_addon_dir/third_party/msgpuck/libmsgpuck.a \ +- " +- +- include_paths="${include_paths} \ - $ngx_addon_dir/third_party/msgpuck \ - $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/include \ ++include_paths="${include_paths} \ + %%PREFIX%%/include/msgpuck \ + %%PREFIX%%/include/yajl \ " +-} + + module_src_dir="$ngx_addon_dir/src" - __sources=" \ diff --git a/www/nginx/files/extra-patch-ngx_http_tarantool-src-tp_transcode.c b/www/nginx/files/extra-patch-ngx_http_tarantool-src-tp_transcode.c deleted file mode 100644 index f2c71685a9a7..000000000000 --- a/www/nginx/files/extra-patch-ngx_http_tarantool-src-tp_transcode.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ../nginx_upstream_module-1278ee5/src/tp_transcode.c.orig 2016-08-08 03:39:47.000000000 +0800 -+++ ../nginx_upstream_module-1278ee5/src/tp_transcode.c 2018-03-01 04:23:02.513740000 +0800 -@@ -38,10 +38,6 @@ - # define GNU_SOURCES 1 - #endif /* !GNU_SOURCES */ - --#if !defined(MP_SOURCE) --# define MP_SOURCE 1 --#endif /* !MP_SOURCE */ -- - #include "tp_ext.h" - #include "tp_transcode.h" -