From 498ccc192c1eaa73162f90227aa9f71b12297214 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 10 May 2019 22:27:04 +0200 Subject: [PATCH] mariadb: bump to 10.2.24 From Release Notes: Security MDEV-18686 - Add option to PAM authentication plugin to allow case insensitive username matching bugfix - multi-update checked privileges on views incorrectly (commit 5057d4637525eadad438d25ee6a4870a4e6b384c) MDEV-19276 - during connect, write error log warning for ER_DBACCESS_DENIED_ERROR, if log_warnings > 1 MDEV-17456 - Malicious SUPER user can possibly change audit log configuration without leaving traces. Fixes for the following security vulnerabilities: CVE-2019-2614 CVE-2019-2627 CVE-2019-2628 OpenWrt changes: - added PKG_CPE_ID - shortened default description to make "opkg info" output easier on the eyes - refreshed patches Signed-off-by: Sebastian Kemper --- utils/mariadb/Makefile | 11 +++++------ utils/mariadb/patches/100-fix_hostname.patch | 2 +- utils/mariadb/patches/170-ppc-remove-glibc-dep.patch | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index cd153d0b11..fead552944 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb -PKG_VERSION:=10.2.22 +PKG_VERSION:=10.2.24 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -18,11 +18,13 @@ PKG_SOURCE_URL := \ https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/$(PKG_NAME)-$(PKG_VERSION)/source \ https://downloads.mariadb.org/interstitial/$(PKG_NAME)-$(PKG_VERSION)/source -PKG_HASH:=42f4c54c29b7c196bd105bbf4d2ea721f869b14cb7ba436c3566e6dd2760614c +PKG_HASH:=97f4d924e69f77abb2f650116785c2f5ef356230442534ebcbaadb51d9bb8bc4 PKG_MAINTAINER:=Sebastian Kemper PKG_LICENSE:=GPL-2.0 LGPL-2.1 PKG_LICENSE_FILES:=COPYING libmariadb/COPYING.LIB +PKG_CPE_ID:=cpe:/a:mariadb:mariadb + HOST_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 @@ -200,10 +202,7 @@ define Package/mariadb/install/plugin endef define Package/mariadb/description/Default -MariaDB is a fast, stable and true multi-user, multi-threaded SQL -database server. SQL (Structured Query Language) is the most popular -database query language in the world. The main goals of MariaDB are -speed, robustness and ease of use. +MariaDB is a very fast and robust SQL database server. endef define Package/libmariadb/Default diff --git a/utils/mariadb/patches/100-fix_hostname.patch b/utils/mariadb/patches/100-fix_hostname.patch index d428a7b7e6..81cef724cb 100644 --- a/utils/mariadb/patches/100-fix_hostname.patch +++ b/utils/mariadb/patches/100-fix_hostname.patch @@ -1,6 +1,6 @@ --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh -@@ -399,7 +399,7 @@ fi +@@ -403,7 +403,7 @@ fi # Try to determine the hostname diff --git a/utils/mariadb/patches/170-ppc-remove-glibc-dep.patch b/utils/mariadb/patches/170-ppc-remove-glibc-dep.patch index 7cfa667a18..198d5f10cd 100644 --- a/utils/mariadb/patches/170-ppc-remove-glibc-dep.patch +++ b/utils/mariadb/patches/170-ppc-remove-glibc-dep.patch @@ -53,7 +53,7 @@ directly was the first solution adopted in MariaDB [2]. # define UT_RESUME_PRIORITY_CPU() ((void)0) --- a/storage/innobase/include/ut0ut.h +++ b/storage/innobase/include/ut0ut.h -@@ -70,9 +70,8 @@ typedef time_t ib_time_t; +@@ -71,9 +71,8 @@ typedef time_t ib_time_t; the YieldProcessor macro defined in WinNT.h. It is a CPU architecture- independent way by using YieldProcessor. */ # define UT_RELAX_CPU() YieldProcessor() @@ -65,7 +65,7 @@ directly was the first solution adopted in MariaDB [2]. #else # define UT_RELAX_CPU() do { \ volatile int32 volatile_var; \ -@@ -90,9 +89,8 @@ typedef time_t ib_time_t; +@@ -91,9 +90,8 @@ typedef time_t ib_time_t; #endif #if defined(HAVE_HMT_PRIORITY_INSTRUCTION)