From b1eddb0aff430e54e421525b024d943213c779b9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 29 May 2015 19:00:46 +0200 Subject: MySQL 5.5.44 --- compat-mysql55.spec | 8 ++++---- mysql-openssl.patch | 13 ------------- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 mysql-openssl.patch diff --git a/compat-mysql55.spec b/compat-mysql55.spec index 0e9ccd7..504ed92 100644 --- a/compat-mysql55.spec +++ b/compat-mysql55.spec @@ -5,7 +5,7 @@ %endif Name: compat-mysql55 -Version: 5.5.43 +Version: 5.5.44 Release: 1%{?dist} Summary: MySQL shared libraries Group: Applications/Databases @@ -44,8 +44,6 @@ Patch19: mysql-file-contents.patch Patch20: mysql-string-overflow.patch Patch21: mysql-dh1024.patch Patch22: mysql-innodbwarn.patch -# http://bugs.mysql.com/68999 -Patch23: mysql-openssl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gperf, perl, readline-devel, openssl-devel @@ -97,7 +95,6 @@ rm -f Docs/mysql.info %patch20 -p1 %patch21 -p1 %patch22 -p1 -%patch23 -p1 # upstream has fallen down badly on symbol versioning, do it ourselves cp %{SOURCE8} libmysql/libmysql.version @@ -222,6 +219,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 29 2015 Remi Collet - 5.5.44-1 +- update to 5.5.44 + * Mon Apr 13 2015 Remi Collet - 5.5.43-1 - update to 5.5.43 diff --git a/mysql-openssl.patch b/mysql-openssl.patch deleted file mode 100644 index bcdc1d2..0000000 --- a/mysql-openssl.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- mysql-5.5.31/vio/viossl.c~ 2013-03-25 14:14:58.000000000 +0100 -+++ mysql-5.5.31/vio/viossl.c 2013-04-18 16:58:38.552557538 +0200 -@@ -172,8 +172,10 @@ - SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout); - SSL_set_fd(ssl, vio->sd); - #ifndef HAVE_YASSL -+#ifdef SSL_OP_NO_COMPRESSION - SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); - #endif -+#endif - - if ((r= connect_accept_func(ssl)) < 1) - { -- cgit