diff options
| -rw-r--r-- | packaging/rpm-uln/mysql-chain-certs.patch | 26 | ||||
| -rw-r--r-- | packaging/rpm-uln/mysql.spec.sh | 6 |
2 files changed, 17 insertions, 15 deletions
diff --git a/packaging/rpm-uln/mysql-chain-certs.patch b/packaging/rpm-uln/mysql-chain-certs.patch index 3b20a28031d..4e26af16cb0 100644 --- a/packaging/rpm-uln/mysql-chain-certs.patch +++ b/packaging/rpm-uln/mysql-chain-certs.patch @@ -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 + === -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) +Joerg Bruehe, MySQL Build Team at Oracle: First patch adapted to code changes in MySQL 5.5 + + +diff -Naur mysql-5.5.29.orig/vio/viosslfactories.c mysql-5.5.29/vio/viosslfactories.c +--- mysql-5.5.29.orig/vio/viosslfactories.c 2010-05-06 11:28:07.000000000 -0400 ++++ 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) -+ 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/packaging/rpm-uln/mysql.spec.sh b/packaging/rpm-uln/mysql.spec.sh index 93ba78eb56a..8b25b160be1 100644 --- a/packaging/rpm-uln/mysql.spec.sh +++ b/packaging/rpm-uln/mysql.spec.sh @@ -244,8 +244,7 @@ Patch13: mysql-expired-certs.patch # Will not be used by MySQL # 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 -# Patch16: mysql-chain-certs.patch Currently, this patch is broken -# by server code changes to "vio/viosslfactories.c" +Patch16: mysql-chain-certs.patch Patch17: mysql-5.5-libdir.patch Patch18: mysql-5.5-fix-tests.patch Patch19: mysql-5.5-mtr1.patch @@ -400,8 +399,7 @@ cd %{src_dir} # read about "%setup -n" # %patch10 -p1 # %patch13 -p1 # %patch14 -p1 -# %patch16 -p1 Currently, this patch is broken -# by server code changes to "vio/viosslfactories.c" +%patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 |