From 93bb13311b875c12ff570e7875dd4f1948cb32b7 Mon Sep 17 00:00:00 2001 From: zhaoshuang Date: Tue, 14 Sep 2021 18:47:31 +0800 Subject: [PATCH] add check subprocess --- curl.spec | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/curl.spec b/curl.spec index a8716e2..2cef707 100644 --- a/curl.spec +++ b/curl.spec @@ -6,7 +6,7 @@ Name: curl Version: 7.71.1 -Release: 10 +Release: 11 Summary: Curl is used in command lines or scripts to transfer data License: MIT URL: https://curl.haxx.se/ @@ -54,7 +54,7 @@ command-line tool (curl) for transferring data using various protocols. Summary: A library for getting files from web servers Requires: libssh >= %{libssh_version} libpsl >= %{libpsl_version} Requires: openssl-libs >= 1:%{openssl_version} -Provides: libcurl-full = %{version}-%{release} +Provides: libcurl-full = %{version}-%{release} Conflicts: curl < 7.66.0-3 %description -n libcurl @@ -65,7 +65,7 @@ Summary: Header files for libcurl Requires: libcurl = %{version}-%{release} Provides: curl-devel = %{version}-%{release} Obsoletes: curl-devel < %{version}-%{release} - + %description -n libcurl-devel Header files for libcurl. @@ -115,6 +115,19 @@ sed -e 's/^runpath_var=.*/runpath_var=/' \ %make_build V=1 -C build-full +%check +# we have to override LD_LIBRARY_PATH because we eliminated rpath +LD_LIBRARY_PATH="$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH" +export LD_LIBRARY_PATH +# compile upstream test-cases +cd build-full/tests +%make_build V=1 +# relax crypto policy for the test-suite to make it pass again (#1611712) +export OPENSSL_SYSTEM_CIPHERS_OVERRIDE=XXX +export OPENSSL_CONF= +# run the upstream test-suite +srcdir=../../tests perl -I../../tests ../../tests/runtests.pl -a -p -v '!flaky' + %install rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.{la,so} @@ -170,6 +183,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %{_mandir}/man3/* %changelog +* Tue Sep 14 2021 wangce - 7.71.1-11 +- DESC:add check + * Thu Aug 12 2021 gaihuiying - 7.71.1-10 - Type:CVE - CVE:CVE-2021-22925 CVE-2021-22926 -- Gitee