[packages/curl] - rel 3; revert additional SSL freeing since it will harm other openssl users; will see how upstream
arekm
arekm at pld-linux.org
Wed Jul 6 13:45:11 CEST 2016
commit 7e6c327178d499752fd1d5410cbe603e482f2f44
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Jul 6 13:44:58 2016 +0200
- rel 3; revert additional SSL freeing since it will harm other openssl users; will see how upstream will solve this (https://github.com/curl/curl/issues/817)
curl-revert-ssl-freeing.patch | 30 ++++++++++++++++++++++++++++++
curl.spec | 4 +++-
2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/curl.spec b/curl.spec
index d34b8d9..15a843e 100644
--- a/curl.spec
+++ b/curl.spec
@@ -23,13 +23,14 @@ Summary(ru.UTF-8): Утилита для получения файлов с се
Summary(uk.UTF-8): Утиліта для отримання файлів з серверів FTP, HTTP та інших
Name: curl
Version: 7.49.1
-Release: 2
+Release: 3
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
@@ -215,6 +216,7 @@ 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
new file mode 100644
index 0000000..29cdbb6
--- /dev/null
+++ b/curl-revert-ssl-freeing.patch
@@ -0,0 +1,30 @@
+
+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/7e6c327178d499752fd1d5410cbe603e482f2f44
More information about the pld-cvs-commit
mailing list