From 518559f4a0d8324d9006611134796788697874ad Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Thu, 21 Jul 2016 16:30:02 +0200 Subject: [PATCH] fix HTTPS and FTPS tests (work around stunnel bug #1358810) --- 0103-curl-7.50.0-stunnel.patch | 25 +++++++++++++++++++++++++ curl.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0103-curl-7.50.0-stunnel.patch diff --git a/0103-curl-7.50.0-stunnel.patch b/0103-curl-7.50.0-stunnel.patch new file mode 100644 index 0000000..7292d67 --- /dev/null +++ b/0103-curl-7.50.0-stunnel.patch @@ -0,0 +1,25 @@ +From c80ccf84e9024c0d3d5388908aa04ecd81d223ee Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Thu, 21 Jul 2016 16:26:34 +0200 +Subject: [PATCH] tests/secureserver.pl: work around RHBZ #1358810 + +Bug: https://bugzilla.redhat.com/1358810 +--- + tests/secureserver.pl | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/secureserver.pl b/tests/secureserver.pl +index 3a7443c..c2da40d 100755 +--- a/tests/secureserver.pl ++++ b/tests/secureserver.pl +@@ -275,6 +275,7 @@ if($stunnel_version >= 400) { + print STUNCONF "cert = $certfile\n"; + print STUNCONF "debug = $loglevel\n"; + print STUNCONF "socket = $socketopt\n"; ++ print STUNCONF "requireCert = no\n"; + if($fips_support) { + # disable fips in case OpenSSL doesn't support it + print STUNCONF "fips = no\n"; +-- +2.5.5 + diff --git a/curl.spec b/curl.spec index 20681c8..8c0a29e 100644 --- a/curl.spec +++ b/curl.spec @@ -18,6 +18,9 @@ Patch101: 0101-curl-7.32.0-multilib.patch # prevent configure script from discarding -g in CFLAGS (#496778) Patch102: 0102-curl-7.36.0-debug.patch +# fix HTTPS and FTPS tests (work around stunnel bug #1358810) +Patch103: 0103-curl-7.50.0-stunnel.patch + # use localhost6 instead of ip6-localhost in the curl test-suite Patch104: 0104-curl-7.19.7-localhost6.patch @@ -135,6 +138,7 @@ install -p -m0755 %{SOURCE2} tests/http2-server.pl # Fedora patches %patch101 -p1 %patch102 -p1 +%patch103 -p1 %patch104 -p1 %patch107 -p1 @@ -234,7 +238,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/libcurl.m4 %changelog -* Wed Jul 21 2016 Kamil Dudka 7.50.0-1 +* Thu Jul 21 2016 Kamil Dudka 7.50.0-1 +- fix HTTPS and FTPS tests (work around stunnel bug #1358810) - new upstream release * Fri Jun 17 2016 Kamil Dudka 7.49.1-3