diff --git a/curl.spec b/curl.spec index b25f6264ee8c912cbab86e2bb1098b33f7119188..bebfeb9bf93c4a063ebbec7b0f59d6a560627326 100644 --- a/curl.spec +++ b/curl.spec @@ -6,7 +6,7 @@ Name: curl Version: 7.79.1 -Release: 2 +Release: 3 Summary: Curl is used in command lines or scripts to transfer data License: MIT URL: https://curl.haxx.se/ @@ -23,9 +23,6 @@ BuildRequires: perl(Getopt::Long) perl(Pod::Usage) perl(strict) perl(warnings) BuildRequires: perl(Cwd) perl(Digest::MD5) perl(Exporter) perl(File::Basename) BuildRequires: perl(File::Copy) perl(File::Spec) perl(IPC::Open2) perl(MIME::Base64) BuildRequires: perl(Time::Local) perl(Time::HiRes) perl(vars) -%ifarch x86_64 -BuildRequires: valgrind -%endif Requires: libcurl = %{version}-%{release} Provides: curl-full = %{version}-%{release} webclient @@ -61,7 +58,7 @@ Header files for libcurl. # make tests/*.py use Python 3 sed -e '1 s|^#!/.*python|#!%{__python3}|' -i tests/*.py -printf "1112\n1455\n1184\n1801\n1900\n" >> tests/data/DISABLED +printf "1112\n1455\n1184\n1801\n1592\n" >> tests/data/DISABLED # adapt test 323 for updated OpenSSL sed -e 's/^35$/35,52/' -i tests/data/test323 @@ -106,6 +103,32 @@ sed -e 's/^runpath_var=.*/runpath_var=/' \ %make_build V=1 -C build-full +%check +# compile upstream test-cases +%make_build V=1 -C build-full/tests + +# relax crypto policy for the test-suite to make it pass again (#1610888) +export OPENSSL_SYSTEM_CIPHERS_OVERRIDE=XXX +export OPENSSL_CONF= + +# make runtests.pl work for out-of-tree builds +export srcdir=../../tests + +# prevent valgrind from being extremely slow (#1662656) +unset DEBUGINFOD_URLS + +# run the upstream test-suite for curl-full +for size in full; do ( + cd build-${size} + + # we have to override LD_LIBRARY_PATH because we eliminated rpath + export LD_LIBRARY_PATH="${PWD}/lib/.libs" + + cd tests + perl -I../../tests ../../tests/runtests.pl -a -p -v '!flaky' +) +done + %install rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.{la,so} @@ -161,6 +184,12 @@ rm -rf ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %{_mandir}/man3/* %changelog +* Mon Jan 24 2022 gaoxingwang - 7.79.1-3 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:enable check in spec + * Thu Jan 20 2022 yanglu - 7.79.1-2 - Type:bugfix - CVE:NA