From 377f88624611664d4c8978bf63bd56fe20bd072c Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 3 Nov 2018 13:15:43 +0100 Subject: [PATCH] mariadb: security bump to 10.1.37 Notable Changes (copied from release notes): Various fixes from MySQL 5.6.42: MDEV-17533, MDEV-17532, MDEV-17531 MDEV-16465: fixed a bug with DDL and FOREIGN KEY Fulltext index fixes: MDEV-12547: extended the range of innodb_ft_result_cache_limit on 64-bit systems MDEV-16865: InnoDB fts_query() ignores KILL Fixes for the following security vulnerabilities: CVE-2018-3282 CVE-2016-9843 CVE-2018-3174 CVE-2018-3143 CVE-2018-3156 CVE-2018-3251 OpenWrt changes: - dropped obsolete ucontext patch (issue fixed upstream) - refreshed 130-c11_atomics.patch Signed-off-by: Sebastian Kemper --- utils/mariadb/Makefile | 4 ++-- .../patches/120-fix-ucontext-check.patch | 18 ------------------ utils/mariadb/patches/130-c11_atomics.patch | 2 +- 3 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 utils/mariadb/patches/120-fix-ucontext-check.patch diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index d9b7c4dec1..a77d914a58 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb -PKG_VERSION:=10.1.35 +PKG_VERSION:=10.1.37 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -18,7 +18,7 @@ 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:=9e91d985ed4f662126e3e5791fe91ec8a2f44ec811113c2b6fbc72fa14553c4d +PKG_HASH:=8cd516b0a7f7aa36a7c1d6e687dbbad8c0b08c92d5fd60c6e691b19a6cab4d46 PKG_MAINTAINER:=Sebastian Kemper PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/utils/mariadb/patches/120-fix-ucontext-check.patch b/utils/mariadb/patches/120-fix-ucontext-check.patch deleted file mode 100644 index 8baec28936..0000000000 --- a/utils/mariadb/patches/120-fix-ucontext-check.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/configure.cmake -+++ b/configure.cmake -@@ -1107,9 +1107,12 @@ SET(CMAKE_EXTRA_INCLUDE_FILES) - CHECK_STRUCT_HAS_MEMBER("struct dirent" d_ino "dirent.h" STRUCT_DIRENT_HAS_D_INO) - CHECK_STRUCT_HAS_MEMBER("struct dirent" d_namlen "dirent.h" STRUCT_DIRENT_HAS_D_NAMLEN) - SET(SPRINTF_RETURNS_INT 1) --CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H) --IF(NOT HAVE_UCONTEXT_H) -- CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_H) -+CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_HEADER) -+IF(NOT HAVE_UCONTEXT_HEADER) -+ CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_HEADER) -+ENDIF() -+IF(HAVE_UCONTEXT_HEADER) -+ CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) - ENDIF() - IF(HAVE_UCONTEXT_H) - CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) diff --git a/utils/mariadb/patches/130-c11_atomics.patch b/utils/mariadb/patches/130-c11_atomics.patch index f223da1a16..b70bf7f47c 100644 --- a/utils/mariadb/patches/130-c11_atomics.patch +++ b/utils/mariadb/patches/130-c11_atomics.patch @@ -95,7 +95,7 @@ Author: Vicențiu Ciorbaru # include "x86-gcc.h" --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt -@@ -78,6 +78,10 @@ IF(HAVE_BFD_H) +@@ -79,6 +79,10 @@ IF(HAVE_BFD_H) TARGET_LINK_LIBRARIES(mysys bfd) ENDIF(HAVE_BFD_H) -- 2.30.2