From nobody Sun Dec 3 10:24:54 2023
X-Original-To: dev-commits-ports-branches@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 4SjjbY2XSWz52fcr;
Sun, 3 Dec 2023 10:24:57 +0000 (UTC)
(envelope-from joneum@FreeBSD.org)
Received: from mail.xn--zhlsdorff-q9a.eu (mail.xn--zhlsdorff-q9a.eu [142.132.193.151])
(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 mx1.freebsd.org (Postfix) with ESMTPS id 4SjjbY0Jkwz3bTf;
Sun, 3 Dec 2023 10:24:57 +0000 (UTC)
(envelope-from joneum@FreeBSD.org)
Authentication-Results: mx1.freebsd.org;
none
Received: from [192.168.188.37] (p579931d3.dip0.t-ipconnect.de [87.153.49.211])
(using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)
key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256)
(No client certificate requested)
(Authenticated sender: jochen@toco-domains.de)
by mail.xn--zhlsdorff-q9a.eu (Postfix) with ESMTPSA id 84E4E7DB3B;
Sun, 3 Dec 2023 10:24:54 +0000 (UTC)
Message-ID: <211564aa-cf00-44e0-8690-253c59c308dd@FreeBSD.org>
Date: Sun, 3 Dec 2023 11:24:54 +0100
List-Id: Commits to the quarterly branches of the FreeBSD ports repository <dev-commits-ports-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches
List-Help: <mailto:dev-commits-ports-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-branches@freebsd.org
X-BeenThere: dev-commits-ports-branches@freebsd.org
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: git: 8848573087ff - 2023Q4 - www/nginx: fix build with a
third-party passenger module
To: Mathieu Arnold <mat@freebsd.org>
Cc: Koichiro Iwao <meta@freebsd.org>, ports-committers@freebsd.org,
dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org,
"portmgr@FreeBSD.org" <portmgr@freebsd.org>
References: <202312030958.3B39wDQA036372@gitrepo.freebsd.org>
<8ce4f3ab-54d2-422c-96d3-9b2094fa6099@FreeBSD.org>
<hqvzenetuiyrrz4uvkc2h5tuo3iit2t2lkwg32uslnto5fws5m@ruo77tiyl4jx>
Content-Language: de-DE
From: Jochen Neumeister <joneum@FreeBSD.org>
In-Reply-To: <hqvzenetuiyrrz4uvkc2h5tuo3iit2t2lkwg32uslnto5fws5m@ruo77tiyl4jx>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: -0.10
X-Rspamd-Action: no action
X-Spam-Status: No, score=-0.10
X-Rspamd-Server: mail.xn--zhlsdorff-q9a.eu
X-Rspamd-Pre-Result: action=no action;
module=multimap;
Matched map: WHITELIST_SENDER_DOMAIN
X-Spamd-Bar: ----
X-Rspamd-Pre-Result: action=no action;
module=replies;
Message is reply to one we originated
X-Spamd-Result: default: False [-4.00 / 15.00];
REPLY(-4.00)[];
ASN(0.00)[asn:24940, ipnet:142.132.128.0/17, country:DE]
X-Rspamd-Queue-Id: 4SjjbY0Jkwz3bTf
Am 03.12.23 um 11:21 schrieb Mathieu Arnold:
> On Sun, Dec 03, 2023 at 11:01:26AM +0100, Jochen Neumeister wrote:
>> Is it normal that you just do something like that here without consulting
>> anyone? What do we have rules for here?
> Well, who would meta@ need to consult about this? It is a simple fix,
> any committer can commit those, and also any committer can merge it into
> the current quarterly. Here is the rule, taken from
> https://docs.freebsd.org/en/books/porters-handbook/makefiles/#makefile-maintainer
> that explicitly says that:
>
> Maintainers have the primary responsibility for their ports, but
> not exclusive ownership. Ports exist for the benefit of the
> community and, in reality, belong to the community. What this
> means is that people other than the maintainer can make changes
> to a port.
So you're saying it's okay if someone else posts this in the quaterly
brach a few minutes after it's commit? You don't care that the
maintainer is still working on it? Thank you for this explanation!
>
>> Am 03.12.23 um 10:58 schrieb Koichiro Iwao:
>>> The branch 2023Q4 has been updated by meta:
>>>
>>> URL: https://cgit.FreeBSD.org/ports/commit/?id=8848573087ff210c5383adcd899b055c50467fb4
>>>
>>> commit 8848573087ff210c5383adcd899b055c50467fb4
>>> Author: Jochen Neumeister <joneum@FreeBSD.org>
>>> AuthorDate: 2023-12-03 07:51:41 +0000
>>> Commit: Koichiro Iwao <meta@FreeBSD.org>
>>> CommitDate: 2023-12-03 09:57:04 +0000
>>>
>>> www/nginx: fix build with a third-party passenger module
>>> PR: 275161
>>> Sponsored by: Netzkommune GmbH
>>> This commit is required to complete PR 275161. The fix for
>>> www/nginx-devel is not necessary at the moment.
>>> (cherry picked from commit b31426d1f77c12e47a60ff4b6b663826afd4702f)
>>> ---
>>> www/nginx/Makefile | 6 +++++-
>>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/www/nginx/Makefile b/www/nginx/Makefile
>>> index be56e8b593c4..d037ba99710a 100644
>>> --- a/www/nginx/Makefile
>>> +++ b/www/nginx/Makefile
>>> @@ -1,6 +1,6 @@
>>> PORTNAME= nginx
>>> PORTVERSION= 1.24.0
>>> -PORTREVISION?= 12
>>> +PORTREVISION?= 13
>>> PORTEPOCH= 3
>>> CATEGORIES= www
>>> MASTER_SITES= https://nginx.org/download/ \
>>> @@ -240,6 +240,10 @@ CONFIGURE_ENV+= OPTIMIZE="yes"
>>> CFLAGS+= -DNDEBUG
>>> .endif
>>> +.if ${PORT_OPTIONS:MPASSENGER}
>>> +CONFIGURE_ENV+= EXTRA_PRE_CXXFLAGS="-std=c++14"
>>> +.endif
>>> +
>>> # Fix build failure on clang >= 12
>>> .if ${PORT_OPTIONS:MHTTP_PERL} && ${OSVERSION} >= 1301000
>>> CFLAGS+= -Wno-compound-token-split-by-macro