make it possible to run SCP/SFTP tests on x86_64 (#632914)

This commit is contained in:
Kamil Dudka 2010-09-11 23:39:36 +02:00
parent 140d1b61f0
commit 9c24c2b172

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.21.1 Version: 7.21.1
Release: 4%{?dist} Release: 5%{?dist}
License: MIT License: MIT
Group: Applications/Internet Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@ -51,13 +51,16 @@ BuildRequires: openssh-clients
BuildRequires: openssh-server BuildRequires: openssh-server
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: stunnel BuildRequires: stunnel
BuildRequires: zlib-devel
# ssh(1) dies on SIGSEGV when SELinux policy is not installed (#632914)
BuildRequires: selinux-policy-targeted
# valgrind is not available on s390(x) # valgrind is not available on s390(x)
%ifnarch s390 s390x %ifnarch s390 s390x
BuildRequires: valgrind BuildRequires: valgrind
%endif %endif
BuildRequires: zlib-devel
Requires: libcurl = %{version}-%{release} Requires: libcurl = %{version}-%{release}
%description %description
@ -134,13 +137,14 @@ rm -f tests/data/test1112
sed -i s/899\\\([0-9]\\\)/%{?__isa_bits}9\\1/ tests/data/test* sed -i s/899\\\([0-9]\\\)/%{?__isa_bits}9\\1/ tests/data/test*
%build %build
[ -x /usr/kerberos/bin/krb5-config ] && KRB5_PREFIX="=/usr/kerberos"
%configure --disable-static \ %configure --disable-static \
--enable-ipv6 \ --enable-ipv6 \
--enable-ldaps \ --enable-ldaps \
--enable-manual \ --enable-manual \
--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 \ --with-gssapi${KRB5_PREFIX} \
--with-libidn \ --with-libidn \
--with-libssh2 \ --with-libssh2 \
--without-ssl --with-nss --without-ssl --with-nss
@ -240,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4 %{_datadir}/aclocal/libcurl.m4
%changelog %changelog
* Sat Sep 11 2010 Kamil Dudka <kdudka@redhat.com> 7.21.1-5
- make it possible to run SCP/SFTP tests on x86_64 (#632914)
* Tue Sep 07 2010 Kamil Dudka <kdudka@redhat.com> 7.21.1-4 * Tue Sep 07 2010 Kamil Dudka <kdudka@redhat.com> 7.21.1-4
- work around glibc/valgrind problem on x86_64 (#631449) - work around glibc/valgrind problem on x86_64 (#631449)