Author: arekm Date: Sun Jan 1 09:45:40 2012 GMT Module: packages Tag: MYSQL_5_0 ---- Log message: - rel 4; load whole ssl certificate chain
---- Files affected: packages/mysql: mysql.spec (1.353.2.103 -> 1.353.2.104) , mysql-sslchain.patch (NONE -> 1.1.4.1) (NEW) ---- Diffs: ================================================================ Index: packages/mysql/mysql.spec diff -u packages/mysql/mysql.spec:1.353.2.103 packages/mysql/mysql.spec:1.353.2.104 --- packages/mysql/mysql.spec:1.353.2.103 Sat Mar 12 15:54:49 2011 +++ packages/mysql/mysql.spec Sun Jan 1 10:45:35 2012 @@ -26,7 +26,7 @@ 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 @@ -72,6 +72,7 @@ # 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 @@ -565,6 +566,7 @@ %patch22 -p1 %patch23 -p1 %patch24 -p1 +%patch25 -p1 %build %{__libtoolize} @@ -1129,6 +1131,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.353.2.104 2012/01/01 09:45:35 arekm +- rel 4; load whole ssl certificate chain + Revision 1.353.2.103 2011/03/12 14:54:49 glen - revert unwanted patches overwrite ================================================================ Index: packages/mysql/mysql-sslchain.patch diff -u /dev/null packages/mysql/mysql-sslchain.patch:1.1.4.1 --- /dev/null Sun Jan 1 10:45:40 2012 +++ packages/mysql/mysql-sslchain.patch Sun Jan 1 10:45:35 2012 @@ -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)); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.353.2.103&r2=1.353.2.104&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
