Re: git: 2a3bac310439 - main - ftp/curl: Update to 8.11.1
- In reply to: Daniel Engberg : "Re: git: 2a3bac310439 - main - ftp/curl: Update to 8.11.1"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 22 Dec 2024 12:53:01 UTC
On Sun, Dec 22, 2024 at 7:35 PM Daniel Engberg <
daniel.engberg.lists@pyret.net> wrote:
> On 2024-12-22T12:22:55.000+01:00, Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> wrote:
>
>
> The branch main has been updated by sunpoet:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=2a3bac310439f8de03b945ae6b596ddf6384d411
>
> commit 2a3bac310439f8de03b945ae6b596ddf6384d411
> Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> AuthorDate: 2024-12-22 11:21:05 +0000
> Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> CommitDate: 2024-12-22 11:21:15 +0000
>
> ftp/curl: Update to 8.11.1
>
> Changes: https://curl.se/changes.html
> Security: CVE-2024-11053
> ---
> ftp/curl/Makefile | 8 +++++---
> ftp/curl/distinfo | 8 +++++---
> ftp/curl/files/extra-patch-gssapi | 11 -----------
> ftp/curl/pkg-plist | 2 ++
> 4 files changed, 12 insertions(+), 17 deletions(-)
>
> diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
> index 42e6fa4f27dc..26a1ee93cde6 100644
> --- a/ftp/curl/Makefile
> +++ b/ftp/curl/Makefile
> @@ -1,10 +1,12 @@
> PORTNAME= curl
> -PORTVERSION= 8.11.0
> -PORTREVISION= 1
> +PORTVERSION= 8.11.1
> CATEGORIES= ftp net www
> MASTER_SITES= https://curl.se/download/ \
> https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/
>
> +PATCH_SITES= https://github.com/curl/curl/commit/
> +PATCHFILES= ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch:-p1
> +
> MAINTAINER= sunpoet@FreeBSD.org
> COMMENT= Command line tool and library for transferring data with URLs
> WWW= https://curl.se/ \
> @@ -24,6 +26,7 @@ CONFIGURE_ARGS= --disable-test-bundles \
> --enable-headers-api \
> --enable-hsts \
> --enable-http-auth \
> + --enable-manual \
> --enable-mime \
> --enable-netrc \
> --enable-openssl-auto-load-config \
> @@ -100,7 +103,6 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \
> GOPHER_CONFIGURE_ENABLE=gopher
> GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
> GSSAPI_BASE_CPPFLAGS= ${GSSAPICPPFLAGS}
> -GSSAPI_BASE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gssapi
> GSSAPI_BASE_LDFLAGS= ${GSSAPILDFLAGS}
> GSSAPI_BASE_LIBS= ${GSSAPILIBS}
> GSSAPI_BASE_USES= gssapi
> diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
> index d6ed0ab70c0c..0122660f4409 100644
> --- a/ftp/curl/distinfo
> +++ b/ftp/curl/distinfo
> @@ -1,3 +1,5 @@
> -TIMESTAMP = 1731679162
> -SHA256 (curl-8.11.0.tar.xz) = db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb
> -SIZE (curl-8.11.0.tar.xz) = 2750684
> +TIMESTAMP = 1734769461
> +SHA256 (curl-8.11.1.tar.xz) = c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56
> +SIZE (curl-8.11.1.tar.xz) = 2751236
> +SHA256 (ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch) = 297a61cc260f4bf9e60e5b939e559d5e50df8484328f92d06ffcc256e538d998
> +SIZE (ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch) = 1074
> diff --git a/ftp/curl/files/extra-patch-gssapi b/ftp/curl/files/extra-patch-gssapi
> deleted file mode 100644
> index 285b5086bc71..000000000000
> --- a/ftp/curl/files/extra-patch-gssapi
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- configure.orig 2024-11-06 07:09:19 UTC
> -+++ configure
> -@@ -26192,7 +26197,7 @@ printf "%s\n" "found" >&6; }
> - if test -n "$gnu_gss"; then
> - LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE gss"
> - elif test "x$not_mit" = "x1"; then
> -- LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE heimdal-gssapi"
> -+ LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE"
> - else
> - LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE mit-krb5-gssapi"
> - fi
> diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
> index a88d7f9dc61e..a940df55cbf3 100644
> --- a/ftp/curl/pkg-plist
> +++ b/ftp/curl/pkg-plist
> @@ -18,6 +18,7 @@ lib/libcurl.so.4
> lib/libcurl.so.4.8.0
> libdata/pkgconfig/libcurl.pc
> share/aclocal/libcurl.m4
> +%%PORTDOCS%%%%DOCSDIR%%/ALTSVC.md
> %%PORTDOCS%%%%DOCSDIR%%/BINDINGS.md
> %%PORTDOCS%%%%DOCSDIR%%/BUG-BOUNTY.md
> %%PORTDOCS%%%%DOCSDIR%%/BUGS.md
> @@ -38,6 +39,7 @@ share/aclocal/libcurl.m4
> %%PORTDOCS%%%%DOCSDIR%%/GOVERNANCE.md
> %%PORTDOCS%%%%DOCSDIR%%/HELP-US.md
> %%PORTDOCS%%%%DOCSDIR%%/HISTORY.md
> +%%PORTDOCS%%%%DOCSDIR%%/HSTS.md
> %%PORTDOCS%%%%DOCSDIR%%/HTTP-COOKIES.md
> %%PORTDOCS%%%%DOCSDIR%%/HTTP3.md
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL
>
> Hi,
>
> Fails to build due to patch checksum mismatch.
>
> => Attempting to fetch https://curl.se/download/curl-8.11.1.tar.xz
> curl-8.11.1.tar.xz 2686 kB 16 MBps
> 00s
> => ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch doesn't seem to exist in
> /usr/ports/distfiles/.
> => Attempting to fetch
> https://github.com/curl/curl/commit/ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch
> fetch:
> https://github.com/curl/curl/commit/ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch:
> size mismatch: expected 1074, actual 1068
> => Attempting to fetch
> http://distcache.FreeBSD.org/ports-distfiles/ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch
> fetch:
> http://distcache.FreeBSD.org/ports-distfiles/ff5091aa9f73802e894b1cbdf24ab84e103200e2.patch:
> Not Found
> => Couldn't fetch it - please try to retrieve this
>
> Best regards,
> Daniel
>
Hello,
Thanks for the notification.
It should be fixed in 051f1d77a9579ef4de5f408186fccbcb4fd75775.
I've also checked with your patch [1] in PR 283266 in case I messed it up.
The patch file was OK before but somehow it changes.
[1] https://bugs.freebsd.org/bugzilla/attachment.cgi?id=255812&action=diff
Best regards,
sunpoet