curl: Update to 8.7.1

curl-7.58.0-libpsl-static-libs.patch: fixed upstream in
  https://github.com/curl/curl/pull/12947
This commit is contained in:
Christoph Reiter
2024-03-27 14:21:28 +01:00
parent 7eec4fafa8
commit 2f7cb70895
2 changed files with 2 additions and 44 deletions

View File

@@ -2,7 +2,7 @@
pkgbase=curl
pkgname=('curl' 'libcurl' 'libcurl-devel')
pkgver=8.6.0
pkgver=8.7.1
pkgrel=1
pkgdesc="Multi-protocol file transfer utility"
arch=('i686' 'x86_64')
@@ -13,19 +13,16 @@ depends=('ca-certificates')
makedepends=('brotli-devel' 'heimdal-devel' 'libidn2-devel' 'autotools'
'libunistring-devel' 'libnghttp2-devel' 'libpsl-devel' 'libssh2-devel' 'openssl-devel' 'zlib-devel' 'libzstd-devel' 'gcc')
source=("https://github.com/curl/curl/releases/download/${pkgbase}-${pkgver//./_}/${pkgbase}-${pkgver}.tar.xz"{,.asc}
curl-7.58.0-libpsl-static-libs.patch
curl-7.60.0-gssapi-static-libs.patch
0001-more-static-fixes.patch)
sha256sums=('3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15'
sha256sums=('6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd'
'SKIP'
'79aa3b1d1a6d943341d9c7f9ce69b46a5f454bf9fedaf5530b0cbcefa65fa31e'
'2821fcb7238432992e7d99b327b40f08f7fa9823a86c13fa0203975aa3d25359'
'870a91d09480cd0d1dc74119376350fc430e5223e2d4b3c0606af17793ecc310')
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
prepare() {
cd "${pkgname}-${pkgver}"
patch -p1 -i ${srcdir}/curl-7.58.0-libpsl-static-libs.patch
patch -p1 -i ${srcdir}/curl-7.60.0-gssapi-static-libs.patch
# https://github.com/curl/curl/discussions/6324

View File

@@ -1,39 +0,0 @@
--- curl-8.6.0/configure.ac.orig 2024-01-31 08:31:51.163839600 +0100
+++ curl-8.6.0/configure.ac 2024-01-31 08:33:39.021970100 +0100
@@ -2059,12 +2059,30 @@
with_libpsl=yes)
curl_psl_msg="no (libpsl disabled)"
if test $with_libpsl != "no"; then
- AC_SEARCH_LIBS(psl_builtin, psl,
- [curl_psl_msg="enabled";
- AC_DEFINE([USE_LIBPSL], [1], [PSL support enabled])
- ],
- [AC_MSG_ERROR([libpsl was not found]) ]
- )
+ CURL_CHECK_PKGCONFIG(libpsl)
+ if test "$PKGCONFIG" != "no" ; then
+ LIB_PSL=`$PKGCONFIG --libs-only-l libpsl`
+ LD_PSL=`$PKGCONFIG --libs-only-L libpsl`
+ CPP_PSL=`$PKGCONFIG --cflags-only-I libpsl`
+ version=`$PKGCONFIG --modversion libpsl`
+ DIR_PSL=`echo $LD_PSL | $SED -e 's/-L//'`
+
+ AC_DEFINE([USE_LIBPSL], [1], [PSL support enabled])
+ LDFLAGS="$LDFLAGS $LD_PSL"
+ CPPFLAGS="$CPPFLAGS $CPP_PSL"
+ LIBS="$LIB_PSL $LIBS"
+ else
+ dnl no nghttp2 pkg-config found, deal with it
+ AC_SEARCH_LIBS(psl_builtin, psl,
+ [curl_psl_msg="yes";
+ AC_DEFINE([USE_LIBPSL], [1], [PSL support enabled])
+ ],
+ [curl_psl_msg="no (libpsl not found)";
+ AC_MSG_WARN([libpsl was not found])
+ ]
+ )
+ fi
+
fi
AM_CONDITIONAL([USE_LIBPSL], [test "$curl_psl_msg" = "enabled"])