From 37eedec90ffaa48ac12dd8e4a56b07c414c759d7 Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Thu, 1 Feb 2024 01:04:37 +0100
Subject: [PATCH] up to 8.6.0 (fixes CVE-2024-0853)

---
 curl-ac.patch | 18 +++++++++---------
 curl.spec     |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/curl-ac.patch b/curl-ac.patch
index cd5591c..190baab 100644
--- a/curl-ac.patch
+++ b/curl-ac.patch
@@ -1,12 +1,12 @@
-diff -urN curl-7.12.1.org/configure.ac curl-7.12.1/configure.ac
---- curl-7.12.1.org/configure.ac	2004-08-13 02:20:37.003335512 +0200
-+++ curl-7.12.1/configure.ac	2004-08-13 02:21:07.172749064 +0200
-@@ -392,7 +392,7 @@
+--- curl-8.6.0/configure.ac.orig	2024-02-01 00:31:28.101062850 +0100
++++ curl-8.6.0/configure.ac	2024-02-01 00:53:46.029103873 +0100
+@@ -1660,7 +1660,8 @@
+ {
   struct sockaddr_in6 s;
   (void)s;
-  if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
--   exit(1);
-+   exit(0);
-  else
-    exit(0);
+- return socket(AF_INET6, SOCK_STREAM, 0) < 0;
++ socket(AF_INET6, SOCK_STREAM, 0);
++ return 0;
  }
+ ]])
+ ],
diff --git a/curl.spec b/curl.spec
index d392c37..6e5772f 100644
--- a/curl.spec
+++ b/curl.spec
@@ -25,12 +25,12 @@ Summary(pt_BR.UTF-8):	Busca URL (suporta FTP, TELNET, LDAP, GOPHER, DICT, HTTP e
 Summary(ru.UTF-8):	Утилита для получения файлов с серверов FTP, HTTP и других
 Summary(uk.UTF-8):	Утиліта для отримання файлів з серверів FTP, HTTP та інших
 Name:		curl
-Version:	8.5.0
+Version:	8.6.0
 Release:	1
 License:	MIT-like
 Group:		Applications/Networking
 Source0:	https://curl.se/download/%{name}-%{version}.tar.xz
-# Source0-md5:	3e9e5c2db494e7dbd4e7024b149021c9
+# Source0-md5:	8f28f7e08c91cc679a45fccf66184fbc
 Patch0:		%{name}-ac.patch
 Patch1:		%{name}-krb5flags.patch
 URL:		https://curl.se/
-- 
2.44.0