curl: Update to 7.81.0
PATCH 1/3 curl: Update to 7.81.0
Update URLs to refelct what upstream is presently using and add zstd PACKAGECONFIG.
Signed-off-by Robert Joslyn <[email protected]>
---
.../curl/{curl_7.80.0.bb => curl_7.81.0.bb} | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-support/curl/{curl_7.80.0.bb => curl_7.81.0.bb} (93%)meta/recipes-support/curl/curl_7.81.0.bb renamed from meta/recipes-support/curl/curl_7.80.0.bb +5 -5
@@ -3,15 +3,14 @@ DESCRIPTION = "It uses URL syntax to transfer data to and from servers. \ curl is a widely used because of its ability to be flexible and complete \ complex tasks. For example, you can use curl for things like user authentication, \ HTTP post, SSL connections, proxy support, FTP uploads, and more!" -HOMEPAGE = "http://curl.haxx.se/" -BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker" +HOMEPAGE = "https://curl.se/" +BUGTRACKER = "https://github.com/curl/curl/issues" SECTION = "console/network" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=425f6fdc767cc067518eef9bbdf4ab7b" -SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2" - -SRC_URI[sha256sum] = "dd0d150e49cd950aff35e16b628edf04927f0289df42883750cf952bb858189c" +SRC_URI = "https://curl.se/download/${BP}.tar.xz" +SRC_URI[sha256sum] = "a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3" # Curl has used many names over the years... CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"
@@ -53,6 +52,7 @@ PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" +PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" EXTRA_OECONF = " \ --disable-libcurl-option \
Signature · 1 line
2.34.1
PATCH 2/3 curl: Rework openssl and random PACKAGECONFIGs
The existing ssl PACKAGECONFIG makes it slightly annoying to use another crypto provider while removing openssl. Since --with-ssl is just a deprecated version of --with-openssl, rename the PACKAGECONFIG to use the newer preferred name. Note that --without-ssl implies no crypto provider at all, and should only be used when trying to disable all crypto support.
Move --with-random to it's own option, since it is useful for other crypto providers, not just openssl.
Signed-off-by Robert Joslyn <[email protected]>
--- meta/recipes-support/curl/curl_7.81.0.bb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
meta/recipes-support/curl/curl_7.81.0.bb +8 -4
@@ -17,9 +17,12 @@ CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl dan inherit autotools pkgconfig binconfig multilib_header -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} ssl libidn proxy threaded-resolver verbose zlib" -PACKAGECONFIG:class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" -PACKAGECONFIG:class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" +# 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: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"
@@ -39,13 +42,14 @@ PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" PACKAGECONFIG[mbedtls] = "--with-mbedtls=${STAGING_DIR_TARGET},--without-mbedtls,mbedtls" PACKAGECONFIG[mqtt] = "--enable-mqtt,--disable-mqtt," PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" +PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3," PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy," +PACKAGECONFIG[random] = "--with-random=${RANDOM},--without-random" 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[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl" PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp,"
Signature · 1 line
2.34.1
PATCH 3/3 maintainers.inc: Add myself as maintainer for curl
In reply to Robert JoslynI'll give it a go to try and help out.
Signed-off-by Robert Joslyn <[email protected]>
--- meta/conf/distro/include/maintainers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/maintainers.inc +1 -1
@@ -128,7 +128,7 @@ RECIPE_MAINTAINER:pn-cryptodev-linux = "Robert Yang <[email protected]>" RECIPE_MAINTAINER:pn-cryptodev-module = "Robert Yang <[email protected]>" RECIPE_MAINTAINER:pn-cryptodev-tests = "Robert Yang <[email protected]>" RECIPE_MAINTAINER:pn-cups = "Chen Qi <[email protected]>" -RECIPE_MAINTAINER:pn-curl = "Unassigned <[email protected]>" +RECIPE_MAINTAINER:pn-curl = "Robert Joslyn <[email protected]>" RECIPE_MAINTAINER:pn-cve-update-db-native = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-cwautomacros = "Ross Burton <[email protected]>" RECIPE_MAINTAINER:pn-db = "Unassigned <[email protected]>"
Signature · 1 line
2.34.1