Merge pull request #4024 from MilhouseVH/le10_mariadb-10.4.10

mariadb: update to mariadb-10.4.10
This commit is contained in:
Christian Hewitt 2019-12-09 07:45:01 +08:00 committed by GitHub
commit 232e8ef190
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 2 deletions

View File

@ -2,9 +2,9 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="mariadb"
PKG_VERSION="10.3.14"
PKG_VERSION="10.4.10"
PKG_REV="103"
PKG_SHA256="ba1c94d92fc8ebdf9b8a1d1b93ed6aeeead33da507efbbd4afcf49f32023e054"
PKG_SHA256="cd50fddf86c2a47405737e342f78ebd40d5716f0fb32b976245de713bed01421"
PKG_LICENSE="GPL2"
PKG_SITE="https://mariadb.org"
PKG_URL="https://downloads.mariadb.org/interstitial/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"

View File

@ -0,0 +1,25 @@
From 92ed8269f929df9d6203ae52340fca0367f537a9 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 25 Nov 2019 23:54:22 +0000
Subject: [PATCH] disable PLUGIN_AUTH_PAM as we aren't able to build it
---
cmake/build_configurations/mysql_release.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 37a6c45..e2a4ba8 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -124,7 +124,7 @@ ENDIF()
IF(UNIX)
SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
- SET(PLUGIN_AUTH_PAM YES)
+ SET(PLUGIN_AUTH_PAM NO)
IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
IF(NOT IGNORE_AIO_CHECK)
--
2.7.4