switch the TLS backend back to OpenSSL

This commit is contained in:
Kamil Dudka 2017-04-05 14:17:50 +02:00
parent 1426ff4f4a
commit 7c3b67bb15

View File

@ -1,7 +1,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl Name: curl
Version: 7.53.1 Version: 7.53.1
Release: 3.3%{?dist} Release: 3.4%{?dist}
License: MIT License: MIT
Group: Applications/Internet Group: Applications/Internet
Source: https://curl.haxx.se/download/%{name}-%{version}.tar.lzma Source: https://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@ -26,8 +26,8 @@ BuildRequires: libnghttp2-devel
BuildRequires: libpsl-devel BuildRequires: libpsl-devel
BuildRequires: libssh2-devel BuildRequires: libssh2-devel
BuildRequires: multilib-rpm-config BuildRequires: multilib-rpm-config
BuildRequires: nss-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: openssh-clients BuildRequires: openssh-clients
BuildRequires: openssh-server BuildRequires: openssh-server
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -82,10 +82,6 @@ Summary: A library for getting files from web servers
Group: Development/Libraries Group: Development/Libraries
Requires: libssh2%{?_isa} >= %{libssh2_version} Requires: libssh2%{?_isa} >= %{libssh2_version}
# libnsspem.so is no longer included in the nss package (#1347336)
BuildRequires: nss-pem
Requires: nss-pem%{?_isa}
%description -n libcurl %description -n libcurl
libcurl is a free and easy-to-use client-side URL transfer library, supporting libcurl is a free and easy-to-use client-side URL transfer library, supporting
FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS, FILE, IMAP, FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS, FILE, IMAP,
@ -175,7 +171,7 @@ export common_configure_opts=" \
--enable-threaded-resolver \ --enable-threaded-resolver \
--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \ --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
--with-gssapi${KRB5_PREFIX} \ --with-gssapi${KRB5_PREFIX} \
--without-ssl --with-nss" --with-ssl"
%global _configure ../configure %global _configure ../configure
@ -303,6 +299,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libcurl.so.[0-9].[0-9].[0-9].minimal %{_libdir}/libcurl.so.[0-9].[0-9].[0-9].minimal
%changelog %changelog
* Wed Apr 05 2017 Kamil Dudka <kdudka@redhat.com> 7.53.1-3.4
- switch the TLS backend back to OpenSSL
* Tue Mar 14 2017 Kamil Dudka <kdudka@redhat.com> 7.53.1-3.3 * Tue Mar 14 2017 Kamil Dudka <kdudka@redhat.com> 7.53.1-3.3
- rebase on top of current master - rebase on top of current master