rpms/curl
8
0
Fork 1
Code Issues Pull Requests Releases Activity

drop 0103-curl-7.50.0-stunnel.patch no longer needed

Browse Source 
It paralyzes the test-suite on systems with ancient versions of stunnel.
This commit is contained in:
Kamil Dudka 2016-10-20 13:39:29 +02:00
parent 6aadc8e2a0
commit 837f1f0f4e
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0103-curl-7.50.0-stunnel.patch
View File

@ -1,25 +0,0 @@
From c80ccf84e9024c0d3d5388908aa04ecd81d223ee Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
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

7
curl.spec
View File

@ -12,9 +12,6 @@ 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
@ -132,7 +129,6 @@ documentation of the library, too.
# Fedora patches
%patch101 -p1
%patch102 -p1
%patch103 -p1
%patch104 -p1
%patch107 -p1
@ -234,6 +230,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4
%changelog
* Thu Oct 20 2016 Kamil Dudka <kdudka@redhat.com> 7.50.3-3
- drop 0103-curl-7.50.0-stunnel.patch no longer needed
* Fri Oct 07 2016 Kamil Dudka <kdudka@redhat.com> 7.50.3-2
- use the just built version of libcurl while generating zsh completion