1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge the ULN RPM fix into main.

Browse Source
This commit is contained in:
Joerg Bruehe 2012-11-08 19:23:54 +01:00
commit 2512ee8b7c
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packaging/rpm-uln/mysql-chain-certs.patch
View File

@ -9,19 +9,23 @@ 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 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 Joerg Bruehe, MySQL Build Team at Oracle: First patch adapted to code changes in MySQL 5.5
--- 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 @@ diff -Naur mysql-5.5.29.orig/vio/viosslfactories.c mysql-5.5.29/vio/viosslfactories.c
(long) ctx, cert_file, key_file)); --- mysql-5.5.29.orig/vio/viosslfactories.c 2010-05-06 11:28:07.000000000 -0400
if (cert_file) +++ mysql-5.5.29/vio/viosslfactories.c 2010-05-26 23:23:46.000000000 -0400
@@ -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) *error= SSL_INITERR_CERT;
+ if (SSL_CTX_use_certificate_chain_file(ctx, cert_file) <= 0) 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 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.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 +++ mysql-5.1.47/extra/yassl/src/ssl.cpp 2010-05-26 23:29:13.000000000 -0400

6
packaging/rpm-uln/mysql.spec.sh
View File

@ -244,8 +244,7 @@ Patch13: mysql-expired-certs.patch
# Will not be used by MySQL # Will not be used by MySQL
# Patch14: mysql-missing-string-code.patch Undecided, will not work in 5.5 (cmake) # Patch14: mysql-missing-string-code.patch Undecided, will not work in 5.5 (cmake)
# Patch15: mysql-lowercase-bug.patch Fixed in MySQL 5.1.54 and 5.5.9 # Patch15: mysql-lowercase-bug.patch Fixed in MySQL 5.1.54 and 5.5.9
# Patch16: mysql-chain-certs.patch Currently, this patch is broken Patch16: mysql-chain-certs.patch
# by server code changes to "vio/viosslfactories.c"
Patch17: mysql-5.5-libdir.patch Patch17: mysql-5.5-libdir.patch
Patch18: mysql-5.5-fix-tests.patch Patch18: mysql-5.5-fix-tests.patch
Patch19: mysql-5.5-mtr1.patch Patch19: mysql-5.5-mtr1.patch
@ -400,8 +399,7 @@ cd %{src_dir} # read about "%setup -n"
# %patch10 -p1 # %patch10 -p1
# %patch13 -p1 # %patch13 -p1
# %patch14 -p1 # %patch14 -p1
# %patch16 -p1 Currently, this patch is broken %patch16 -p1
# by server code changes to "vio/viosslfactories.c"
%patch17 -p1 %patch17 -p1
%patch18 -p1 %patch18 -p1
%patch19 -p1 %patch19 -p1