Merge pull request #186 from git-for-windows/curl-8.10.0

curl: update to 8.10.0
git-for-windows · Sep 11, 2024 · f70725e · f70725e
2 parents 8c12d9c + c36954d
commit f70725e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/curl/PKGBUILD b/curl/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=curl
 pkgname=('curl' 'libcurl' 'libcurl-devel')
-pkgver=8.9.1
+pkgver=8.10.0
 pkgrel=1
 pkgdesc="Multi-protocol file transfer utility"
 arch=('i686' 'x86_64')
@@ -13,16 +13,16 @@ makedepends=('heimdal-devel' 'libcrypt-devel' 'libidn2-devel'
              'libnghttp2-devel' 'libpsl-devel' 'libssh2-devel' 'openssl-devel' 'zlib-devel') #  'libcares-devel'
 options=('!libtool' 'strip' '!debug')
 source=("https://github.com/curl/curl/releases/download/${pkgbase}-${pkgver//./_}/${pkgbase}-${pkgver}.tar.bz2"{,.asc}
-        curl-7.58.0-msys2.patch)
-sha256sums=('b57285d9e18bf12a5f2309fc45244f6cf9cb14734e7454121099dd0a83d669a3'
+        curl-8.10.0-msys2.patch)
+sha256sums=('be30a51f7bbe8819adf5a8e8cc6991393ede31f782b8de7b46235cc1eb7beb9f'
             'SKIP'
-            '4e4f89d40c8f7bfec2f687593f809fa96225b10da66be3788fe2b5d57e120dd0')
+            'f3d1ff0ca77636323ee5156c14275cb6cec98021aa0ad1b30735dbc4c3b619fd')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
               '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg (old key)
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-  patch -p1 -i ${srcdir}/curl-7.58.0-msys2.patch
+  patch -p1 -i ${srcdir}/curl-8.10.0-msys2.patch
   autoreconf -fi
 }
 

diff --git a/curl/curl-7.58.0-msys2.patch → curl/curl-8.10.0-msys2.patch b/curl/curl-7.58.0-msys2.patch → curl/curl-8.10.0-msys2.patch
@@ -1,4 +1,4 @@
-From 9eb3137f8be9250873c3bf5254eda5baca88450e Mon Sep 17 00:00:00 2001
+From 716d8ad8006bac43e43729c7a504a1ee084e3dc1 Mon Sep 17 00:00:00 2001
 From: Alexpux <alexey.pawlow@gmail.com>
 Date: Sat, 2 Nov 2013 12:42:49 +0400
 Subject: [PATCH] MSYS2 support for cURL
@@ -10,23 +10,23 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
-index e732a87..920ef73 100644
+index 240aa2b..a6c5c02 100644
 --- a/m4/curl-compilers.m4
 +++ b/m4/curl-compilers.m4
-@@ -921,7 +921,7 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
-           dnl Only clang 3.2 or later
-           if test "$compiler_num" -ge "302"; then
+@@ -852,7 +852,7 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
+             CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [enum-conversion])
+             CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [sometimes-uninitialized])
              case $host_os in
--            cygwin* | mingw*)
-+            cygwin* | msys* | mingw*)
-               dnl skip missing-variable-declarations warnings for cygwin and
-               dnl mingw because the libtool wrapper executable causes them
-               ;;
+-              cygwin* | mingw*)
++              cygwin* | msys* | mingw*)
+                 dnl skip missing-variable-declarations warnings for Cygwin and
+                 dnl MinGW because the libtool wrapper executable causes them
+                 ;;
 diff --git a/m4/xc-lt-iface.m4 b/m4/xc-lt-iface.m4
-index 465767f..752c8f9 100644
+index f3ac0de..c1ba53c 100644
 --- a/m4/xc-lt-iface.m4
 +++ b/m4/xc-lt-iface.m4
-@@ -263,7 +263,7 @@ elif test "x$allow_undefined_flag" = 'xunsupported'; then
+@@ -265,7 +265,7 @@ elif test "x$allow_undefined_flag" = 'xunsupported'; then
    xc_lt_shlib_use_no_undefined='yes'
  fi
  case $host_os in @%:@ (