From nobody Thu Jul 13 18:24:06 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 4R230Q2S6sz2thyZ; Thu, 13 Jul 2023 18:24:06 +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 4R230Q1vqpz4DV2; Thu, 13 Jul 2023 18:24:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689272646; 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=pB7g3yKzAvnqC+pjfu21PqAuOdAeZBCshT47ETc3M70=; b=DxqmcY4u3/v5tIFn9piYLp1viXKmmg0suOk1UjKeSpbU9N2rev0gNP2ZMCtz+qg1aL8hxw i2V1rA5rS0HYG2cFjE1WbWCQE+AMjUGa7LvgUKIysGqclt2osv+ztKpYvTVC2I0JoyTxgu xzv0K7iYyYQDqNE0LK2oz0dBQrNprZBb5ALPvk5102ngSmO8LOjM6x/Ymc1DKxwc0xSJQS nqUJ18rtcvUeIlu8VTUzd3Y+4d1HGzX086qTVwT2efQG6oPN/H+AEB9OJ9SKS5LuNx71mM Mxkc1EIavIh8l7jkODrGV9VfwFjB8IwxzoxBvQ/ndj1DOqRWlJaWESZVs7bhrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689272646; 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=pB7g3yKzAvnqC+pjfu21PqAuOdAeZBCshT47ETc3M70=; b=j0fFfk9YJ3xg+GiYy5EkISUDuXByve+fMKv8FcLthOpdwV2KhYROU0VBfuDolS6jbblJte USieOFnKhfTmL4H4UeMTmZICrKSlPwJ0tP5yM5YaGbOx4Wmf+m1SpDHl3Y0JdlCMIDEVnN vqqgTsP02o1YBJz22a8TwOoN8yg2mQV08nNSXavzHmYc/ocbMgDymM5plq4f9Qmw5DjZmc 9dffNknVPqbpEayU0UohIJL8Po0IETrvP/tJ90PzmM3qSK54LT2cHBU1Wj3uapljJgcX0c affuWC7/FWNGOLvfT0Bsg583kA5EtkFc0adEkHgoVcu7tjCfIfN8z9NDflOktw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689272646; a=rsa-sha256; cv=none; b=g+B1hoGLDhroN5s6px6xPSB7FFciMzs9IlMkW3i9e/x5t7vZt98iL2sCGy9ZxAoFKvSgYJ L+Y5HkvxmNbw4wa8IiuVZKYUXLoiKJGqz6KWhBDH03iW1lsafTacsDFtHduvbVtXpepSZA 8/x/aJsQG0Ix2Ek21mdgADOku6LiMz6OdnNpV5Gfa3492vYnoAa1OrcgbfhcU91k2ihXHx mzwmCn8QTGn9CSXDZUoEbFqnS6YFbW90HmuG45682no+liueXlnI4qGja1ewaPoR5b2qbY UBMAqwhdnGakdGyinwPqtDhnfk6nkimVSFzMwqTHBZemD/Bby+auUTjgiPrjnQ== 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 4R230Q0yVnz11y9; Thu, 13 Jul 2023 18:24:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36DIO6Wt008813; Thu, 13 Jul 2023 18:24:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DIO600008812; Thu, 13 Jul 2023 18:24:06 GMT (envelope-from git) Date: Thu, 13 Jul 2023 18:24:06 GMT Message-Id: <202307131824.36DIO600008812@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: 7cafd4bb68f8 - main - www/nginx: Update NJS to 0.8.0 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: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cafd4bb68f8d408a47bbae09921d8e6a72d96a5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=7cafd4bb68f8d408a47bbae09921d8e6a72d96a5 commit 7cafd4bb68f8d408a47bbae09921d8e6a72d96a5 Author: Jochen Neumeister AuthorDate: 2023-07-13 18:22:29 +0000 Commit: Jochen Neumeister CommitDate: 2023-07-13 18:24:00 +0000 www/nginx: Update NJS to 0.8.0 Sponsored by: Netzkommune GmbH --- www/nginx/Makefile | 5 +++-- www/nginx/Makefile.extmod | 6 +++--- www/nginx/distinfo | 10 +++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 55ea3ebe9cd2..83809e4e5c94 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,6 +1,6 @@ PORTNAME= nginx PORTVERSION= 1.24.0 -PORTREVISION?= 7 +PORTREVISION?= 8 PORTEPOCH= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ @@ -252,7 +252,8 @@ CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib -lpcre" LIB_DEPENDS+= libpcre.so:devel/pcre .endif -.if empty(PORT_OPTIONS:MNJS_XML) +.if ${PORT_OPTIONS:MNJS} && empty(PORT_OPTIONS:MNJS_XML) +CONFIGURE_ENV+= NJS_LIBXSLT=NO NJS_CONFIGURE_ARGS= --no-libxml2 .endif diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 5782924cb8f0..ece412d2173a 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -248,12 +248,12 @@ NAXSI_DISTFILES= naxsi-${NAXSI_NGINX_VER}-src-with-deps.tar.gz:naxsi NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src WRKSRC_naxsi= ${WRKDIR}/naxsi-${NAXSI_NGINX_VER} -NJS_GH_TUPLE= nginx:njs:0.7.12:njs +NJS_GH_TUPLE= nginx:njs:0.8.0:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx -NJS_USES= libedit NJS_XML_IMPLIES= NJS -NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 +NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ + libxslt.so:textproc/libxslt OPENTRACING_GH_TUPLE= opentracing-contrib:nginx-opentracing:v0.24.0:opentracing OPENTRACING_LIB_DEPENDS= libopentracing.so:devel/libopentracing diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 5a752448dc29..0f7e6c5fd28e 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,8 +1,6 @@ -TIMESTAMP = 1687522128 +TIMESTAMP = 1689269961 SHA256 (nginx-1.24.0.tar.gz) = 77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d SIZE (nginx-1.24.0.tar.gz) = 1112471 -SHA256 (chobits-ngx_http_proxy_connect_module-75febef_GH0.tar.gz) = 6169361f31607af0ec8c78b356e62c2aeb128649161d688d7ea92f4d2c1c39f9 -SIZE (chobits-ngx_http_proxy_connect_module-75febef_GH0.tar.gz) = 32645 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19 @@ -75,6 +73,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 (chobits-ngx_http_proxy_connect_module-75febef_GH0.tar.gz) = 6169361f31607af0ec8c78b356e62c2aeb128649161d688d7ea92f4d2c1c39f9 +SIZE (chobits-ngx_http_proxy_connect_module-75febef_GH0.tar.gz) = 32645 SHA256 (slact-nchan-v1.3.6_GH0.tar.gz) = ba0b7cc6b710a20ce1ed2554caf56154035291aaf115e407d7a6bb699fde42df SIZE (slact-nchan-v1.3.6_GH0.tar.gz) = 761436 SHA256 (wandenberg-nginx-push-stream-module-8c02220_GH0.tar.gz) = ab4fbe236e8bc500f0c5e13403d6a0e2e4e4ec17b81e0fcedaf669b4339626a6 @@ -109,8 +109,8 @@ SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bf SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654 SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b SIZE (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 34063 -SHA256 (nginx-njs-0.7.12_GH0.tar.gz) = 7a75a39022dfb58dbf461053903a07cc48dd4942f7d82a46601819c1b0077687 -SIZE (nginx-njs-0.7.12_GH0.tar.gz) = 662554 +SHA256 (nginx-njs-0.8.0_GH0.tar.gz) = b98033fff6aadcbb8e108b96e80c0d94c6e2103bcbe75846b5ae0b560696084b +SIZE (nginx-njs-0.8.0_GH0.tar.gz) = 715391 SHA256 (opentracing-contrib-nginx-opentracing-v0.24.0_GH0.tar.gz) = 5328c5f37e0615b5252aed51b9cd40f3d14989d995ad54134076aeda4ab9b280 SIZE (opentracing-contrib-nginx-opentracing-v0.24.0_GH0.tar.gz) = 679417 SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b