Sync changes to SLFO-1.2 branch

OBS-URL: https://build.opensuse.org/request/show/1294773
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/curl?expand=0&rev=218

curl.changes

@@ -5,28 +5,11 @@ Mon Jul 14 08:29:01 UTC 2025 - Pedro Monreal <pmonreal@suse.com>
   * tool_getparam: fix --ftp-pasv [5f805ee]
   * Add curl-fix--ftp-pasv.patch
 
--------------------------------------------------------------------
-Wed Jul  2 20:12:07 UTC 2025 - Dirk Müller <dmueller@suse.com>
-
-- add fix-return-code-with-retry.patch to fix return code
-  being successful even on failures when using -f --retry
-
 -------------------------------------------------------------------
 Mon Jun 30 09:38:09 UTC 2025 - Pedro Monreal <pmonreal@suse.com>
 
 - Disable insecure NTLM authentication support [bsc#1245491, jsc#PED-12960]
 
--------------------------------------------------------------------
-Mon Jun 23 09:12:46 UTC 2025 - Dirk Müller <dmueller@suse.com>
-
-- split wcurl into a subpackage so that upgrade works (wcurl
-  used to be a separate package)
-
--------------------------------------------------------------------
-Fri Jun 20 18:54:44 UTC 2025 - Georg Pfuetzenreuter <mail+rpm@georg-pfuetzenreuter.net>
-
-- Build with experimental OpenSSL based QUIC support to enable --http3
-
 -------------------------------------------------------------------
 Fri Jun  6 08:26:03 UTC 2025 - Pedro Monreal <pmonreal@suse.com>
 

curl.spec

@@ -29,12 +29,6 @@
 %global psuffix %{nil}
 %endif
 
-%if 0%{?suse_version} > 1600
-%bcond_without quic
-%else
-%bcond_with quic
-%endif
-
 Name:           curl%{?psuffix}
 Version:        8.14.1
 Release:        0
@@ -51,10 +45,8 @@ Patch1:         dont-mess-with-rpmoptflags.patch
 Patch2:         curl-secure-getenv.patch
 # PATCH-FIX-OPENSUSE bsc#1076446 protocol redirection not supported or disabled
 Patch3:         curl-disabled-redirect-protocol-message.patch
-# PATCH-FIX-UPSTREAM fix return code with --fail when --retry is used
-Patch4:         fix-return-code-with-retry.patch
 # PATCH-FIX-UPSTREAM bsc#1246197 Fix the --ftp-pasv option in curl v8.14.1
-Patch5:         curl-fix--ftp-pasv.patch
+Patch4:         curl-fix--ftp-pasv.patch
 BuildRequires:  groff
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
@@ -62,9 +54,6 @@ BuildRequires:  pkgconfig(libidn2)
 # Disable metalink [bsc#1188218, CVE-2021-22923][bsc#1188217, CVE-2021-22922]
 # BuildRequires:  pkgconfig(libmetalink)
 BuildRequires:  pkgconfig(libnghttp2)
-%if %{with quic}
-BuildRequires:  pkgconfig(libnghttp3)
-%endif
 BuildRequires:  pkgconfig(libpsl)
 BuildRequires:  pkgconfig(libzstd)
 BuildRequires:  pkgconfig(zlib)
@@ -142,17 +131,6 @@ BuildArch:      noarch
 
 %description zsh-completion
 ZSH command line completion support for %name.
-
-%package -n     wcurl
-Summary:        simple wrapper around curl to easily download files
-Requires:       curl >= %{version}
-Obsoletes:      wcurl >= 2025
-
-%description -n wcurl
-A simple curl wrapper which lets you use curl to download files
-without having to remember any parameters.
-Simply call wcurl with a list of URLs you want to download and
-wcurl will pick sane defaults.
 %endif
 
 %prep
@@ -185,10 +163,6 @@ sed -i 's/\(link_all_deplibs=\)unknown/\1no/' configure
 %endif
     --with-libidn2 \
     --with-nghttp2 \
-%if %{with quic}
-    --with-nghttp3 \
-    --with-openssl-quic \
-%endif
     --enable-docs \
 %if %{with mini}
     --disable-dict \
@@ -268,9 +242,6 @@ popd
 %doc docs/{BUGS.md,FAQ,FEATURES.md,TODO,TheArtOfHttpScripting.md}
 %{_bindir}/curl
 %{_mandir}/man1/curl.1%{?ext_man}
-
-%files -n wcurl
-%license COPYING
 %{_bindir}/wcurl
 %{_mandir}/man1/wcurl.1%{?ext_man}
 

fix-return-code-with-retry.patch

@@ -1,124 +0,0 @@
-From b42776b4f4a6e9c9f5e3ff49d7bf610ad99c45c9 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 9 Jun 2025 08:37:49 +0200
-Subject: [PATCH] tool_operate: fix return code when --retry is used but not
- triggered
-
-Verify with test 752
-
-Reported-by: fjaell on github
-Fixes #17554
-Closes #17559
----
- src/tool_operate.c     |  3 +-
- tests/data/Makefile.am |  2 +-
- tests/data/test752     | 72 ++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 75 insertions(+), 2 deletions(-)
- create mode 100644 tests/data/test752
-
-diff --git a/src/tool_operate.c b/src/tool_operate.c
-index 24e79e6f61fa..2397de1686d9 100644
---- a/src/tool_operate.c
-+++ b/src/tool_operate.c
-@@ -548,8 +548,9 @@ static CURLcode retrycheck(struct OperationConfig *config,
-     *retryp = TRUE;
-     per->num_retries++;
-     *delayms = sleeptime;
-+    result = CURLE_OK;
-   }
--  return CURLE_OK;
-+  return result;
- }
- 
- 
-diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
-index 446674605835..ab21e0e220be 100644
---- a/tests/data/Makefile.am
-+++ b/tests/data/Makefile.am
-@@ -107,7 +107,7 @@ test709 test710 test711 test712 test713 test714 test715 test716 test717 \
- test718 test719 test720 test721 test722 test723 test724 test725 test726 \
- test727 test728 test729 test730 test731 test732 test733 test734 test735 \
- test736 test737 test738 test739 test740 test741 test742 test743 test744 \
--test745 test746 test747 test748 test749 test750 test751 \
-+test745 test746 test747 test748 test749 test750 test751 test752 \
- \
- test780 test781 test782 test783 test784 test785 test786 test787 test788 \
- test789 test790 test791 \
-diff --git a/tests/data/test752 b/tests/data/test752
-new file mode 100644
-index 000000000000..00f14909d125
---- /dev/null
-+++ b/tests/data/test752
-@@ -0,0 +1,72 @@
-+<testcase>
-+<info>
-+<keywords>
-+HTTP
-+HTTP GET
-+-f
-+--retry
-+</keywords>
-+</info>
-+
-+#
-+# Server-side
-+<reply>
-+<data crlf="yes">
-+HTTP/1.1 404 nopes
-+Date: Tue, 09 Nov 2010 14:49:00 GMT
-+Server: test-server/fake
-+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-+ETag: "21025-dc7-39462498"
-+Accept-Ranges: bytes
-+Content-Length: 6
-+Connection: close
-+Content-Type: text/html
-+Funny-head: yesyes
-+
-+-foo-
-+</data>
-+
-+<datacheck crlf="yes">
-+HTTP/1.1 404 nopes
-+Date: Tue, 09 Nov 2010 14:49:00 GMT
-+Server: test-server/fake
-+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-+ETag: "21025-dc7-39462498"
-+Accept-Ranges: bytes
-+Content-Length: 6
-+Connection: close
-+Content-Type: text/html
-+Funny-head: yesyes
-+
-+</datacheck>
-+</reply>
-+
-+#
-+# Client-side
-+<client>
-+<server>
-+http
-+</server>
-+<name>
-+--retry and -f on a HTTP 404 response
-+</name>
-+<command>
-+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -f --retry 1
-+</command>
-+</client>
-+
-+#
-+# Verify data after the test has been "shot"
-+<verify>
-+<protocol crlf="yes">
-+GET /%TESTNUMBER HTTP/1.1
-+Host: %HOSTIP:%HTTPPORT
-+User-Agent: curl/%VERSION
-+Accept: */*
-+
-+</protocol>
-+<errorcode>
-+22
-+</errorcode>
-+</verify>
-+</testcase>