rpms/mariadb
1
0
Fork 0
mirror of https://git.centos.org/rpms/mariadb.git synced 2025-02-23 08:12:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

import mariadb-5.5.50-1.el7_2

Browse source
This commit is contained in:
CentOS Sources 2016-08-11 08:06:06 -04:00
parent ca2eb8fff7
commit 63de2fe6d0
4 changed files with 7 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1 +1 @@
SOURCES/mariadb-5.5.47.tar.gz SOURCES/mariadb-5.5.50.tar.gz

2
.mariadb.metadata
View file

@ -1 +1 @@
a60a64b0bb423c68cab72ec81d5a4c730cf18840 SOURCES/mariadb-5.5.47.tar.gz 4bad9d566aae9d96155290bf3690eafe67363b36 SOURCES/mariadb-5.5.50.tar.gz

30
SOURCES/mariadb-ssltest.patch
View file

@ -1,30 +0,0 @@
Don't test EDH-RSA-DES-CBC-SHA cipher, it seems to be removed from openssl
which now makes mariadb/mysql FTBFS because openssl_1 test fails
Related: #1044565
diff -up mariadb-5.5.34/mysql-test/r/openssl_1.result.p20 mariadb-5.5.34/mysql-test/r/openssl_1.result
--- mariadb-5.5.34/mysql-test/r/openssl_1.result.p20 2014-01-06 11:51:18.878640731 +0100
+++ mariadb-5.5.34/mysql-test/r/openssl_1.result 2014-01-06 11:51:45.364678942 +0100
@@ -196,8 +196,6 @@ Ssl_cipher DHE-RSA-AES256-SHA
Variable_name Value
Ssl_cipher EDH-RSA-DES-CBC3-SHA
Variable_name Value
-Ssl_cipher EDH-RSA-DES-CBC-SHA
-Variable_name Value
Ssl_cipher RC4-SHA
select 'is still running; no cipher request crashed the server' as result from dual;
result
diff -up mariadb-5.5.34/mysql-test/t/openssl_1.test.p20 mariadb-5.5.34/mysql-test/t/openssl_1.test
--- mariadb-5.5.34/mysql-test/t/openssl_1.test.p20 2014-01-06 11:51:18.830640662 +0100
+++ mariadb-5.5.34/mysql-test/t/openssl_1.test 2014-01-06 11:51:18.879640733 +0100
@@ -218,7 +218,7 @@ DROP TABLE t1;
# Common ciphers to openssl and yassl
--exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=DHE-RSA-AES256-SHA
--exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC3-SHA
---exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC-SHA
+#--exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC-SHA
--exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=RC4-SHA
--disable_query_log
--disable_result_log

8
SPECS/mariadb.spec
View file

@ -3,7 +3,7 @@
%bcond_with tokudb %bcond_with tokudb
Name: mariadb Name: mariadb
Version: 5.5.47 Version: 5.5.50
Release: 1%{?dist} Release: 1%{?dist}
Epoch: 1 Epoch: 1
@ -51,7 +51,6 @@ Patch11: mariadb-string-overflow.patch
Patch14: mariadb-basedir.patch Patch14: mariadb-basedir.patch
Patch17: mariadb-covscan-signexpr.patch Patch17: mariadb-covscan-signexpr.patch
Patch18: mariadb-covscan-stroverflow.patch Patch18: mariadb-covscan-stroverflow.patch
Patch19: mariadb-ssltest.patch
BuildRequires: perl, readline-devel, openssl-devel BuildRequires: perl, readline-devel, openssl-devel
BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@ -219,7 +218,6 @@ MariaDB is a community developed branch of MySQL.
%patch14 -p1 %patch14 -p1
%patch17 -p1 %patch17 -p1
%patch18 -p1 %patch18 -p1
%patch19 -p1
# workaround for upstream bug #56342 # workaround for upstream bug #56342
rm -f mysql-test/t/ssl_8k_key-master.opt rm -f mysql-test/t/ssl_8k_key-master.opt
@ -724,6 +722,10 @@ fi
%{_mandir}/man1/mysql_client_test.1* %{_mandir}/man1/mysql_client_test.1*
%changelog %changelog
* Mon Jul 25 2016 Jakub Dorňák <jdornak@redhat.com> - 1:5.5.50-1
- Rebase to 5.5.50
Resolves: #1359628
* Wed Feb 3 2016 Jakub Dorňák <jdornak@redhat.com> - 1:5.5.47-1 * Wed Feb 3 2016 Jakub Dorňák <jdornak@redhat.com> - 1:5.5.47-1
- Rebase to 5.5.47 - Rebase to 5.5.47
Also fixes: CVE-2015-4792 CVE-2015-4802 CVE-2015-4815 CVE-2015-4816 Also fixes: CVE-2015-4792 CVE-2015-4802 CVE-2015-4815 CVE-2015-4816