curl: update 7.79.1 -> 7.80.0

(From OE-Core rev: 2c290dee4a1f951a9aa4af7252edace91f61e967)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2021-11-17 16:35:08 +01:00
committed by Richard Purdie
parent fe34eaef8d
commit 0dabf47665
2 changed files with 2 additions and 48 deletions

View File

@@ -1,44 +0,0 @@
From ed70f0623708b8a6c1f58a5d243d87c5ff45b24d Mon Sep 17 00:00:00 2001
From: Roy Li <rongqing.li@windriver.com>
Date: Tue, 26 Apr 2016 13:13:01 +0800
Subject: [PATCH] replace krb5-config with pkg-config
Upstream-Status: Accepted [https://github.com/curl/curl/pull/7916]
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5569a26..56b0380 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1290,7 +1290,7 @@ AC_ARG_WITH(gssapi,
fi
])
-: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"}
+KRB5CONFIG=`which pkg-config`
save_CPPFLAGS="$CPPFLAGS"
AC_MSG_CHECKING([if GSS-API support is requested])
@@ -1301,7 +1301,7 @@ if test x"$want_gss" = xyes; then
if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
elif test -f "$KRB5CONFIG"; then
- GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
+ GSSAPI_INCS=`$KRB5CONFIG --cflags mit-krb5-gssapi`
elif test "$GSSAPI_ROOT" != "yes"; then
GSSAPI_INCS="-I$GSSAPI_ROOT/include"
fi
@@ -1394,7 +1394,7 @@ if test x"$want_gss" = xyes; then
elif test -f "$KRB5CONFIG"; then
dnl krb5-config doesn't have --libs-only-L or similar, put everything
dnl into LIBS
- gss_libs=`$KRB5CONFIG --libs gssapi`
+ gss_libs=`$KRB5CONFIG --libs mit-krb5-gssapi`
LIBS="$gss_libs $LIBS"
else
case $host in

View File

@@ -9,11 +9,9 @@ SECTION = "console/network"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=425f6fdc767cc067518eef9bbdf4ab7b"
SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://0001-replace-krb5-config-with-pkg-config.patch \
"
SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2"
SRC_URI[sha256sum] = "de62c4ab9a9316393962e8b94777a570bb9f71feb580fb4475e412f2f9387851"
SRC_URI[sha256sum] = "dd0d150e49cd950aff35e16b628edf04927f0289df42883750cf952bb858189c"
# Curl has used many names over the years...
CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"