From bb6620ef970f0b93e3d2c13fb4e1753d0dac8b40 Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
Date: Thu, 12 Oct 2023 08:19:16 +0300
Subject: [PATCH] upd: 7.86.0 -> 8.4.0

---
 .abf.yml                   |  2 +-
 curl-7.59.0-multilib.patch | 11 ++++++-----
 curl-libressl.patch        |  8 ++++----
 curl.spec                  |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 81aa4de..288a018 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  curl-7.86.0.tar.gz: fdf09b2e8f420bed1eef77317f342e93251f0143
+  curl-8.4.0.tar.gz: ff7c2abb68443bb868da1d7681f558d245c853dd
diff --git a/curl-7.59.0-multilib.patch b/curl-7.59.0-multilib.patch
index f53c5e9..f2b2a87 100644
--- a/curl-7.59.0-multilib.patch
+++ b/curl-7.59.0-multilib.patch
@@ -1,7 +1,8 @@
-diff -rupN curl-7.59.0.old/curl-config.in curl-7.59.0/curl-config.in
---- curl-7.59.0.old/curl-config.in	2018-01-30 23:02:52.000000000 +0100
-+++ curl-7.59.0/curl-config.in	2018-04-16 19:16:30.647704720 +0200
-@@ -76,7 +76,7 @@ while test $# -gt 0; do
+diff --git a/curl-config.in b/curl-config.in
+index 54f92d931..637a39efc 100644
+--- a/curl-config.in
++++ b/curl-config.in
+@@ -78,7 +78,7 @@ while test $# -gt 0; do
          ;;
  
      --cc)
@@ -10,7 +11,7 @@ diff -rupN curl-7.59.0.old/curl-config.in curl-7.59.0/curl-config.in
          ;;
  
      --prefix)
-@@ -155,16 +155,7 @@
+@@ -157,16 +157,7 @@ while test $# -gt 0; do
          ;;
  
      --libs)
diff --git a/curl-libressl.patch b/curl-libressl.patch
index db14e03..36507fc 100644
--- a/curl-libressl.patch
+++ b/curl-libressl.patch
@@ -3,10 +3,10 @@ Do not find it automatically -- we have set $LIBS and $PREFIX_OPENSSL
 // mikhailnov, 25.12.2019
 
 diff --git a/libcurl.pc.in b/libcurl.pc.in
-index 8ac15d407..19cb8e24d 100644
+index 9db6b0f89..eab6c829e 100644
 --- a/libcurl.pc.in
 +++ b/libcurl.pc.in
-@@ -34,6 +34,7 @@ Name: libcurl
+@@ -36,6 +36,7 @@ Name: libcurl
  URL: https://curl.se/
  Description: Library to transfer files with ftp, http, etc.
  Version: @CURLVERSION@
@@ -18,10 +18,10 @@ index 8ac15d407..19cb8e24d 100644
 +Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@ @LIBRESSL_CFLAGS@
 +Requires.private: libressl
 diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4
-index 835768e1b..d2be47f08 100644
+index a4811d2a3..99acc574d 100644
 --- a/m4/curl-openssl.m4
 +++ b/m4/curl-openssl.m4
-@@ -315,7 +315,7 @@ if test "x$OPT_OPENSSL" != xno; then
+@@ -63,7 +63,7 @@ if test "x$OPT_OPENSSL" != xno; then
    case "$OPT_OPENSSL" in
    yes)
      dnl --with-openssl (without path) used
diff --git a/curl.spec b/curl.spec
index 0827c55..4a7b616 100644
--- a/curl.spec
+++ b/curl.spec
@@ -53,8 +53,8 @@
 
 Summary:	Gets a file from a FTP, GOPHER or HTTP server
 Name:		curl
-Version:	7.86.0
-Release:	2
+Version:	8.4.0
+Release:	1
 Epoch:		1
 License:	BSD-like
 Group:		Networking/Other