From 4284b5bb77908e6f16f99500a6e089a504558a89 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 29 2020 07:05:00 +0000 Subject: import mariadb-5.5.68-1.el7 --- diff --git a/.gitignore b/.gitignore index b4c5788..9581010 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mariadb-5.5.65.tar.gz +SOURCES/mariadb-5.5.68.tar.gz diff --git a/.mariadb.metadata b/.mariadb.metadata index 5f80820..cc2e625 100644 --- a/.mariadb.metadata +++ b/.mariadb.metadata @@ -1 +1 @@ -886f157260e696e793bf0b270ca1393aaa219617 SOURCES/mariadb-5.5.65.tar.gz +1bd487736ccea4db78d2c7068ccac245a7dd0fb6 SOURCES/mariadb-5.5.68.tar.gz diff --git a/SOURCES/main.events_bugs_01-01-2020-timebomb.patch b/SOURCES/main.events_bugs_01-01-2020-timebomb.patch deleted file mode 100644 index 22a439f..0000000 --- a/SOURCES/main.events_bugs_01-01-2020-timebomb.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 3c94c5b8fab0c3bb0febe62d72b89bc8d51c3932 Mon Sep 17 00:00:00 2001 -From: Oleksandr Byelkin -Date: Fri, 3 Jan 2020 10:25:46 +0100 -Subject: [PATCH] MDEV-21416: main.events_bugs fails due to 2020-01-01 date - -Moved to the next problematic year (2038). ---- - mysql-test/r/events_bugs.result | 4 ++-- - mysql-test/t/events_bugs.test | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result -index 30bc4f89d8ca..1729862dba88 100644 ---- a/mysql-test/r/events_bugs.result -+++ b/mysql-test/r/events_bugs.result -@@ -643,7 +643,7 @@ SET GLOBAL READ_ONLY = 1; - # Connection: u1_con (mysqltest_u1@localhost/events_test). - # - --CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; -+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; - ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement - - ALTER EVENT e1 COMMENT 'comment'; -@@ -656,7 +656,7 @@ ERROR HY000: The MariaDB server is running with the --read-only option so it can - # Connection: root_con (root@localhost/events_test). - # - --CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; -+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; - - ALTER EVENT e1 COMMENT 'comment'; - -diff --git a/mysql-test/t/events_bugs.test b/mysql-test/t/events_bugs.test -index dc31556998af..aca1f144ec3f 100644 ---- a/mysql-test/t/events_bugs.test -+++ b/mysql-test/t/events_bugs.test -@@ -1033,7 +1033,7 @@ SET GLOBAL READ_ONLY = 1; - --echo - - --error ER_OPTION_PREVENTS_STATEMENT --CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; -+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; - - --echo - -@@ -1057,7 +1057,7 @@ DROP EVENT e1; - - --echo - --CREATE EVENT e1 ON SCHEDULE AT '2020-01-01 00:00:00' DO SET @a = 1; -+CREATE EVENT e1 ON SCHEDULE AT '2038-01-01 00:00:00' DO SET @a = 1; - - --echo - diff --git a/SOURCES/mariadb-client-memory-leak.patch b/SOURCES/mariadb-client-memory-leak.patch new file mode 100644 index 0000000..bda0bba --- /dev/null +++ b/SOURCES/mariadb-client-memory-leak.patch @@ -0,0 +1,43 @@ +# Fix created by Stephane Carrez, little modification by Lukas Javorsky +# https://bugs.mysql.com/bug.php?id=66740 +# Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689827 + +--- mariadb-5.5.65/mysys/my_thr_init.c.memleak 2019-08-08 11:40:51.223474780 +0200 ++++ mariadb-5.5.65/mysys/my_thr_init.c 2019-10-10 09:40:38.591175329 +0200 +@@ -35,6 +35,7 @@ + #if !defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R) + mysql_mutex_t LOCK_localtime_r; + #endif ++static void thread_cleanup(void* data); + #ifdef _MSC_VER + static void install_sigabrt_handler(); + #endif +@@ -195,7 +196,7 @@ + without calling my_init() + my_end(). + */ + if (!my_thr_key_mysys_exists && +- (pth_ret= pthread_key_create(&THR_KEY_mysys, NULL)) != 0) ++ (pth_ret= pthread_key_create(&THR_KEY_mysys, thread_cleanup)) != 0) + { + fprintf(stderr, "Can't initialize threads: error %d\n", pth_ret); + return 1; +@@ -400,6 +401,19 @@ + + pthread_setspecific(THR_KEY_mysys,0); + ++ /* Cleanup using the Posix 1003.1 standard mechanism with pthread_key_create */ ++ thread_cleanup(tmp); ++} ++ ++ ++/* ++ Do the real thread memory cleanup. This is called explictly by ++ my_thread_end() or by the Posix 1003.1 thread cleanup mechanism. ++*/ ++static void thread_cleanup(void* data) ++{ ++ struct st_my_thread_var *tmp = (struct st_my_thread_var*) data; ++ + if (tmp && tmp->init) + { + #if !defined(DBUG_OFF) diff --git a/SOURCES/mariadb-logrotate.patch b/SOURCES/mariadb-logrotate.patch index c9f8b50..f82029f 100644 --- a/SOURCES/mariadb-logrotate.patch +++ b/SOURCES/mariadb-logrotate.patch @@ -17,28 +17,23 @@ See discussions at RH bugs 799735, 547007 diff -up mariadb-5.5.32/support-files/mysql-log-rotate.sh.errlog mariadb-5.5.32/support-files/mysql-log-rotate.sh --- mariadb-5.5.32/support-files/mysql-log-rotate.sh.errlog 2013-08-29 14:35:34.839119044 +0200 +++ mariadb-5.5.32/support-files/mysql-log-rotate.sh 2013-08-29 14:38:54.203996083 +0200 -@@ -1,9 +1,9 @@ - # This logname can be set in /etc/my.cnf --# by setting the variable "err-log" --# in the [safe_mysqld] section as follows: -+# by setting the variable "log-error" -+# in the [mysqld_safe] section as follows: +@@ -3,7 +3,7 @@ + # in the [mysqld] section as follows: # --# [safe_mysqld] --# err-log=@localstatedir@/mysqld.log -+# [mysqld_safe] + # [mysqld] +-# log-error=@localstatedir@/mysqld.log +# log-error=/var/log/mariadb/mariadb.log # # If the root user has a password you have to create a # /root/.my.cnf configuration file with the following -@@ -18,19 +18,21 @@ +@@ -18,19 +18,19 @@ # ATTENTION: This /root/.my.cnf should be readable ONLY # for root ! -@localstatedir@/mysqld.log { - # create 600 mysql mysql - notifempty -- daily +- daily - rotate 3 - missingok - compress @@ -51,12 +46,10 @@ diff -up mariadb-5.5.32/support-files/mysql-log-rotate.sh.errlog mariadb-5.5.32/ - fi - endscript -} -+# Then, un-comment the following lines to enable rotation of mysql's log file: -+ +#/var/log/mariadb/mariadb.log { +# create 640 mysql mysql +# notifempty -+# daily ++# daily +# rotate 3 +# missingok +# compress diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec index 5e7e8eb..3b6a867 100644 --- a/SPECS/mariadb.spec +++ b/SPECS/mariadb.spec @@ -3,7 +3,7 @@ %bcond_with tokudb Name: mariadb -Version: 5.5.65 +Version: 5.5.68 Release: 1%{?dist} Epoch: 1 @@ -52,8 +52,7 @@ Patch17: mariadb-covscan-signexpr.patch Patch18: mariadb-covscan-stroverflow.patch Patch20: mariadb-mysql_secure_installation.patch Patch21: mariadb-norelocatable.patch - -Patch999: main.events_bugs_01-01-2020-timebomb.patch +Patch22: mariadb-client-memory-leak.patch BuildRequires: perl, readline-devel, openssl-devel BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel @@ -229,8 +228,7 @@ MariaDB is a community developed branch of MySQL. %patch18 -p1 %patch20 -p1 %patch21 -p1 - -%patch999 -p1 +%patch22 -p1 # workaround for upstream bug #56342 rm -f mysql-test/t/ssl_8k_key-master.opt @@ -735,6 +733,26 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog +* Wed May 13 2020 Michal Schorm - 1:5.5.68-1 +- Rebase to 5.5.68 + This is the last upstream release. This major version reached upstream EOL +- Related to: rhbz#1834835 + +* Thu Mar 26 2020 Lukas Javorsky - 1:5.5.67-2 +- Resolves: rhbz#1689827 + +* Tue Feb 25 2020 Michal Schorm - 1:5.5.67-1 +- Rebase to 5.5.67 +- Related to: rhbz#1834835 +- CVE's fixed: rhbz#1821939 + CVE-2020-2574 + +* Mon Nov 18 2019 Michal Schorm - 1:5.5.66-1 +- Rebase to 5.5.66 +- Related to: rhbz#1834835 +- CVE's fixed: rhbz#1769276 rhbz#1830110 + CVE-2019-2974 CVE-2020-2780 + * Sat Aug 17 2019 Honza Horak - 1:5.5.65-1 - Rebase to 5.5.65 Also fixes: