From nobody Tue Apr 18 14:53:40 2023 X-Original-To: dev-commits-ports-main@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 4Q16PK0BfWz45CkH; Tue, 18 Apr 2023 14:53:41 +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 4Q16PJ6dZwz4LK5; Tue, 18 Apr 2023 14:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681829620; 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=S4nWwGJX/84Kf3xeIg7DxitS8VOlKVwvRqIHeZsSUcM=; b=HtppeLKDhmMUhLcRLxgG8aiy5Zs14ipUNU8wUQ/ixELQRvQ3xzSjiCSRkVxt0zOfQdN2pf y7yaCj5xunQ42jEkILKrGNSPih6M+fbMu5CcZAB9PvwyZPxizEeYkY/DszZtvnnz1xrJeq ecm3WdD5SGT3t2JHVHfEJt8t3IDmKDQSKHZGa1LPiw/k+OmmKfxKDYc4oipQrdOP7AXwRG exkjIpXdQPqrDNTJH/0KyfpiYmMU66rOIlQcYYDXtTI+15DORznLB2B7MWt8hXaUBrQtAc m3rxMATiUGNHxJU/W+EtEFJhiq0AZGqMbt0GtwTyUN3mMlPKbRVLlJ10FuY6jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681829620; 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=S4nWwGJX/84Kf3xeIg7DxitS8VOlKVwvRqIHeZsSUcM=; b=UmQMcnAwAUkqQH4gZNMGrAUwvaa/nrtTvCymBqauFp4jhUhdRqlpwJeTuudtIDdpFJSGMz VESjMi57hjcrr+UQGlswV96ul1xi8BJjXl5yIqGXpcfjRWxAvRkJRxFAOqfDFYHtisTO1I BiBC64ZQ2N3S6+FZBH7Oh/6tNk0kqkg2RpSFJYX2L1kBjen332z8FimxahGyHN+4dwT6AR PnvgNOs9MfCbuDwTtXw8LihMsZY2+hsCcUVpa/JcrX05FglFbSCiExvcjTt+EeHQrMM3aZ wWwqvYYsy3K4arXa457H94BZEBpDAxKrqx9V1z+snBhJjRiROcT5NCF33ZyPWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681829620; a=rsa-sha256; cv=none; b=eb8y/xAgC1pubAGPaOzX+GKE6i4sImXfMc5mCXZdlkBX7NrIZCF8PvDyJ31HaIUxVYmoIW B5pO5nYkhhLOM4mqxnUWVRQ/xzUQJiikh/8MeQeGmRHLS6qyuu7eU/CTq66vbC5zCmGTMn hlJ+mIfiN2D7/N+cLOg5njsFQUPVGExX3L+XmKTjwj5+tsTtsUOAp4dJ1VjKZ+Qu+pKBZx G4zsz4sQEDhWJQ3+X1hFXrOvwQyrZW9HL5y3z+qJFf8NHh3RUtfIZg3CuhApAnIh5BNP8E pbSRVm6Q1qt+h9JbgS5IQZmd2uVzBbWj+4V03ncOIhT/us11PZyrYuW1b0e7cw== 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 4Q16PJ5kcNzGlX; Tue, 18 Apr 2023 14:53:40 +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 33IEreeY060662; Tue, 18 Apr 2023 14:53:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33IEreso060661; Tue, 18 Apr 2023 14:53:40 GMT (envelope-from git) Date: Tue, 18 Apr 2023 14:53:40 GMT Message-Id: <202304181453.33IEreso060661@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 5b2a54b21add - main - www/nginx-devel: third-party modules update (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b2a54b21add1168a6eade7c978083ff0a300b72 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b2a54b21add1168a6eade7c978083ff0a300b72 commit 5b2a54b21add1168a6eade7c978083ff0a300b72 Author: Sergey A. Osokin AuthorDate: 2023-04-18 14:52:08 +0000 Commit: Sergey A. Osokin CommitDate: 2023-04-18 14:53:35 +0000 www/nginx-devel: third-party modules update (+) o) clojure to 0.6.0; o) vts to its recent commit on GH. Bump PORTREVISION. --- www/nginx-devel/Makefile | 2 +- www/nginx-devel/Makefile.extmod | 5 ++--- www/nginx-devel/distinfo | 10 +++++----- www/nginx-devel/files/extra-patch-ngx_http_clojure_mem.h | 11 ----------- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 878ddd819e7c..80fd088cfdf4 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.24.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 110443098f42..737f1f3c9a12 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -35,10 +35,9 @@ CACHE_PURGE_VARS= DSO_EXTMODS+=cache_purge CLOJURE_CATEGORIES+= java CLOJURE_USE= JAVA=yes JAVA_OS=native JAVA_VERSION=1.8 \ JAVA_VENDOR=openjdk JAVA_BUILD=yes JAVA_RUN=yes -CLOJURE_GH_TUPLE= nginx-clojure:nginx-clojure:4347955:clojure +CLOJURE_GH_TUPLE= nginx-clojure:nginx-clojure:v0.6.0:clojure CLOJURE_CONFIGURE_ENV= "JNI_INCS=-I${LOCALBASE}/openjdk8/include -I${LOCALBASE}/openjdk8/include/freebsd" CLOJURE_VARS= DSO_EXTMODS+=clojure CLOJURE_SUBDIR=/src/c -CLOJURE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_clojure_mem.h COOKIE_FLAG_GH_TUPLE= AirisX:nginx_cookie_flag_module:c4ff449:cookie_flag COOKIE_FLAG_VARS= DSO_EXTMODS+=cookie_flag @@ -315,7 +314,7 @@ VOD_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ VOD_USES= iconv VOD_VARS= DSO_EXTMODS+=vod -VTS_GH_TUPLE= vozlt:nginx-module-vts:v0.2.1:vts +VTS_GH_TUPLE= vozlt:nginx-module-vts:bf64dbf:vts VTS_VARS= DSO_EXTMODS+=vts XSS_GH_TUPLE= openresty:xss-nginx-module:v0.06:xss diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index b2a091fa25aa..f5044c40c60e 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1681772643 +TIMESTAMP = 1681827576 SHA256 (nginx-1.24.0.tar.gz) = 77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d SIZE (nginx-1.24.0.tar.gz) = 1112471 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -19,8 +19,8 @@ SHA256 (google-ngx_brotli-9aec15e_GH0.tar.gz) = 0177b1158ff7092b9996346de28a0b29 SIZE (google-ngx_brotli-9aec15e_GH0.tar.gz) = 16194 SHA256 (torden-ngx_cache_purge-2b977cf_GH0.tar.gz) = 9de7dad5827edf37e803435ee764f6815562053daa0821aedaf539580307ff93 SIZE (torden-ngx_cache_purge-2b977cf_GH0.tar.gz) = 16739 -SHA256 (nginx-clojure-nginx-clojure-4347955_GH0.tar.gz) = 9f0fc3b479936fc5b20101c6d238bff5a6f4a32b28d8ec4a511f902abe2abc1f -SIZE (nginx-clojure-nginx-clojure-4347955_GH0.tar.gz) = 756519 +SHA256 (nginx-clojure-nginx-clojure-v0.6.0_GH0.tar.gz) = e8215cdebc3eb13f852c10e9bbbf315f2e1b75bb4dec015ca60ec29efcb86509 +SIZE (nginx-clojure-nginx-clojure-v0.6.0_GH0.tar.gz) = 786029 SHA256 (AirisX-nginx_cookie_flag_module-c4ff449_GH0.tar.gz) = 4b8c1c1e1ed59ed85751f4bd7d68026ad5051103c8b983e05ad17eb0cdab138e SIZE (AirisX-nginx_cookie_flag_module-c4ff449_GH0.tar.gz) = 4713 SHA256 (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 72fdd125b9207cdda135f368095f85b943a78a4ff004d1cd217972e12b1571b2 @@ -135,8 +135,8 @@ SHA256 (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 748b67ceb82b3b843ae915bf786 SIZE (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 352431 SHA256 (kaltura-nginx-vod-module-1.31_GH0.tar.gz) = ace04201cf2d2b1a3e5e732a22b92225b8ce61a494df9cc7f79d97efface8952 SIZE (kaltura-nginx-vod-module-1.31_GH0.tar.gz) = 470904 -SHA256 (vozlt-nginx-module-vts-v0.2.1_GH0.tar.gz) = 1a63d78d3ae4df18b3a57a616eeee006cdc0bd71aa7ea2947046004b123704f4 -SIZE (vozlt-nginx-module-vts-v0.2.1_GH0.tar.gz) = 179679 +SHA256 (vozlt-nginx-module-vts-bf64dbf_GH0.tar.gz) = d2782c75e39cb2ecf68453922b43ab2295adb6a35fa6a0f9c14173f70d22d7b1 +SIZE (vozlt-nginx-module-vts-bf64dbf_GH0.tar.gz) = 180394 SHA256 (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = aca454bffcee2476dc92682ebfb8c0378a271fda178be7e945d648419d220758 SIZE (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = 14646 SHA256 (openresty-xss-nginx-module-v0.06_GH0.tar.gz) = 0b12bbc53a41f3e3d6df419c173b8c87434be3e6cd255a8193aa91345a2de6cf diff --git a/www/nginx-devel/files/extra-patch-ngx_http_clojure_mem.h b/www/nginx-devel/files/extra-patch-ngx_http_clojure_mem.h deleted file mode 100644 index 8ccf7ea4ba2b..000000000000 --- a/www/nginx-devel/files/extra-patch-ngx_http_clojure_mem.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../nginx-clojure-4347955/src/c/ngx_http_clojure_mem.h.orig 2022-07-11 13:38:32.426478000 -0400 -+++ ../nginx-clojure-4347955/src/c/ngx_http_clojure_mem.h 2022-07-11 13:38:45.346434000 -0400 -@@ -421,7 +421,7 @@ - #define NGX_HTTP_CLOJURE_HEADERSI_PASSWD_IDX 90 - #define NGX_HTTP_CLOJURE_HEADERSI_PASSWD_OFFSET offsetof(ngx_http_headers_in_t, passwd) - #define NGX_HTTP_CLOJURE_HEADERSI_COOKIE_IDX 91 --#define NGX_HTTP_CLOJURE_HEADERSI_COOKIE_OFFSET offsetof(ngx_http_headers_in_t, cookies) -+#define NGX_HTTP_CLOJURE_HEADERSI_COOKIE_OFFSET offsetof(ngx_http_headers_in_t, cookie) - #define NGX_HTTP_CLOJURE_HEADERSI_SERVER_IDX 92 - #define NGX_HTTP_CLOJURE_HEADERSI_SERVER_OFFSET offsetof(ngx_http_headers_in_t, server) - #define NGX_HTTP_CLOJURE_HEADERSI_CONTENT_LENGTH_N_IDX 93