From nobody Mon Jul 11 02:18:20 2022 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 131901D06AA5; Mon, 11 Jul 2022 02:18:21 +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 4Lh6xT053wz3cdr; Mon, 11 Jul 2022 02:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657505901; 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=0+6SWug00XAI137tUwsjFYRv+6fbO0QrGOnTMPsd9NY=; b=HldvXsQHQKZ90x+iGdsAo2FBnj/oI5TdYkyVaoOhRFbl+btLd2LXznDsq9y8eN6V/L3HsD 6jwcMxrkycZAUi1JbYGb/hEeTii15QMUoVuWv8HfWoUS6gtV/4YSdjk8+54nYgF9AszFrn JPckw98GUGM/J/t/gUSh+GAmFSYdVDCQu4YeENF2LRO/uii7A6l9dTJGPem/P/XrHmtV6r lCkKv9Ktoz/hiVon7/SIN/He3hh9Md32JzyBJSdPNPnH8iG/4VpxDimv5QPD2GFSihDGtp JAt7g1CDaYKv4jMUOylElawyE8Y8j5DSJFl1ccBB0IOekA4JRcEvHuXJAbqZcw== 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 4Lh6xS6DTnzmxv; Mon, 11 Jul 2022 02:18:20 +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 26B2IKSF063882; Mon, 11 Jul 2022 02:18:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26B2IKIE063881; Mon, 11 Jul 2022 02:18:20 GMT (envelope-from git) Date: Mon, 11 Jul 2022 02:18:20 GMT Message-Id: <202207110218.26B2IKIE063881@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: d9c95554e850 - main - www/nginx-devel: fix build for third-party http_redis 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: d9c95554e850af019fb03853a9bd049b97c6a853 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657505901; 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=0+6SWug00XAI137tUwsjFYRv+6fbO0QrGOnTMPsd9NY=; b=CPpEXLUpNG8Z4/eQJPetCLYSCbLnJsEtoti4/Alc6EThZ2exz/6/SDLQlB3hxEETyoUZ+5 1Ov3nIteSY2VO+wbsRG6YM0xehfrHXTVoPBbqq3dSLRoEqB5gClIVEznu9gJV1HPk5Uyjm zYMWbMqmcvUeb5SX+D7clCCmW9QreH1gSiB1wVugMQMgfe9rxnHiZP9aLo4z3BHQ3dqNYe i7PME0pWty+Ag6FRWiLlQSSt2tteZm/tDfPmbzMqr/RU2VIxWqW31zuK+gPCIF5hbS/thP sxt4/rMYgbkNArMLTQjM1C9bhoJSEc4aiJSARs3iwsluw+B4G7X2OzUpYi1DgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657505901; a=rsa-sha256; cv=none; b=sVP8bGKBnur6xjrkAsP+iAhCoJk2iuqMxmihGdebSGhaxm+J3lIcfQPSe9iNFafdLwCEj2 qmJ8J8K8TRrRlk+aYlHrPJLgGeZTgUITGiiyYxPLjCeNNrKECE6Ve5C67E295+IpKA+Ipi 8ILilHmp9b55i8cGNwHNuOwciqgXMtFOf3kpZjmm8QsfmsHM3tpPKU03hOoRlGr1IEdwJe jvZ24dqbQG+glhFOv30gqdhC+4oZjcYkKKEDnO8mLnPgt0f6XdjchpWjXk3zkB4W+wp4Pr ukJ6AllGkxsrd65J1yj3NiKc6IO10AhP9ZSRkhcppS01U+WR2IWt3nBlClmuYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=d9c95554e850af019fb03853a9bd049b97c6a853 commit d9c95554e850af019fb03853a9bd049b97c6a853 Author: Sergey A. Osokin AuthorDate: 2022-07-11 02:17:33 +0000 Commit: Sergey A. Osokin CommitDate: 2022-07-11 02:18:14 +0000 www/nginx-devel: fix build for third-party http_redis module Bump PORTREVISION. --- www/nginx-devel/Makefile | 3 +- www/nginx-devel/Makefile.extmod | 1 + .../files/extra-patch-ngx_http_redis_module.c | 34 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 46221d8853d4..170667410b67 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME?= nginx PORTVERSION= 1.23.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -246,7 +246,6 @@ NJS_CONFIGURE_ARGS= --no-pcre2 .endif .if ${PORT_OPTIONS:MCLOJURE} || \ - ${PORT_OPTIONS:MHTTP_REDIS} || \ ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS} IGNORE= a patch requires .endif diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 505a11f8915f..f4a68d6ac580 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -163,6 +163,7 @@ HTTP_PUSH_STREAM_VARS= DSO_EXTMODS+=pushstream HTTP_REDIS_MASTER_SITES= LOCAL/osa:redis HTTP_REDIS_DISTFILES= ngx_http_redis-0.3.9.tar.gz:redis HTTP_REDIS_VARS= DSO_EXTDIRS+=ngx_http_redis-0.3.9 +HTTP_REDIS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_redis_module.c HTTP_SLICE_AHEAD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c diff --git a/www/nginx-devel/files/extra-patch-ngx_http_redis_module.c b/www/nginx-devel/files/extra-patch-ngx_http_redis_module.c new file mode 100644 index 000000000000..3dacd39ee6c4 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_redis_module.c @@ -0,0 +1,34 @@ +--- ../ngx_http_redis-0.3.9/ngx_http_redis_module.c.orig 2022-07-10 22:10:19.031893000 -0400 ++++ ../ngx_http_redis-0.3.9/ngx_http_redis_module.c 2022-07-10 22:09:41.271731000 -0400 +@@ -562,7 +562,7 @@ + /* if defined gzip_flag... */ + if (rlcf->gzip_flag) { + /* hash init */ +- h = ngx_list_push(&r->upstream->headers_in.headers); ++ h = ngx_list_push(&r->headers_out.headers); + if (h == NULL) { + return NGX_ERROR; + } +@@ -571,19 +571,11 @@ + * add Content-Encoding header for future gunzipping + * with ngx_http_gunzip_filter module + */ +- h->hash = ngx_hash(ngx_hash(ngx_hash(ngx_hash( +- ngx_hash(ngx_hash(ngx_hash( +- ngx_hash(ngx_hash(ngx_hash( +- ngx_hash(ngx_hash(ngx_hash( +- ngx_hash(ngx_hash('c', 'o'), 'n'), 't'), 'e'), +- 'n'), 't'), '-'), 'e'), 'n'), 'c'), 'o'), +- 'd'), 'i'), 'n'), 'g'); ++ h->hash = 1; ++ h->next = NULL; + ngx_str_set(&h->key, "Content-Encoding"); + ngx_str_set(&h->value, "gzip"); +- h->lowcase_key = (u_char*) "content-encoding"; +-#if (NGX_HTTP_GZIP) +- u->headers_in.content_encoding = h; +-#endif ++ r->headers_out.content_encoding = h; + } + + /* try to find end of string */