mariadb: bump to 10.4.13 12205/head
authorSebastian Kemper <sebastian_ml@gmx.net>
Sun, 17 May 2020 20:17:54 +0000 (22:17 +0200)
committerSebastian Kemper <sebastian_ml@gmx.net>
Sun, 17 May 2020 20:18:25 +0000 (22:18 +0200)
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 <sebastian_ml@gmx.net>
utils/mariadb/Makefile

index 1d54b84a52d00883660bda1f637e1a8e5afee334..f8edde6e7d16f4679669b813fb96c9625b01ccf1 100644 (file)
@@ -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 <sebastian_ml@gmx.net>
 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 \