- rel 4; load whole ssl certificate chain

Changed files:
    mysql-sslchain.patch -> 1.1.4.1
    mysql.spec -> 1.353.2.104

diff --git a/mysql-sslchain.patch b/mysql-sslchain.patch
new file mode 100644 (file)
index 0000000..b51eef1
--- /dev/null
+++ b/mysql-sslchain.patch
@@ -0,0 +1,11 @@
+--- mysql-5.0.92/vio/viosslfactories.c~        2011-01-25 12:28:07.000000000 +0100
++++ mysql-5.0.92/vio/viosslfactories.c 2012-01-01 10:41:08.925627590 +0100
+@@ -101,7 +101,7 @@
+                      (long) ctx, cert_file, key_file));
+   if (cert_file)
+   {
+-    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));

diff --git a/mysql.spec b/mysql.spec
index 16279e31716f19890f8eaf139a0417b1f0d49b42..71af58ead214389fc6e8ba06c7023c31efbc7d10 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -25,7 +25,7 @@ Summary(uk.UTF-8):    MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
 Version:       5.0.92
-Release:       3
+Release:       4
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 Source0:       ftp://gd.tuwien.ac.at/db/mysql/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
@@ -71,6 +71,7 @@ Patch22:      %{name}-fix-dummy-thread-race-condition.patch
 # ourdelta
 Patch23:       big_tables_fixlp284123_fixmysql35346.patch
 Patch24:       mysql.init.patch
+Patch25:       %{name}-sslchain.patch
 # <percona patches, http://www.percona.com/percona-lab.html>
 Patch100:      %{name}-show_patches.patch
 Patch101:      %{name}-microslow_innodb.patch
@@ -564,6 +565,7 @@ mv sphinx-*/mysqlse sql/sphinx
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 
 %build
 %{__libtoolize}