Merge pull request #2 from import/curl:rosa2021.1

Backports and update

.abf.yml

@@ -1,2 +1,2 @@
 sources:
-  curl-7.81.0.tar.gz: 3b9dd00d5c4fe90c0146ccbcb783831c511df853
+  curl-8.4.0.tar.gz: ff7c2abb68443bb868da1d7681f558d245c853dd

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)

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

curl.spec

@@ -22,6 +22,10 @@
 # GnuTLS, btw, is also capable of GOST.
 %bcond_without gnutls
 
+# To build rpm with new python:
+# nghttp2-devel requires boost-devel which depends on old python
+%bcond_without http2
+
 # Important! We perform autoreconf, then change resulting 'configure'
 # script, this prevents if from regenerating after we have changed it.
 %define _disable_rebuild_configure 1
@@ -49,7 +53,7 @@
 
 Summary:	Gets a file from a FTP, GOPHER or HTTP server
 Name:		curl
-Version:	7.81.0
+Version:	8.4.0
 Release:	1
 Epoch:		1
 License:	BSD-like
@@ -69,6 +73,9 @@ BuildRequires:	pkgconfig(libcares)
 BuildRequires:	pkgconfig(com_err)
 #BuildRequires:	pkgconfig(libidn)
 BuildRequires:	pkgconfig(libidn2)
+%if %{with http2}
+BuildRequires:	pkgconfig(libnghttp2)
+%endif
 %if 0%{?ssh2}
 BuildRequires:	pkgconfig(libssh2)
 %else
@@ -145,6 +152,8 @@ This version is compiled with GnuTLS library.
 Summary:	A library of functions for file transfer
 Group:		Networking/Other
 Requires:	rootcerts
+Provides:	libcurl-openssl = %{EVRD}
+Provides:	libcurl-openssl%{_isa} = %{EVRD}
 
 %description -n %{libname}
 libcurl is a library of functions for sending and receiving files through
@@ -162,6 +171,8 @@ use libcurl.
 Summary:	A library of functions for file transfer
 Group:		Networking/Other
 Requires:	rootcerts
+Provides:	libcurl-libressl = %{EVRD}
+Provides:	libcurl-libressl%{_isa} = %{EVRD}
 
 %description -n %{libname_libressl}
 libcurl is a library of functions for sending and receiving files through
@@ -181,6 +192,8 @@ libcurl-libressl is linked with LibreSSL and is capable of GOST TLS.
 Summary:	A library of functions for file transfer
 Group:		Networking/Other
 Requires:	rootcerts
+Provides:	libcurl-gnutls = %{EVRD}
+Provides:	libcurl-gnutls%{_isa} = %{EVRD}
 
 %description -n %{libname_gnutls}
 libcurl is a library of functions for sending and receiving files through
@@ -374,6 +387,9 @@ sed -i configure \
 	--with-zlib \
 	--with-lber-lib=lber \
 	--with-libidn2 \
+%if %{with http2}
+	--with-nghttp2 \
+%endif
 %if 0%{?ssh2}
 	--with-ssh2 \
 %else
@@ -483,3 +499,11 @@ then
 	exit 1
 fi
 %endif
+
+
+## fix security issue
+# CVE-2022-22576 CVE-2022-27774 CVE-2022-27775 CVE-2022-27776
+# CVE-2022-27778 CVE-2022-27779 CVE-2022-27780 CVE-2022-27781
+# CVE-2022-27782 CVE-2022-30115 CVE-2022-32205 CVE-2022-32206
+# CVE-2022-32207 CVE-2022-32208 CVE-2022-35252
+