[packages/mysql/MYSQL_5_6] - rel 3; free compression methods using proper API which avoids conflict with curl - https://github.

arekm arekm at pld-linux.org
Tue Jul 19 19:29:14 CEST 2016


commit 37c99526f6eec27d5d4f3c61f844bb056d4cc074
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Jul 19 19:29:08 2016 +0200

    - rel 3; free compression methods using proper API which avoids conflict with curl - https://github.com/curl/curl/issues/905

 mysql-ssl.patch | 10 ++++++++++
 mysql.spec      |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/mysql.spec b/mysql.spec
index 0ebc276..1214e5b 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -29,7 +29,7 @@
 %undefine	with_tokudb
 %endif
 
-%define		rel	2
+%define		rel	3
 %define		percona_rel	76.3
 %include	/usr/lib/rpm/macros.perl
 Summary:	MySQL: a very fast and reliable SQL database engine
@@ -72,6 +72,7 @@ Patch4:		%{name}-no-default-secure-auth.patch
 Patch5:		%{name}-system-libhsclient.patch
 # from fedora
 Patch6:		%{name}-system-users.patch
+Patch7:		%{name}-ssl.patch
 
 Patch9:		%{name}-build.patch
 Patch11:	%{name}-upgrade.patch
@@ -523,6 +524,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %patch9 -p1
 %patch11 -p1
diff --git a/mysql-ssl.patch b/mysql-ssl.patch
new file mode 100644
index 0000000..522b9f5
--- /dev/null
+++ b/mysql-ssl.patch
@@ -0,0 +1,10 @@
+--- percona-server-5.6.28-76.1/vio/vio.c~	2016-01-08 23:12:24.000000000 +0100
++++ percona-server-5.6.28-76.1/vio/vio.c	2016-07-19 18:54:23.648042457 +0200
+@@ -399,6 +399,6 @@ void vio_end(void)
+   ERR_free_strings();
+   EVP_cleanup();
+   CRYPTO_cleanup_all_ex_data();
+-  sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
++  SSL_COMP_free_compression_methods();
+ #endif
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/37c99526f6eec27d5d4f3c61f844bb056d4cc074



More information about the pld-cvs-commit mailing list