- up to 7.66.0; fixes CVE-2019-5482, CVE-2019-5481

[packages/curl.git] / curl.spec

diff --git a/curl.spec b/curl.spec
index b9af9e7b6b3ef4412833a4ca714702f21529d7ad..1963b8ea5e3641fd02a674e781edee954a5e77b2 100644 (file)
--- a/curl.spec
+++ b/curl.spec
@@ -22,12 +22,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.49.0
+Version:       7.66.0
 Release:       1
 License:       MIT-like
 Group:         Applications/Networking
-Source0:       https://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5: f14b50657174e3c91d955f7a3e064e8c
+Source0:       https://curl.haxx.se/download/%{name}-%{version}.tar.xz
+# Source0-md5: 1c19620f5ac46aebe949d18c9bfc1c28
 Patch0:                %{name}-ac.patch
 Patch1:                %{name}-krb5flags.patch
 URL:           http://curl.haxx.se/
@@ -35,14 +35,15 @@ BuildRequires:      autoconf >= 2.57
 BuildRequires: automake
 %{?with_ares:BuildRequires:    c-ares-devel >= 1.7.0}
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
-BuildRequires: libidn-devel >= 0.4.1
+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}
 BuildRequires: libtool
 BuildRequires: nettle-devel
-%{?with_http2:BuildRequires:   nghttp2-devel >= 1.0}
+%{?with_http2:BuildRequires:   nghttp2-devel >= 1.9.0}
 %{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: pkgconfig
 BuildRequires: rpm >= 4.4.9-56
@@ -57,7 +58,6 @@ BuildRequires:        openssl-devel >= 1.0.1
 BuildRequires: tar >= 1:1.22
 BuildRequires: zlib-devel
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      libidn >= 0.4.1
 Obsoletes:     libcurl2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -116,7 +116,7 @@ Summary(pl.UTF-8):  Biblioteka curl
 Group:         Libraries
 %{?with_ares:Requires: c-ares >= 1.7.0}
 %{?with_ssh:Requires:  libssh2 >= 1.2.8}
-%{?with_http2:Requires:        nghttp2 >= 1.0}
+%{?with_http2:Requires:        nghttp2-libs >= 1.9.0}
 %if %{with ssl} && %{without gnutls}
 Requires:      openssl >= 1.0.1
 %endif
@@ -139,11 +139,12 @@ Group:            Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 %{?with_ares:Requires: c-ares-devel}
 %{?with_kerberos5:Requires:    heimdal-devel}
-Requires:      libidn-devel >= 0.4.1
+Requires:      libbrotli-devel >= 1.0.0
+Requires:      libidn2-devel
 Requires:      libpsl-devel
 %{?with_rtmp:Requires: librtmp-devel}
 %{?with_ssh:Requires:  libssh2-devel >= 1.2.8}
-%{?with_http2:Requires:        nghttp2-devel >= 1.0}
+%{?with_http2:Requires:        nghttp2-devel >= 1.9.0}
 %{?with_ldap:Requires: openldap-devel}
 %if %{with ssl}
 %if %{with gnutls}
@@ -198,6 +199,19 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 Цей пакет містить статичну бібліотеку для розробки програм з
 використанням бібліотеки curl.
 
+%package -n fish-completion-%{name}
+Summary:       Fish completion for curl command
+Summary(pl.UTF-8):     Dopełnianie parametrów w fish dla polecenia curl
+Group:         Applications/Shells
+Requires:      %{name} = %{version}-%{release}
+Requires:      fish
+
+%description -n fish-completion-%{name}
+Fish completion for curl command.
+
+%description -n fish-completion-%{name} -l pl.UTF-8
+Dopełnianie parametrów w fish dla polecenia curl.
+
 %package -n zsh-completion-curl
 Summary:       ZSH completion for curl command
 Summary(pl.UTF-8):     Dopełnianianie parametrów w ZSH dla polecenia curl
@@ -238,7 +252,10 @@ Dopełnianianie parametrów w ZSH dla polecenia curl.
 %else
        --with-ssl=%{_prefix} \
 %endif
+%else
+       --without-ssl --without-gnutls \
 %endif
+       --with-fish-functions-dir=%{fish_compdir} \
        %{__with_without kerberos5 gssapi %{_prefix}} \
        %{__with_without metalink libmetalink} \
        %{__with_without rtmp librtmp} \
@@ -267,7 +284,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES COPYING README docs/{BUGS,FAQ,FEATURES,HISTORY,KNOWN_BUGS,MANUAL,SSLCERTS,THANKS,TODO,TheArtOfHttpScripting}
+%doc CHANGES COPYING README docs/{BUGS,FAQ,FEATURES,HISTORY.md,KNOWN_BUGS,SSLCERTS.md,THANKS,TODO,TheArtOfHttpScripting}
 %attr(755,root,root) %{_bindir}/curl
 %{_mandir}/man1/curl.1*
 
@@ -278,7 +295,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc docs/{CONTRIBUTE,INTERNALS,LICENSE-MIXING,RESOURCES}
+%doc docs/{CONTRIBUTE.md,INTERNALS.md,LICENSE-MIXING.md,RESOURCES}
 %attr(755,root,root) %{_bindir}/curl-config
 %attr(755,root,root) %{_libdir}/libcurl.so
 %{_libdir}/libcurl.la
@@ -296,6 +313,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libcurl.a
 
+%files -n fish-completion-%{name}
+%defattr(644,root,root,755)
+%{fish_compdir}/%{name}.fish
+
 %files -n zsh-completion-curl
 %defattr(644,root,root,755)
 %{_datadir}/zsh/site-functions/_curl