From nobody Tue Apr 29 18:35:36 2025 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 4Zn8Cg1MB0z5vNDY for ; Tue, 29 Apr 2025 18:36:15 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zn8Cg0d7bz3CbW for ; Tue, 29 Apr 2025 18:36:15 +0000 (UTC) (envelope-from sunpoet@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745951775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=erJMnW3EfHwsRSDM2Mar8D+YikylyQpyOz31MOXYYUY=; b=acakFF9HPKdJJ4N76Z2Z+G4w+FdT5t2yrvk6lCMqAnZ7/NBLfaVR40Ev7u9PVG3tw6P4Bp CZfEv6v0UmOJrpfUA1+6Ba4AmmwnxZshIjRR9FwmjuTHrE7P7TZdCgEl7cuoh1Qgrfkb5X tB6dLBlU9z7etCz6+GwMqelIcHQWb/cX7hdUjbFX2a41sN+yKOkdetxR9tISoMuvgS/xxf YF/UlyqXlPHAC+57xltyB7RnDF4udk8L0SCoyclmG3jEOnutcdpksAAzEXhCeN8H8Rncw0 6D/AlqvL1rJoSylQThJtvyeIdLc2JGcGNyOCys2A2QwICYr9vGR6WDUx9Di4gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745951775; a=rsa-sha256; cv=none; b=gwjx8MVgbrJ/8OB16eAO1AHrnr9E+wVlSt8GZX7J6iVz7SkLjDDIkJke9BNpJC56tUYnt2 5/TrR6MTR7/xMzCh8hL1o2UahCmJXoGK4NnHDXDXCossj5J7CucklX2QPJf6NGzhosBi+U I7rgVnXhLi2JNaNaJykGfxRIkLOmmsUxEbArzfMgP2IjEPOv/VGwemU3sL7mzNcW754F6e pCqPE067Lesfiy56aqqMTF7O4CVvJ3alzil9BldKp2b8BXq6mE/JPvqiabyd3/qmZQh0YG pJ4BEU6q/khvUqAYN8B8nipsBy/ZUwVniPRsXmWsFFg1XkKG8XrRj/er0ei+Zw== 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=1745951775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=erJMnW3EfHwsRSDM2Mar8D+YikylyQpyOz31MOXYYUY=; b=QBcCHo2KVicd8J16T2cBJku1D9sRUQOdqIn7x1UpFTjfCp23D/RXnv0Ng8LRuujPqsYd5K d6WlTBoX+++enyGG9P69Nv4e8O0gkJZrEcWjjqEX5U3EtGiySa48pj4dSzczu+BpFy3AbV XE/U3iXOx1Ta76gjv2V7S1AHqzDCjjcgGvxW8VSnoP67Woi6h1cbxe3TAKsHIznyXfFWbn GMcvWnJxp+ZJO7X3LcrFpD4QNWVSrf4co+7vkXtlig50wj/4OidZC8tTLpBN9aJP/EJF+t 72Jol3bUcWVGucm/97eIYnL2c+Cxpy9Fftkw7X0SX2pvgwOSMwcUUJa3P5v1Zw== Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: sunpoet) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Zn8Cf6YMLzYxD for ; Tue, 29 Apr 2025 18:36:14 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-5f4b7211badso10383957a12.2 for ; Tue, 29 Apr 2025 11:36:14 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCVABDgIF3CZWPnhCx2OFu2oDjHsJbhMmTwR/kKg753vjvjrfyGyPTBnrPaaX/ebnxyxjYCuqzoHRpFVeitIrFP/fX+ZWQkr@freebsd.org X-Gm-Message-State: AOJu0YwnRB/wdMZX1zTPIFo3uXJC7N4XlHaFBf03AxX4zCB+Hkt0+2Ty e3vcWT2941PCbTpykirNKkvN3eO6EoA39zsLxFkO2mPfxl9qXBzoWknOvfv58CVdcePK5U8wQDV mdMZiycchDIRBRcYS5uoT6/H8bT8nw9mN76iSSQ== X-Google-Smtp-Source: AGHT+IHO/PN6BYfX/M0ax53ba0qQRKOXqb2bSCe89mal8FuOXXGaawmFWmbQw2x7C3+7WKYuo8Wvf+AAMAQRWPW2YFE= X-Received: by 2002:a05:6402:270a:b0:5f7:eaf0:8849 with SMTP id 4fb4d7f45d1cf-5f89b34d1d5mr35708a12.16.1745951773809; Tue, 29 Apr 2025 11:36:13 -0700 (PDT) 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 References: <202504291317.53TDH31t029573@gitrepo.freebsd.org> In-Reply-To: <202504291317.53TDH31t029573@gitrepo.freebsd.org> From: Po-Chuan Hsieh Date: Wed, 30 Apr 2025 02:35:36 +0800 X-Gmail-Original-Message-ID: X-Gm-Features: ATxdqUE6Lsdtl430AAd2EB3AELDA5kJkdJz2Twmou2n19tGYCyZSn6wCxhi1yuw Message-ID: Subject: Re: git: b55113e4038c - main - ftp/curl: Fix build with --with-gssapi and --disable-ftp To: Michael Osipov Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000045ef750633ef1300" --00000000000045ef750633ef1300 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Apr 29, 2025 at 9:23=E2=80=AFPM Michael Osipov wrote: > The branch main has been updated by michaelo: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3Db55113e4038c74da6ab611a932db9= cb041b7b967 > > commit b55113e4038c74da6ab611a932db9cb041b7b967 > Author: Michael Osipov > AuthorDate: 2025-04-28 13:42:15 +0000 > Commit: Michael Osipov > CommitDate: 2025-04-29 13:16:25 +0000 > > ftp/curl: Fix build with --with-gssapi and --disable-ftp > > Approved by: jrm (mentor), otis (mentor), sunpoet (implicit > approval) > That is incorrect. It is not implicit approval from me. > Differential Revision: https://reviews.freebsd.org/D50052 I'd like to say that I do not use reviews. > > Upstream PR: https://github.com/curl/curl/issues/16925 > --- > ftp/curl/Makefile | 4 ++++ > ftp/curl/distinfo | 4 +++- > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile > index 3c80430349f2..d6650d896a5a 100644 > --- a/ftp/curl/Makefile > +++ b/ftp/curl/Makefile > @@ -1,5 +1,6 @@ > PORTNAME=3D curl > PORTVERSION=3D 8.13.0 > +PORTREVISION=3D 1 > You should not bump PORTREVISION since it is a build fix. When the build fails with --with-gssapi and --disable-ftp, there is no package. Therefore you do not need to bump PORTREVISION to force rebuild. You just bring unnecessary rebuild for all dependent ports, including heavy ones like lang/rust. > CATEGORIES=3D ftp net www > MASTER_SITES=3D https://curl.se/download/ \ > > https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g= }/ > @@ -15,6 +16,9 @@ LICENSE_FILE=3D ${WRKSRC}/COPYING > USES=3D cpe libtool localbase:ldflags pathfix perl5 shebangfix > tar:xz > USE_PERL5=3D build > > +PATCH_SITES=3D > https://patch-diff.githubusercontent.com/raw/curl/curl/pull/ > +PATCHFILES+=3D 16931.patch:-p1 > + > Normally we use the commit, not the pull request. And it was added in the wrong place. > CONFIGURE_ARGS=3D --disable-test-bundles \ > --disable-unity \ > --disable-werror \ > diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo > index ef04573cef70..2eab319b5471 100644 > --- a/ftp/curl/distinfo > +++ b/ftp/curl/distinfo > @@ -1,3 +1,5 @@ > -TIMESTAMP =3D 1744288722 > +TIMESTAMP =3D 1745847381 > SHA256 (curl-8.13.0.tar.xz) =3D > 4a093979a3c2d02de2fbc00549a32771007f2e78032c6faa5ecd2f7a9e152025 > SIZE (curl-8.13.0.tar.xz) =3D 2773628 > +SHA256 (16931.patch) =3D > 839add7018a2b166ca31c1058d34cd0a60a21e11de38cb9094b7081897389758 > +SIZE (16931.patch) =3D 828 > --00000000000045ef750633ef1300 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Tue, Apr 29, 2025 at = 9:23=E2=80=AFPM Michael Osipov <michaelo@freebsd.org> wrote:
The branch mai= n has been updated by michaelo:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3Db55113e4038c74da6ab611a932db9cb041b7b967

commit b55113e4038c74da6ab611a932db9cb041b7b967
Author:=C2=A0 =C2=A0 =C2=A0Michael Osipov <michaelo@FreeBSD.org>
AuthorDate: 2025-04-28 13:42:15 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Michael Osipov <michaelo@FreeBSD.org>
CommitDate: 2025-04-29 13:16:25 +0000

=C2=A0 =C2=A0 ftp/curl: Fix build with --with-gssapi and --disable-ftp

=C2=A0 =C2=A0 Approved by:=C2=A0 =C2=A0 jrm (mentor), otis (mentor), sunpoe= t (implicit approval)

=C2=A0 =C2=A0 Differential Revision:=C2=A0 https://reviews.freebsd= .org/D50052

I'd like to say that I = do not use reviews.
=C2=A0

=C2=A0 =C2=A0 Upstream PR:=C2=A0 =C2=A0 https://github.com/= curl/curl/issues/16925
---
=C2=A0ftp/curl/Makefile | 4 ++++
=C2=A0ftp/curl/distinfo | 4 +++-
=C2=A02 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 3c80430349f2..d6650d896a5a 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -1,5 +1,6 @@
=C2=A0PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 curl
=C2=A0PORTVERSION=3D=C2=A0 =C2=A08.13.0
+PORTREVISION=3D=C2=A0 1

You should not= bump PORTREVISION=C2=A0since it is a build fix.
When the=C2=A0bu= ild fails with=C2=A0--with-gssapi and --disable-ftp, there is no package.
Therefore you do not need to bump PORTREVISION to force rebuild.
You just bring unnecessary rebuild for all dependent ports, includ= ing heavy ones like lang/rust.
=C2=A0
=C2=A0CATEGORIES=3D=C2=A0 =C2=A0 ftp net www
=C2=A0MASTER_SITES=3D=C2=A0 https://curl.se/download/ \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 https://github.com/curl/curl/relea= ses/download/curl-${PORTVERSION:S|.|_|g}/
@@ -15,6 +16,9 @@ LICENSE_FILE=3D ${WRKSRC}/COPYING
=C2=A0USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 cpe libtool localbase:ldfla= gs pathfix perl5 shebangfix tar:xz
=C2=A0USE_PERL5=3D=C2=A0 =C2=A0 =C2=A0build

+PATCH_SITES=3D=C2=A0 =C2=A0https://patc= h-diff.githubusercontent.com/raw/curl/curl/pull/
+PATCHFILES+=3D=C2=A0 =C2=A016931.patch:-p1
+

Normally we use the commit, not the p= ull request.
And it was added in the wrong place.
=C2= =A0
=C2=A0CONFIGURE_ARGS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 --disable-test-bundles \=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --disable-unity \ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 --disable-werror \<= br> diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index ef04573cef70..2eab319b5471 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP =3D 1744288722
+TIMESTAMP =3D 1745847381
=C2=A0SHA256 (curl-8.13.0.tar.xz) =3D 4a093979a3c2d02de2fbc00549a32771007f2= e78032c6faa5ecd2f7a9e152025
=C2=A0SIZE (curl-8.13.0.tar.xz) =3D 2773628
+SHA256 (16931.patch) =3D 839add7018a2b166ca31c1058d34cd0a60a21e11de38cb909= 4b7081897389758
+SIZE (16931.patch) =3D 828
--00000000000045ef750633ef1300--