From dd5547c84d075ddecf51e11ece4c00eb2cb00584 Mon Sep 17 00:00:00 2001 From: krant Date: Wed, 21 Feb 2024 09:34:19 +0200 Subject: [PATCH] libcurl-gnutls: fix build - Missing --without-nghttp3 was leaking host includes and breaking the build - Remove or rename deprecated configure options - Add --disable-libcurl-option to reduce package size - Use .xz instead of .bz2 for PKG_SOURCE Signed-off-by: krant (cherry picked from commit 30fe2d99ab0c4826b06890c18ea34415b6820b44) --- net/libcurl-gnutls/Makefile | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/net/libcurl-gnutls/Makefile b/net/libcurl-gnutls/Makefile index 8625dcbed3..b9e39a5192 100644 --- a/net/libcurl-gnutls/Makefile +++ b/net/libcurl-gnutls/Makefile @@ -11,13 +11,13 @@ PKG_NAME:=libcurl-gnutls PKG_SOURCE_NAME:=curl PKG_VERSION:=8.6.0 -PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 +PKG_RELEASE:=2 +PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \ https://dl.uxnr.de/mirror/curl/ \ https://curl.askapache.com/download/ \ https://curl.se/download/ -PKG_HASH:=b4785f2d8877fa92c0e45d7155cf8cc6750dbda961f4b1a45bcbec990cf2fa9b +PKG_HASH:=3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=MIT @@ -51,27 +51,32 @@ TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ --with-gnutls="$(STAGING_DIR)/usr" \ - --with-libidn="$(STAGING_DIR)/usr" \ + --with-libidn2="$(STAGING_DIR)/usr" \ --with-zlib="$(STAGING_DIR)/usr" \ --with-ca-path="/etc/ssl/certs/" \ --enable-shared \ --enable-static \ - --without-axtls \ --without-brotli \ --without-libssh2 \ --without-winidn \ --without-librtmp \ --without-nghttp2 \ - --without-nss \ - --without-cyassl \ + --without-nghttp3 \ + --without-wolfssl \ --without-libpsl \ - --without-polarssl \ --without-openssl \ - --without-winssl \ + --without-schannel \ --without-zstd \ + --disable-libcurl-option \ --disable-ares \ --disable-sspi \ - --disable-crypto-auth \ + --disable-basic-auth \ + --disable-bearer-auth \ + --disable-digest-auth \ + --disable-kerberos-auth \ + --disable-negotiate-auth \ + --disable-aws \ + --disable-ntlm \ --disable-ntlm-wb \ --disable-tls-srp \ --disable-ldap \