From 980291575ed942e2f121b7a88cf011a8e53d3843 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 17 May 2020 22:15:23 +0200 Subject: [PATCH 1/2] libmariadb: bump to 3.1.8 Signed-off-by: Sebastian Kemper --- libs/libmariadb/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/libmariadb/Makefile b/libs/libmariadb/Makefile index 64c849edf..62ac3dc8a 100644 --- a/libs/libmariadb/Makefile +++ b/libs/libmariadb/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmariadb -PKG_VERSION:=3.1.7 -PKG_RELEASE:=2 +PKG_VERSION:=3.1.8 +PKG_RELEASE:=1 PKG_SOURCE:=mariadb-connector-c-$(PKG_VERSION)-src.tar.gz PKG_SOURCE_URL := \ @@ -18,7 +18,7 @@ PKG_SOURCE_URL := \ https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/connector-c-$(PKG_VERSION) \ https://downloads.mariadb.org/interstitial/connector-c-$(PKG_VERSION) -PKG_HASH:=64f7bc8f5df3200ba6e3080f68ee4942382a33e8371baea8ca4b9242746df59a +PKG_HASH:=431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b PKG_MAINTAINER:=Sebastian Kemper PKG_LICENSE:=LGPL-2.1 PKG_LICENSE_FILES:=COPYING.LIB From 0e1a289613d9d5fd004638f030e1a056cef8dde6 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 17 May 2020 22:17:54 +0200 Subject: [PATCH 2/2] mariadb: bump to 10.4.13 Upstream added define INSTALL_PAMDATADIR, so hardcoded path is gone. Fixes: CVE-2020-2752 CVE-2020-2812 CVE-2020-2814 CVE-2020-2760 Signed-off-by: Sebastian Kemper --- utils/mariadb/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 1d54b84a5..f8edde6e7 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb -PKG_VERSION:=10.4.12 -PKG_RELEASE:=3 +PKG_VERSION:=10.4.13 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL := \ @@ -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:=fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208 +PKG_HASH:=45bbbb12d1de8febd9edf630e940c23cf14efd60570c743b268069516a5d91df PKG_MAINTAINER:=Sebastian Kemper PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING THIRDPARTY @@ -372,6 +372,7 @@ CMAKE_OPTIONS += \ -DINSTALL_MANDIR=share/man \ -DINSTALL_MYSQLSHAREDIR=share/mariadb \ -DINSTALL_MYSQLTESTDIR="" \ + -DINSTALL_PAMDATADIR="/etc/security" \ -DINSTALL_PAMDIR="/lib/security" \ -DINSTALL_PLUGINDIR=lib/mariadb/plugin \ -DINSTALL_SBINDIR=bin \