Date: Sun, 21 May 2023 06:47:24 +0000 From: Antoine Brodin <antoine@freebsd.org> To: Renato Botelho <garga@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org, Dima Panov <fluffy@freebsd.org>, FreeBSD Ports Management Team <portmgr@freebsd.org> Subject: Re: git: 5fae3323ed2f - main - ftp/curl: Update to 8.1.0 Message-ID: <CAALwa8m7qgkYynct5SN=1T7=bdbFTcKEM9g9okZDn0jR8dvWDw@mail.gmail.com> In-Reply-To: <95f41f1a-1d3b-cb12-1777-cf4dc8ba55d4@FreeBSD.org> References: <202305192106.34JL6ZuV084657@gitrepo.freebsd.org> <95f41f1a-1d3b-cb12-1777-cf4dc8ba55d4@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, May 19, 2023 at 10:13=E2=80=AFPM Dima Panov <fluffy@freebsd.org> wr=
ote:
>
> Moin-moin!
>
>
> It fails to build on recent -current
>
> building for: FreeBSD xxx 14.0-CURRENT FreeBSD 14.0-CURRENT 1400088 amd64
>
> --- libcurl_la-connect.lo ---
> In file included from connect.c:56:
> In file included from ../lib/urldata.h:168:
> ../lib/http.h:263:8: error: redefinition of 'http_req'
> struct http_req {
> ^
> /usr/include/netinet/tcp.h:466:8: note: previous definition is here
> struct http_req {
> ^
> 1 error generated.
> *** [libcurl_la-connect.lo] Error code 1
Hi,
Do you plan to fix it or revert it?
Antoine
> On 20.05.2023 00:06, Renato Botelho wrote:
> > The branch main has been updated by garga:
> >
> > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D5fae3323ed2f9a1d203cca=
ed617ed49dec9d85ce
> >
> > commit 5fae3323ed2f9a1d203ccaed617ed49dec9d85ce
> > Author: R. Christian McDonald <rcm@rcm.sh>
> > AuthorDate: 2023-05-18 03:51:54 +0000
> > Commit: Renato Botelho <garga@FreeBSD.org>
> > CommitDate: 2023-05-19 21:00:50 +0000
> >
> > ftp/curl: Update to 8.1.0
> >
> > PR: 271497
> > Security: CVE-2023-28319
> > CVE-2023-28320
> > CVE-2023-28321
> > CVE-2023-28322
> > Sponsored by: Rubicon Communications, LLC ("Netgate")
> > ---
> > ftp/curl/Makefile | 2 +-
> > ftp/curl/distinfo | 6 +++---
> > ftp/curl/pkg-plist | 2 ++
> > 3 files changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
> > index 0f9d828f587b..ccab5f4fa6d8 100644
> > --- a/ftp/curl/Makefile
> > +++ b/ftp/curl/Makefile
> > @@ -1,5 +1,5 @@
> > PORTNAME=3D curl
> > -PORTVERSION=3D 8.0.1
> > +PORTVERSION=3D 8.1.0
> > CATEGORIES=3D ftp net www
> > MASTER_SITES=3D https://curl.se/download/ \
> > https://github.com/curl/curl/releases/download/curl-${POR=
TVERSION:S|.|_|g}/
> > diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
> > index 3cdbc3ffad5c..168e136d5875 100644
> > --- a/ftp/curl/distinfo
> > +++ b/ftp/curl/distinfo
> > @@ -1,3 +1,3 @@
> > -TIMESTAMP =3D 1679498480
> > -SHA256 (curl-8.0.1.tar.xz) =3D 0a381cd82f4d00a9a334438b8ca239afea5bfef=
cfa9a1025f2bf118e79e0b5f0
> > -SIZE (curl-8.0.1.tar.xz) =3D 2575544
> > +TIMESTAMP =3D 1684381122
> > +SHA256 (curl-8.1.0.tar.xz) =3D 6bd80ad4f07187015911216ee7185b90d285ac5=
162aed1bded144f9f93232a3c
> > +SIZE (curl-8.1.0.tar.xz) =3D 2612568
> > diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
> > index 174b1b7b587a..aae74acd69b0 100644
> > --- a/ftp/curl/pkg-plist
> > +++ b/ftp/curl/pkg-plist
> > @@ -540,6 +540,7 @@ share/aclocal/libcurl.m4
> > %%PORTDOCS%%%%DOCSDIR%%/RELEASE-PROCEDURE.md
> > %%PORTDOCS%%%%DOCSDIR%%/ROADMAP.md
> > %%PORTDOCS%%%%DOCSDIR%%/RUSTLS.md
> > +%%PORTDOCS%%%%DOCSDIR%%/SECURITY-ADVISORY.md
> > %%PORTDOCS%%%%DOCSDIR%%/SECURITY-PROCESS.md
> > %%PORTDOCS%%%%DOCSDIR%%/SSL-PROBLEMS.md
> > %%PORTDOCS%%%%DOCSDIR%%/SSLCERTS.md
> > @@ -644,6 +645,7 @@ share/aclocal/libcurl.m4
> > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/postit2-formadd.c
> > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/postit2.c
> > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/progressfunc.c
> > +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/protofeats.c
> > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resolve.c
> > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendrecv.c
> > %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sepheaders.c
>
> --
> Sincerely,
> Dima (fluffy@FreeBSD.org, https://t.me/FluffyBSD)
> (desktop, kde, x11, office, ports-secteam)@FreeBSD team
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAALwa8m7qgkYynct5SN=1T7=bdbFTcKEM9g9okZDn0jR8dvWDw>