Attachment 241962 Details for Bug 271237 – patch

[patch] patch

nginx.patch (text/plain), 3.70 KB, created by Yuri Victorovich on 2023-05-04 06:11:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2023-05-04 06:11:15 UTC

Size: 3.70 KB

patch

obsolete

>diff --git a/www/nginx/Makefile b/www/nginx/Makefile
>index 6a12caffdf67..ac16210752c5 100644
>--- a/www/nginx/Makefile
>+++ b/www/nginx/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	nginx
> PORTVERSION=	1.24.0
>-PORTREVISION?=	3
>+PORTREVISION?=	4
> PORTEPOCH=	3
> CATEGORIES=	www
> MASTER_SITES=	https://nginx.org/download/ \
>diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
>index 83bbd228729b..b2a5d3ac093a 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 47afcc274018..750ab366e8d7 100644
>--- a/www/nginx/distinfo
>+++ b/www/nginx/distinfo
>@@ -1,6 +1,8 @@
> TIMESTAMP = 1682928975
> 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

Actions: View | Diff

Attachments on bug 271237: 241962