summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mysql-chain-certs.patch21
-rw-r--r--mysql55.spec9
2 files changed, 15 insertions, 15 deletions
diff --git a/mysql-chain-certs.patch b/mysql-chain-certs.patch
index 3b20a28..579dae2 100644
--- a/mysql-chain-certs.patch
+++ b/mysql-chain-certs.patch
@@ -10,18 +10,17 @@ Fedora builds, I'm not feeling motivated to try to fix yassl for this.
See RH bug #598656. Filed upstream at http://bugs.mysql.com/bug.php?id=54158
-diff -Naur mysql-5.1.47.orig/vio/viosslfactories.c mysql-5.1.47/vio/viosslfactories.c
---- mysql-5.1.47.orig/vio/viosslfactories.c 2010-05-06 11:28:07.000000000 -0400
-+++ mysql-5.1.47/vio/viosslfactories.c 2010-05-26 23:23:46.000000000 -0400
-@@ -100,7 +100,7 @@
- (long) ctx, cert_file, key_file));
- if (cert_file)
+--- mysql-5.5.28/vio/viosslfactories.c.orig 2012-08-29 10:50:46.000000000 +0200
++++ mysql-5.5.28/vio/viosslfactories.c 2012-09-29 11:16:08.622223862 +0200
+@@ -106,7 +106,7 @@
+ key_file= cert_file;
+
+ if (cert_file &&
+- SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0)
++ SSL_CTX_use_certificate_chain_file(ctx, cert_file) <= 0)
{
-- if (SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0)
-+ if (SSL_CTX_use_certificate_chain_file(ctx, cert_file) <= 0)
- {
- *error= SSL_INITERR_CERT;
- DBUG_PRINT("error",("%s from file '%s'", sslGetErrString(*error), cert_file));
+ *error= SSL_INITERR_CERT;
+ DBUG_PRINT("error",("%s from file '%s'", sslGetErrString(*error), cert_file));
diff -Naur mysql-5.1.47.orig/extra/yassl/src/ssl.cpp mysql-5.1.47/extra/yassl/src/ssl.cpp
--- mysql-5.1.47.orig/extra/yassl/src/ssl.cpp 2010-05-06 11:24:26.000000000 -0400
+++ mysql-5.1.47/extra/yassl/src/ssl.cpp 2010-05-26 23:29:13.000000000 -0400
diff --git a/mysql55.spec b/mysql55.spec
index 1907d28..8013791 100644
--- a/mysql55.spec
+++ b/mysql55.spec
@@ -1,5 +1,5 @@
Name: mysql
-Version: 5.5.27
+Version: 5.5.28
Release: 1%{?dist}
Summary: MySQL client programs and shared libraries
@@ -51,7 +51,6 @@ Patch7: mysql-versioning.patch
Patch8: mysql-dubious-exports.patch
Patch10: mysql-plugin-bool.patch
Patch11: mysql-s390-tsc.patch
-Patch12: mysql-openssl-test.patch
Patch14: mysql-va-list.patch
Patch15: mysql-netdevname.patch
Patch16: mysql-logrotate.patch
@@ -231,8 +230,6 @@ rm -f Docs/mysql.info
%patch8 -p1
%patch10 -p1
%patch11 -p1
-# When build with system openssl
-%patch12 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
@@ -790,6 +787,10 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
+* Sat Sep 29 2012 Remi Collet <RPMS@FamilleCollet.com> - 5.5.28-1
+- update to MySQL 5.5.28 Community Server GA
+ http://dev.mysql.com/doc/refman/5.5/en/news-5-5-28.html
+
* Sun Aug 5 2012 Tom Lane <tgl@redhat.com> 5.5.27-1
- Update to MySQL 5.5.27, for various fixes described at
http://dev.mysql.com/doc/refman/5.5/en/news-5-5-27.html