From nobody Sat Sep 30 17:36:14 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 4RyZBl158Gz4vcNP; Sat, 30 Sep 2023 17:36:15 +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 4RyZBl0YRFz4Y3J; Sat, 30 Sep 2023 17:36:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696095375; 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=5Dtxb2n5Kq7YVxPBMcIEsTn0LsNuTV7Zq0Kq8h6WuPo=; b=VkkA20wK+1MLranKP363CrWU5VSwOMMUwkA2CPYUJvhJXGFxJoha7Jz0GyE/uDWj4mYqAt zZRDUCoW6wLYPCDgHWnhAKxr0gOLYsjGEGVN/co8wQGtsN25jthidS2jyiD6t8l95DTW4B VUOD+FkR8lU+m3gpXB9ecW+2bIJqQGXpKLbPLvcFO9gkOWPjzukX84nCUPVAfeKVqR3z3E lijMPYODirAfqyNY7Zo3nz+2QUgIIEyrXLVQrpVb3yZKRcCzJysBimRm9aK8Gz1vYnTJUI O8n3uJkH00uy8rCKgftVEDuISc5g5c3+Hsz0I0LwaTf6P8X7u2WBQ1/pcRSLNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696095375; a=rsa-sha256; cv=none; b=mKXSBa1DSa5NkX48EazPAZ65/w/JBwOzLweVWwUwwu/++GvSRNT+by1M0jxz1xk0xNLyAC jdZi2gvJPyuKO1U+6n3/GH+2VHJIPqu7nEaXclIo2I4vacNF5n4AwYDi3ATnUtg6Ijkq67 eT63jz3/SgELqaq2ZtpSwPXnAFC8fzmFnBio2EMxYJMSOpqMGS/ZNbAj9MDuizNgfTdOU3 p5W/LgDvlDHig5nVma0rSLEIk6EcDv6/qHa0NUqj06bMfXZp0sVyH4CJxJ9eH+D511k7xO kTfoLSXTBtod2eaiCRVoGUnDRypwqdb6eqGBzzL3uCVUpluqU8XtYGfvkI05PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696095375; 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=5Dtxb2n5Kq7YVxPBMcIEsTn0LsNuTV7Zq0Kq8h6WuPo=; b=j4iE+9a5G14Gf3fL+mE1YZ0nZ20ZcGkAM7S2NlQB+tMf7A8LxGervVEZJByrzuAIywBtWI XS6FyBiADs6hsqKRGUA43fWYqZ8Edt1h9XRZLTPCk+p9psxHdYRjcbglP7zcotgOBCI2g3 3s70JERWiqFaPCckAiP6mAjXNrBu89LfO97Iutby0cdVcsVQOYVSM9G+vMTG404SFNZLh0 73V601kmM7C1Oz0WJKCZNGYuvybYHuQCRybqevjJqwxtA9Uccnpj/03HyQU/97ZVOw8mnP U77v6aRmgNuKTZnIvNyFzlEMdRHJF5uLBHuUxyCVlJ2gBKVLEDr3fxTw73xBvw== 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 4RyZBk6jl4zwcV; Sat, 30 Sep 2023 17:36:14 +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 38UHaEbp009660; Sat, 30 Sep 2023 17:36:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38UHaE58009657; Sat, 30 Sep 2023 17:36:14 GMT (envelope-from git) Date: Sat, 30 Sep 2023 17:36:14 GMT Message-Id: <202309301736.38UHaE58009657@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: 74dd0464af00 - main - www/nginx-devel: update third-party brotli module (+) 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: 74dd0464af0008c3691bf03cb5d8855a1070a656 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=74dd0464af0008c3691bf03cb5d8855a1070a656 commit 74dd0464af0008c3691bf03cb5d8855a1070a656 Author: Sergey A. Osokin AuthorDate: 2023-09-30 17:35:10 +0000 Commit: Sergey A. Osokin CommitDate: 2023-09-30 17:36:08 +0000 www/nginx-devel: update third-party brotli module (+) Bump PORTREVISION. --- www/nginx-devel/Makefile | 5 ++- www/nginx-devel/Makefile.extmod | 3 +- www/nginx-devel/distinfo | 6 ++-- .../files/extra-patch-ngx_brotli_filter_config | 41 ++++++++++++++++++++++ 4 files changed, 50 insertions(+), 5 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 5533762cbcce..3020be272df6 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.25.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -278,6 +278,9 @@ post-patch: s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \ ${WRKSRC}/conf/nginx.conf +post-patch-BROTLI-on: + @${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_brotli}/filter/config + post-patch-DRIZZLE-on: @${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_drizzle}/config diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 201b688de894..959c06ccfbcc 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -26,8 +26,9 @@ AWS_AUTH_GH_TUPLE= anomalizer:ngx_aws_auth:21931b2:aws_auth AWS_AUTH_VARS= DSO_EXTMODS+=aws_auth BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli -BROTLI_GH_TUPLE= google:ngx_brotli:9aec15e:brotli +BROTLI_GH_TUPLE= google:ngx_brotli:659b4b3:brotli BROTLI_VARS= DSO_EXTMODS+=brotli +BROTLI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_brotli_filter_config CACHE_PURGE_GH_TUPLE= nginx-modules:ngx_cache_purge:a84b0f3:cache_purge CACHE_PURGE_VARS= DSO_EXTMODS+=cache_purge diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 901e2a898680..865b404d33d0 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1695822030 +TIMESTAMP = 1696093034 SHA256 (nginx-1.25.2.tar.gz) = 05dd6d9356d66a74e61035f2a42162f8c754c97cf1ba64e7a801ba158d6c0711 SIZE (nginx-1.25.2.tar.gz) = 1214903 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -15,8 +15,8 @@ SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e29 SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280 SHA256 (anomalizer-ngx_aws_auth-21931b2_GH0.tar.gz) = d8a2422da96a638e9a911e4edb592954d9c0fe1576456fec9809ef4e2a0a863d SIZE (anomalizer-ngx_aws_auth-21931b2_GH0.tar.gz) = 15580 -SHA256 (google-ngx_brotli-9aec15e_GH0.tar.gz) = 0177b1158ff7092b9996346de28a0b296dc33addb2af4e8904794d19b4a9a808 -SIZE (google-ngx_brotli-9aec15e_GH0.tar.gz) = 16194 +SHA256 (google-ngx_brotli-659b4b3_GH0.tar.gz) = 34308698dbc6c17f16193d62396746ecba5c5f1482a07bf5785b1396632e6f73 +SIZE (google-ngx_brotli-659b4b3_GH0.tar.gz) = 16333 SHA256 (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = ddfd4fdd99075d906b7b75c49f56ec96b76df7951dfa54502e0f83890447031f SIZE (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = 17162 SHA256 (AirisX-nginx_cookie_flag_module-c4ff449_GH0.tar.gz) = 4b8c1c1e1ed59ed85751f4bd7d68026ad5051103c8b983e05ad17eb0cdab138e diff --git a/www/nginx-devel/files/extra-patch-ngx_brotli_filter_config b/www/nginx-devel/files/extra-patch-ngx_brotli_filter_config new file mode 100644 index 000000000000..aaa2409f678f --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_brotli_filter_config @@ -0,0 +1,41 @@ +--- ../ngx_brotli-659b4b3/filter/config.orig 2023-09-30 13:17:01.637746000 -0400 ++++ ../ngx_brotli-659b4b3/filter/config 2023-09-30 13:23:51.839920000 -0400 +@@ -42,33 +42,16 @@ + ngx_module_type=HTTP_FILTER + ngx_module_name=ngx_http_brotli_filter_module + +-brotli="$ngx_addon_dir/deps/brotli/c" +-if [ ! -f "$brotli/include/brotli/encode.h" ]; then +-cat << END ++BROTLI_ENC_H="%%PREFIX%%/include/brotli/encode.h \ ++ %%PREFIX%%/include/brotli/port.h \ ++ %%PREFIX%%/include/brotli/types.h" + +-$0: error: \ +-Brotli library is missing from the $brotli directory. + +-Please make sure that the git submodule has been checked out: +- +- cd $ngx_addon_dir && git submodule update --init && cd $PWD +- +-END +- exit 1 +-fi +- +-BROTLI_OUTPUT_DIRECTORY="$brotli/../out" +-BROTLI_ENC_H="$brotli/include/brotli/encode.h \ +- $brotli/include/brotli/port.h \ +- $brotli/include/brotli/types.h" +- +- +-ngx_module_incs="$brotli/include" ++ngx_module_incs="$BROTLI_ENC_H" + ngx_module_deps="$BROTLI_ENC_H" + ngx_module_srcs="$BROTLI_MODULE_SRC_DIR/ngx_http_brotli_filter_module.c" +-ngx_module_libs="-L$BROTLI_OUTPUT_DIRECTORY -lbrotlienc -lbrotlicommon -lm" ++ngx_module_libs="-L%%PREFIX%%/lib -lbrotlienc -lbrotlicommon -lm" + ngx_module_order="$ngx_module_name \ +- ngx_pagespeed \ + ngx_http_postpone_filter_module \ + ngx_http_ssi_filter_module \ + ngx_http_charset_filter_module \