From nobody Tue Jun 4 15:14:33 2024 X-Original-To: dev-commits-ports-all@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 4VtvJp1LQLz5Lf8N; Tue, 04 Jun 2024 15:14: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 4VtvJp0NB6z3xk1; Tue, 4 Jun 2024 15:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717514074; 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=u1Z/KKxS/9tD9lrXmNspdKFMJvgjnqnS0XKfhUu3JoY=; b=wYY0yEiiRuSZHUUJP/tWd0M+xznncxVXMaRGpFbJTx8OqHHuje/D9bvy4Hq2CXWn4+E6se xGZZ6kZsemkeGX3V0RE9oOdKv7y45dVH7CD0oXqcy8xsbtjNkaD1U0DnWcvCXbybXWV8rP NCnCHFP++M8p/vn72ud19kFXPJFxIotIl6uNqHfAqxjmWzBmkNk54uLqWrQf59q5chRHf6 EzzqiUZn9frtIOQPZDG+Sj4T8cIlbSxmP+jCWvlCdZdR0pYkx79Y6G3lVuXy7Z2Aw4i4Tx mHuHfUpkjhTcZqnhOFRoPtRvXPFR/Nm+GRvqT1EEkCMl4CRxwgff5jqkNBzzmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717514074; a=rsa-sha256; cv=none; b=k8E3QbP1o5n5zIjRSVtXZo85LGAhBgPJ992XaEFyhCjJh9c6UvWdLR80afGoBChgnwurBT NF2ZXKOG1Juq3LavXDj7PnY9SAqgTIconOxoVZ4fWBamehatLGWohCeOQLH/dXecTYiwiS /m0OCluxnhE7DCpJsvUU5zwrokLOkrhrRjYWfmZDsEblkSQoWgyVZ0Vlzt2uroFTiawc7C qTuJEJwA6HJzTlY35mXON0r17xWI/CfzvK9PPnf6cdzCsiDcLYy8okTg3u6h/AUOPY7Xji sCzJHfZ60Tc+TJRV8Hcc9p5QUCFsQPi29BlZumVQiZTaPHwva2nmjfaHJR4rPw== 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=1717514074; 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=u1Z/KKxS/9tD9lrXmNspdKFMJvgjnqnS0XKfhUu3JoY=; b=kpke9OeSSRZoYcCoIVDklHu+Enzre/bPPRge7tlLZfM3fq6wZH4kV0WPZYHiLfBoDxhkjs hc10tEQp/tXcZxDqQtmwHo0g1l2oxTnxpCCs8tk8CXO5mqP8pFuAKu9YGo4bg05nmQdPB1 TcOjctaBFKqJ5VB6XEwBHRt98n++mHu97bioe1MQSLho8K5mTWv9eg4RD//TfDEgu1n5Wk KRAbnBEDek9nmetdYB5lqIG9i/TP5OrqqZjTbUfh9A41A90FrKbtXnuUFU/w8M5KOurzzb s7vXqqrKRD2jIU1P/1mx9Eursd0ilxPXjZMQV+NJ9pEXwHBBUcb+Bj8ole5OEw== 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 4VtvJn757xzP3b; Tue, 4 Jun 2024 15:14:33 +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 454FEX54084230; Tue, 4 Jun 2024 15:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 454FEXxI084227; Tue, 4 Jun 2024 15:14:33 GMT (envelope-from git) Date: Tue, 4 Jun 2024 15:14:33 GMT Message-Id: <202406041514.454FEXxI084227@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: 482b5137ce1e - main - www/nginx-devel: fix third-party passenger module warning List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 482b5137ce1ecb52784c7f07f8ae3e6cb61ae8e1 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=482b5137ce1ecb52784c7f07f8ae3e6cb61ae8e1 commit 482b5137ce1ecb52784c7f07f8ae3e6cb61ae8e1 Author: Sergey A. Osokin AuthorDate: 2024-06-04 15:09:42 +0000 Commit: Sergey A. Osokin CommitDate: 2024-06-04 15:14:28 +0000 www/nginx-devel: fix third-party passenger module warning Also, release third-party passenger module from the pcre1 users list, it builds fine with pcre2. Bump PORTREVISION. --- www/nginx-devel/Makefile | 4 ++-- ...tch-passenger_src_nginx__module_Configuration.c | 24 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index cdc155fdca37..27f1376a5f8c 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.27.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -244,7 +244,7 @@ CFLAGS+= -DNDEBUG CONFIGURE_ENV+= EXTRA_PRE_CXXFLAGS="-std=c++14" .endif -.if empty(PORT_OPTIONS:MMODSECURITY3) && empty(PORT_OPTIONS:MPASSENGER) +.if empty(PORT_OPTIONS:MMODSECURITY3) CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib" .else CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib -lpcre" diff --git a/www/nginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c b/www/nginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c index 4958d721fd2b..3d18184dd55e 100644 --- a/www/nginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c +++ b/www/nginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c @@ -1,11 +1,27 @@ ---- ../passenger-6.0.22/src/nginx_module/Configuration.c.orig 2024-05-29 12:56:52.144194000 -0400 -+++ ../passenger-6.0.22/src/nginx_module/Configuration.c 2024-05-29 12:58:07.308893000 -0400 -@@ -225,7 +225,7 @@ +--- ../passenger-6.0.22/src/nginx_module/Configuration.c.orig 2013-10-26 20:00:00.000000000 -0400 ++++ ../passenger-6.0.22/src/nginx_module/Configuration.c 2024-06-04 10:53:52.178855000 -0400 +@@ -224,8 +224,10 @@ + conf->upstream_config.send_lowat = NGX_CONF_UNSET_SIZE; conf->upstream_config.buffer_size = NGX_CONF_UNSET_SIZE; - #if NGINX_VERSION_NUM >= 1007007 +- #if NGINX_VERSION_NUM >= 1007007 - conf->upstream_config.limit_rate = NGX_CONF_UNSET_SIZE; ++ #if NGINX_VERSION_NUM >= 1027000 + conf->upstream_config.limit_rate = NGX_CONF_UNSET_PTR; ++ #elif NGINX_VERSION_NUM >= 1007007 ++ conf->upstream_config.limit_rate = NGX_CONF_UNSET_SiZE; #endif conf->upstream_config.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE; +@@ -465,7 +467,10 @@ + prev->upstream_config.buffer_size, + 16 * 1024); + +- #if NGINX_VERSION_NUM >= 1007007 ++ #if NGINX_VERSION_NUM >= 1027000 ++ ngx_conf_merge_ptr_value(conf->upstream_config.limit_rate, ++ prev->upstream_config.limit_rate, NULL); ++ #elif NGINX_VERSION_NUM >= 1007007 + ngx_conf_merge_size_value(conf->upstream_config.limit_rate, + prev->upstream_config.limit_rate, 0); + #endif