From patchwork Sat Sep 23 17:17:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Joslyn X-Patchwork-Id: 31056 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C6F4CE7A88 for ; Sat, 23 Sep 2023 17:25:52 +0000 (UTC) Received: from wilbur.contactoffice.com (wilbur.contactoffice.com [212.3.242.68]) by mx.groups.io with SMTP id smtpd.web10.24941.1695489945850743876 for ; Sat, 23 Sep 2023 10:25:46 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: message contains an insecure body length tag" header.i=robert.joslyn@redrectangle.org header.s=20230812-3u04 header.b=LoH6IXJO; spf=pass (domain: redrectangle.org, ip: 212.3.242.68, mailfrom: robert.joslyn@redrectangle.org) Received: from smtpauth1.co-bxl (smtpauth1.co-bxl [10.2.0.15]) by wilbur.contactoffice.com (Postfix) with ESMTP id 78B845FE; Sat, 23 Sep 2023 19:25:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1695489944; s=20230812-3u04; d=redrectangle.org; i=robert.joslyn@redrectangle.org; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Transfer-Encoding; l=5565; bh=HondUFkQ0V+TenGW5tb328IwjPU0vRg0vK1Wr/ug0dU=; b=LoH6IXJO+oNpmhFTVFy572TB6w8YrrBUBC0BtqumPeNrRrWm4mW+6Ax9964JoNlK iyr387hxJlmoE76Bcg+GOHjJHFZRJ3MVwLyENQMPy/TWZtUjnCR8QRMzgiWcxPbFIKw cO0vtYeBgBI9NDsO75cyZC5Cp0ItWs+NRUm8TYvozqscTQdFnAFqR8b+UHmRZljIgy7 tAvAkRtLIZ/QbBuIcH8sg5mtpzLh84vMGH8iReHL7Mftdm3Ur4N7LsZ7P9lFUcR2KKr 4O8JeKCtoEf6Bi7a12TE/4U+WwY3QpWX4Jr8ItJj/0MEGHpPjvpGnSY69zy6xy+VyuX tFAVsSD+CA== Received: by smtp.mailfence.com with ESMTPSA ; Sat, 23 Sep 2023 19:25:41 +0200 (CEST) From: robert.joslyn@redrectangle.org To: openembedded-core@lists.openembedded.org Cc: Robert Joslyn Subject: [PATCH v2] curl: Update from 8.2.1 to 8.3.0 Date: Sat, 23 Sep 2023 10:17:43 -0700 Message-ID: <20230923172500.3425735-1-robert.joslyn@redrectangle.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-ContactOffice-Account: com:454140407 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 23 Sep 2023 17:25:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/188152 From: Robert Joslyn NSS support was removed, so adjust PACKAGECONFIG options. The --enable-crypto-auth option was removed and split into separate options for basic-auth, bearer-auth, digest-auth, kerberos-auth, negotiate-auth, and aws. Enable these new options since upstream enables them by default. Disable test 1279 since this requires libcurl and hangs the tests. Signed-off-by: Robert Joslyn --- Changes from v1: Enable aws authentication by default. Upstream enables it by default and test 1964 fails with it disabled. meta/recipes-support/curl/curl/disable-tests | 1 + .../curl/{curl_8.2.1.bb => curl_8.3.0.bb} | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) rename meta/recipes-support/curl/{curl_8.2.1.bb => curl_8.3.0.bb} (88%) diff --git a/meta/recipes-support/curl/curl/disable-tests b/meta/recipes-support/curl/curl/disable-tests index b687b2bb76..fdac795662 100644 --- a/meta/recipes-support/curl/curl/disable-tests +++ b/meta/recipes-support/curl/curl/disable-tests @@ -21,6 +21,7 @@ # This test is scanning the source tree 1222 # These CRL tests need --libcurl option to be enabled +1279 1400 1401 1402 diff --git a/meta/recipes-support/curl/curl_8.2.1.bb b/meta/recipes-support/curl/curl_8.3.0.bb similarity index 88% rename from meta/recipes-support/curl/curl_8.2.1.bb rename to meta/recipes-support/curl/curl_8.3.0.bb index b86c6f3bba..646ac01914 100644 --- a/meta/recipes-support/curl/curl_8.2.1.bb +++ b/meta/recipes-support/curl/curl_8.3.0.bb @@ -14,7 +14,7 @@ SRC_URI = " \ file://run-ptest \ file://disable-tests \ " -SRC_URI[sha256sum] = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894" +SRC_URI[sha256sum] = "376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63" # Curl has used many names over the years... CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" @@ -24,21 +24,26 @@ inherit autotools pkgconfig binconfig multilib_header ptest # Entropy source for random PACKAGECONFIG option RANDOM ?= "/dev/urandom" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} libidn openssl proxy random threaded-resolver verbose zlib" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} aws basic-auth bearer-auth digest-auth negotiate-auth libidn openssl proxy random threaded-resolver verbose zlib" PACKAGECONFIG:class-native = "ipv6 openssl proxy random threaded-resolver verbose zlib" PACKAGECONFIG:class-nativesdk = "ipv6 openssl proxy random threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" +PACKAGECONFIG[aws] = "--enable-aws,--disable-aws" +PACKAGECONFIG[basic-auth] = "--enable-basic-auth,--disable-basic-auth" +PACKAGECONFIG[bearer-auth] = "--enable-bearer-auth,--disable-bearer-auth" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" # Don't use this in production PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," +PACKAGECONFIG[digest-auth] = "--enable-digest-auth,--disable-digest-auth" PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," PACKAGECONFIG[imap] = "--enable-imap,--disable-imap," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[kerberos-auth] = "--enable-kerberos-auth,--disable-kerberos-auth" PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5" PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap" PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps,openldap" @@ -47,6 +52,7 @@ PACKAGECONFIG[libidn] = "--with-libidn2,--without-libidn2,libidn2" PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" PACKAGECONFIG[mbedtls] = "--with-mbedtls=${STAGING_DIR_TARGET},--without-mbedtls,mbedtls" PACKAGECONFIG[mqtt] = "--enable-mqtt,--disable-mqtt," +PACKAGECONFIG[negotiate-auth] = "--enable-negotiate-auth,--disable-negotiate-auth" PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3," @@ -56,7 +62,6 @@ PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp," PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp," -PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" @@ -67,11 +72,10 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" EXTRA_OECONF = " \ --disable-libcurl-option \ --disable-ntlm-wb \ - --enable-crypto-auth \ --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ --without-libpsl \ --enable-optimize \ - ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls nss openssl', d) == '') else ''} \ + ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls openssl', d) == '') else ''} \ " do_install:append:class-target() {