From nobody Thu May 18 06:32:33 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 4QMKsG1rWLz3bGj2; Thu, 18 May 2023 06:32:34 +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 4QMKsG0T5Qz4Npq; Thu, 18 May 2023 06:32:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684391554; 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=A1QWuLYn3xoGvWXhLJwKDfrnoC3ZgrjBwTAbFenYL9Q=; b=d1HnQL/l1247BUK7pNDcEIjkf4qmSucDyEcSgcXdYG7pDp77xheXwWbZojN3RBHY9mvmrj 5ryi2F7zPhWInkdvh1JidVVHHXxNVz2KNC0BPbKOFAbxtq2MVAmHSjJgpghTL3GHrgMYgi kj0Jtj3VoepOOALMSIqfcy2N6UT7nk/ic4KjLksoRakvHu/z5jU6e8ITPduyET6ibB6jtd lNXA/GlWX3aCcVt4eJ0bIEf3EMcy04zh7ucRPenrAm9lUxjJ7nr7cLEELfLVL/f4AemEY8 rv+7zdGOfYJ/o1jsa2aZuemAUGw+YAwensCT6BT8YVKqVRXWFgfT+ogU87nCSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684391554; 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=A1QWuLYn3xoGvWXhLJwKDfrnoC3ZgrjBwTAbFenYL9Q=; b=fH7ZhPAF+GM6VbEPkkL4AtF0D7yrF7iwbCYaowBX0ljjJ1seDDZg7oSmYLU2gt8Wt5V9x/ 6qe/bJJWXBK+WKaAAJSZYyRXnHW9Ip5p0Qyy/0Xm8tj5tt0mle0o2Y0raaeavcoly2XLjF lCO7Y0DAjkCgmggsSD8jFsOXQgCzFaQ5dsdqlgfMmxZJ7zaPIL7AzJuWALpexhbvAzU6N0 mmkCoY9gk3lYgzMM8yr8CK4D6ptTSOQQlvVY1nWBaQGBoCjolbDlCsKE5IDoSSIqPSz69Z 40VKeuGm0ERJRaGqyRpB/LdsQk1mJutVUtJMTnsOiXKhzfYnfQZLzVIYd3Z2kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684391554; a=rsa-sha256; cv=none; b=PDi4MS7lUFdAWskpACcGLrzGqlbguUGddebvfOKt9KW1xGeJoisWQFj39yYUCkvBTV/rOO V5troAFWTWaq2lVgFjA4Tay9ouOOkd8d0VlEWfT9aMGjWKKTe/X/9g8Q6Yao2nt+0pvY7W iD5c5v7vgOtaErJEzBzjldSPzLjYEW1ITdlr2wM7sV44T9moe2sNi6crzBbgpW14erEWPL 2n+YxT/i66yae/joZ+RkY59rxW8NDY76ZJ8abnEx8PRlo7gtCESQk/Gd6u5GKb3OmM7xE/ hAZTnfGpo4fEttu7GMX6PNabPVs5CyR0b09yU1sg8U6xk9TXqltHbDLahG9fsg== 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 4QMKsF6hsSzbLp; Thu, 18 May 2023 06:32:33 +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 34I6WXdt081585; Thu, 18 May 2023 06:32:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34I6WX55081584; Thu, 18 May 2023 06:32:33 GMT (envelope-from git) Date: Thu, 18 May 2023 06:32:33 GMT Message-Id: <202305180632.34I6WX55081584@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: fbbfb0d1ec8c - main - www/nginx: Add the http_proxy_connect module option 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbbfb0d1ec8c5c43b00098131597ea711be1a17c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=fbbfb0d1ec8c5c43b00098131597ea711be1a17c commit fbbfb0d1ec8c5c43b00098131597ea711be1a17c Author: Yuri Victorovich AuthorDate: 2023-05-18 06:30:57 +0000 Commit: Yuri Victorovich CommitDate: 2023-05-18 06:32:23 +0000 www/nginx: Add the http_proxy_connect module option PR: 271237 Approved by: joneum@ (maintainer's timeout; 14 days) --- www/nginx/Makefile | 2 +- www/nginx/Makefile.extmod | 6 +++++- www/nginx/Makefile.options.desc | 1 + www/nginx/distinfo | 2 ++ www/nginx/pkg-plist | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index b9d9fa68f1f9..ed76a30f3a42 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,6 +1,6 @@ PORTNAME= nginx PORTVERSION= 1.24.0 -PORTREVISION?= 5 +PORTREVISION?= 6 PORTEPOCH= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 897034118b2e..2483f2c97a99 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -7,7 +7,7 @@ OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE COOKIE_FLAG FIPS_CHECK FORMINPUT GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST \ HTTP_AUTH_KRB5 HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL \ HTTP_FANCYINDEX HTTP_FOOTER HTTP_GEOIP2 HTTP_IP2LOCATION HTTP_IP2PROXY \ - HTTP_JSON_STATUS HTTP_MOGILEFS HTTP_MP4_H264 HTTP_NOTICE HTTP_PUSH \ + HTTP_JSON_STATUS HTTP_MOGILEFS HTTP_MP4_H264 HTTP_NOTICE HTTP_PROXY_CONNECT HTTP_PUSH \ HTTP_PUSH_STREAM HTTP_REDIS HTTP_SLICE_AHEAD HTTP_SUBS_FILTER HTTP_TARANTOOL \ HTTP_UPLOAD HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR \ HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LINK LUA MEMC \ @@ -101,6 +101,10 @@ HTTP_AUTH_LDAP_USES= ldap HTTP_AUTH_PAM_GH_TUPLE= sto:ngx_http_auth_pam_module:v1.5.3:auth_pam HTTP_AUTH_PAM_VARS= DSO_EXTMODS+=auth_pam +HTTP_PROXY_CONNECT_GH_TUPLE= chobits:ngx_http_proxy_connect_module:75febef:mod_https_connect +HTTP_PROXY_CONNECT_EXTRA_PATCHES= ${WRKSRC_mod_https_connect}/patch/proxy_connect_rewrite_102101.patch:-p1 +HTTP_PROXY_CONNECT_VARS= DSO_EXTMODS+=mod_https_connect + HTTP_DAV_EXT_IMPLIES= HTTP_DAV HTTP_DAV_EXT_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libxslt.so:textproc/libxslt diff --git a/www/nginx/Makefile.options.desc b/www/nginx/Makefile.options.desc index e56d3d83c6b1..dc7f5a7c47a1 100644 --- a/www/nginx/Makefile.options.desc +++ b/www/nginx/Makefile.options.desc @@ -54,6 +54,7 @@ HTTP_MP4_DESC= Enable http_mp4 module HTTP_MP4_H264_DESC= 3rd party mp4/h264 module HTTP_NOTICE_DESC= 3rd party notice module HTTP_PERL_DESC= Enable http_perl module +HTTP_PROXY_CONNECT_DESC= 3rd party https proxy connect module HTTP_PUSH_DESC= 3rd party push module HTTP_PUSH_STREAM_DESC= 3rd party push stream module HTTP_RANDOM_INDEX_DESC= Enable http_random_index module diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 829c96dae135..95601fb73b4b 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,6 +1,8 @@ TIMESTAMP = 1684343308 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 diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist index 24e7d0fd46bc..1b784d1d3c92 100644 --- a/www/nginx/pkg-plist +++ b/www/nginx/pkg-plist @@ -45,6 +45,7 @@ %%DSO%%%%HTTP_NOTICE%%libexec/nginx/ngx_http_notice_module.so %%DSO%%%%HTTP_PERL%%libexec/nginx/ngx_http_perl_module.so %%DSO%%%%HTTP_PUSH%%libexec/nginx/ngx_nchan_module.so +%%DSO%%%%HTTP_PROXY_CONNECT%%libexec/nginx/ngx_http_proxy_connect_module.so %%DSO%%%%HTTP_PUSH_STREAM%%libexec/nginx/ngx_http_push_stream_module.so %%DSO%%%%HTTP_REDIS%%libexec/nginx/ngx_http_redis_module.so %%DSO%%%%HTTP_SUBS_FILTER%%libexec/nginx/ngx_http_subs_filter_module.so