[packages/curl] - rel 4; revert as fix landed in our percona mysql 5.6.31 (conflicts needed?)
arekm
arekm at pld-linux.org
Tue Jul 19 20:09:01 CEST 2016
commit 75e18c27448a61bed1ef67cf80cfdd5671ab4b2b
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Jul 19 20:08:55 2016 +0200
- rel 4; revert as fix landed in our percona mysql 5.6.31 (conflicts needed?)
curl-revert-ssl-freeing.patch | 30 ------------------------------
curl.spec | 4 +---
2 files changed, 1 insertion(+), 33 deletions(-)
---
diff --git a/curl.spec b/curl.spec
index 15a843e..8bd2c25 100644
--- a/curl.spec
+++ b/curl.spec
@@ -23,14 +23,13 @@ Summary(ru.UTF-8): Утилита для получения файлов с се
Summary(uk.UTF-8): Утиліта для отримання файлів з серверів FTP, HTTP та інших
Name: curl
Version: 7.49.1
-Release: 3
+Release: 4
License: MIT-like
Group: Applications/Networking
Source0: https://curl.haxx.se/download/%{name}-%{version}.tar.lzma
# Source0-md5: ae5e5e395da413d1fa0864e1d0a3fa57
Patch0: %{name}-ac.patch
Patch1: %{name}-krb5flags.patch
-Patch2: curl-revert-ssl-freeing.patch
URL: http://curl.haxx.se/
BuildRequires: autoconf >= 2.57
BuildRequires: automake
@@ -216,7 +215,6 @@ Dopełnianianie parametrów w ZSH dla polecenia curl.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%{__rm} m4/lt*.m4 m4/libtool.m4
diff --git a/curl-revert-ssl-freeing.patch b/curl-revert-ssl-freeing.patch
deleted file mode 100644
index 29cdbb6..0000000
--- a/curl-revert-ssl-freeing.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-This patch reverts:
-
-commit 3caaeffbe8ded4deaeb946d23631b04507bee408
-Author: Jay Satiro <raysatiro at yahoo.com>
-Date: Fri May 20 16:44:01 2016 -0400
-
- openssl: cleanup must free compression methods
-
- - Free compression methods if OpenSSL 1.0.2 to avoid a memory leak.
-
- Bug: https://github.com/curl/curl/issues/817
- Reported-by: jveazey at users.noreply.github.com
-
-diff --git b/lib/vtls/openssl.c a/lib/vtls/openssl.c
-index 3a4bde5..6e3335e 100644
---- b/lib/vtls/openssl.c
-+++ a/lib/vtls/openssl.c
-@@ -747,11 +747,6 @@ void Curl_ossl_cleanup(void)
-
- /* Free all memory allocated by all configuration modules */
- CONF_modules_free();
--
--#if OPENSSL_VERSION_NUMBER >= 0x10002003L && \
-- OPENSSL_VERSION_NUMBER <= 0x10002FFFL
-- SSL_COMP_free_compression_methods();
--#endif
- }
-
- /*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/curl.git/commitdiff/75e18c27448a61bed1ef67cf80cfdd5671ab4b2b
More information about the pld-cvs-commit
mailing list