Package updated to 8.7.1.

3 files changed, 5 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38764c1bd3ea..b597bdb8a378 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = android-x86-curl
 	pkgdesc = An URL retrival utility and library (Android x86)
-	pkgver = 8.6.0
+	pkgver = 8.7.1
 	pkgrel = 1
 	url = https://curl.haxx.se
 	arch = any
@@ -19,13 +19,11 @@ pkgbase = android-x86-curl
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = https://curl.haxx.se/download/curl-8.6.0.tar.bz2
+	source = https://curl.haxx.se/download/curl-8.7.1.tar.bz2
 	source = 0002-nghttp2-static.patch
-	source = 0003-libpsl-static-libs.patch
 	source = 0004-more-static-fixes.patch
-	md5sums = 4418e0d94f29d352afafdab445e37a3d
+	md5sums = a7335b3daf80b9a0ee884fcb62324f88
 	md5sums = 08976b11b3e986c43c2ebd8eac36e2fb
-	md5sums = 0d6963bab0b98f8bc7cf8f2f7311e75a
 	md5sums = 98ba4e01c3545650087a4852192ce10e
 
 pkgname = android-x86-curl
diff --git a/0003-libpsl-static-libs.patch b/0003-libpsl-static-libs.patch
deleted file mode 100644
index ef70247ccb7b..000000000000
--- a/0003-libpsl-static-libs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2059,12 +2059,29 @@
-            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="enabled";
-+       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"])
- 
diff --git a/PKGBUILD b/PKGBUILD
index 373a9b25b4cf..a452e0716b96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 _android_arch=x86
 
 pkgname=android-${_android_arch}-curl
-pkgver=8.6.0
+pkgver=8.7.1
 pkgrel=1
 arch=('any')
 pkgdesc="An URL retrival utility and library (Android ${_android_arch})"
@@ -25,11 +25,9 @@ makedepends=('android-configure')
 options=(!strip !buildflags staticlibs !emptydirs)
 source=("${url}/download/curl-${pkgver}.tar.bz2"
         "0002-nghttp2-static.patch"
-        "0003-libpsl-static-libs.patch"
         "0004-more-static-fixes.patch")
-md5sums=('4418e0d94f29d352afafdab445e37a3d'
+md5sums=('a7335b3daf80b9a0ee884fcb62324f88'
          '08976b11b3e986c43c2ebd8eac36e2fb'
-         '0d6963bab0b98f8bc7cf8f2f7311e75a'
          '98ba4e01c3545650087a4852192ce10e')
 
 prepare() {
@@ -37,7 +35,6 @@ prepare() {
     source android-env ${_android_arch}
 
     patch -Np1 -i ../0002-nghttp2-static.patch
-    patch -Np1 -i ../0003-libpsl-static-libs.patch
     patch -Np1 -i ../0004-more-static-fixes.patch
 
     autoreconf -vfi