From 46023e5d0c8e00753eb93190a3f6af2f7106d84f Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Wed, 13 Nov 2024 18:10:29 +0100
Subject: [PATCH] curl: backport netrc regression fixes

same as https://github.com/msys2/MINGW-packages/pull/22490
---
 curl/PKGBUILD | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/curl/PKGBUILD b/curl/PKGBUILD
index b9d6fb1ee33..b8c5a852739 100644
--- a/curl/PKGBUILD
+++ b/curl/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase=curl
 pkgname=('curl' 'libcurl' 'libcurl-devel')
 pkgver=8.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Multi-protocol file transfer utility"
 arch=('i686' 'x86_64')
 url="https://curl.se/"
@@ -20,15 +20,21 @@ 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.60.0-gssapi-static-libs.patch)
+        curl-7.60.0-gssapi-static-libs.patch
+        "netrc-regression-1.patch::https://github.com/curl/curl/commit/f5c616930b5cf148b1b2632da4f5963ff48bdf88.patch"
+        "netrc-regression-2.patch::https://github.com/curl/curl/commit/0cdde0fdfbeb8c35420f6d03fa4b77ed73497694.patch")
 sha256sums=('db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb'
             'SKIP'
-            'f85869319690a7e9b586a9b84d8c7e321f847709dff7572d09482ca3d9b92598')
+            'f85869319690a7e9b586a9b84d8c7e321f847709dff7572d09482ca3d9b92598'
+            '708429a4e0b387dc9addc1f9166e07e5db22da42221887ddab9533c9e2bd1ca8'
+            'd817dd3746476bc513edd24a4f9a32674c3d5a04484bf80d894c1d2add67e8e2')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2')   # Daniel Stenberg
 
 prepare() {
   cd "${pkgname}-${pkgver}"
   patch -p1 -i ${srcdir}/curl-7.60.0-gssapi-static-libs.patch
+  patch -p1 -i ${srcdir}/netrc-regression-1.patch
+  patch -p1 -i ${srcdir}/netrc-regression-2.patch
 
   autoreconf -fiv
 }