up to 7.79.0 (fixes CVE-2021-22945 CVE-2021-22946 CVE-2021-22947)

[packages/curl.git] / curl.spec

diff --git a/curl.spec b/curl.spec
index 912837799f814e6d89baf2ad9e059ffab40eb2da..160dcd43314597fcfb9f9eb8ef54d87294c15310 100644 (file)
--- a/curl.spec
+++ b/curl.spec
@@ -8,7 +8,6 @@
 %bcond_without kerberos5       # Heimdal Kerberos 5 support
 %bcond_without ldap            # LDAP support
 %bcond_without http2           # HTTP/2.0 support (nghttp2 based)
-%bcond_without metalink        # metalink support
 %if "%{pld_release}" != "ac"
 %bcond_without ares            # c-ares (asynchronous DNS operations) library support
 %bcond_without rtmp            # Real Time Media Protocol support
@@ -24,12 +23,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:       7.76.1
+Version:       7.79.0
 Release:       1
 License:       MIT-like
 Group:         Applications/Networking
 Source0:       https://curl.haxx.se/download/%{name}-%{version}.tar.xz
-# Source0-md5: 5296108646ca7f318b468a7a9d4a0eb2
+# Source0-md5: 24408ce0068de0ae7871039451ad6f97
 Patch0:                %{name}-ac.patch
 Patch1:                %{name}-krb5flags.patch
 URL:           http://curl.haxx.se/
@@ -40,7 +39,6 @@ BuildRequires:        automake
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
 BuildRequires: libbrotli-devel >= 1.0.0
 BuildRequires: libidn2-devel
-%{?with_metalink:BuildRequires:        libmetalink-devel >= 0.1.0}
 BuildRequires: libpsl-devel
 %{?with_rtmp:BuildRequires:    librtmp-devel}
 %{?with_ssh:BuildRequires:     libssh2-devel >= 1.2.8}
@@ -50,6 +48,7 @@ BuildRequires:        nettle-devel
 %{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: pkgconfig
 BuildRequires: rpm >= 4.4.9-56
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.527
 %if %{with ssl}
 %if %{with gnutls}
@@ -214,6 +213,7 @@ Summary(pl.UTF-8):  Dopełnianie parametrów w fish dla polecenia curl
 Group:         Applications/Shells
 Requires:      %{name} = %{version}-%{release}
 Requires:      fish
+BuildArch:     noarch
 
 %description -n fish-completion-%{name}
 Fish completion for curl command.
@@ -227,6 +227,7 @@ Summary(pl.UTF-8):  Dopełnianianie parametrów w ZSH dla polecenia curl
 Group:         Applications/Shells
 Requires:      %{name} = %{version}-%{release}
 Requires:      zsh
+BuildArch:     noarch
 
 %description -n zsh-completion-curl
 ZSH completion for curl command.
@@ -258,16 +259,15 @@ Dopełnianianie parametrów w ZSH dla polecenia curl.
 %if %{with ssl}
        --with-ca-bundle=/etc/certs/ca-certificates.crt \
 %if %{with gnutls}
-       --with-gnutls --without-ssl \
+       --with-gnutls --without-openssl \
 %else
-       --with-ssl=%{_prefix} \
+       --with-openssl=%{_prefix} \
 %endif
 %else
-       --without-ssl --without-gnutls \
+       --without-ssl \
 %endif
        --with-fish-functions-dir=%{fish_compdir} \
        %{__with_without kerberos5 gssapi %{_prefix}} \
-       %{__with_without metalink libmetalink} \
        %{__with_without rtmp librtmp} \
        %{__with_without http2 nghttp2} \
        %{__with_without ssh libssh2}
@@ -328,7 +328,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n fish-completion-%{name}
 %defattr(644,root,root,755)
-%{fish_compdir}/%{name}.fish
+%{fish_compdir}/curl.fish
 
 %files -n zsh-completion-curl
 %defattr(644,root,root,755)