summaryrefslogtreecommitdiff
path: root/source/ap
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap')
-rwxr-xr-xsource/ap/mariadb/mariadb.SlackBuild2
-rw-r--r--source/ap/mariadb/mysql.no.plugin_auth_pam.diff11
2 files changed, 13 insertions, 0 deletions
diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild
index b3a2b866..3da0bab5 100755
--- a/source/ap/mariadb/mariadb.SlackBuild
+++ b/source/ap/mariadb/mariadb.SlackBuild
@@ -93,6 +93,8 @@ cd ${PKGNAM}-$VERSION || exit 1
# Fix mysql_install_db if PAM is not installed:
if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.0 ]; then
zcat $CWD/mysql_install_db.nopam.diff.gz | patch -p1 --verbose || exit 1
+ # Also no PAM plugin then:
+ zcat $CWD/mysql.no.plugin_auth_pam.diff.gz | patch -p1 --verbose || exit 1
fi
chown -R root:root .
diff --git a/source/ap/mariadb/mysql.no.plugin_auth_pam.diff b/source/ap/mariadb/mysql.no.plugin_auth_pam.diff
new file mode 100644
index 00000000..34eedf5a
--- /dev/null
+++ b/source/ap/mariadb/mysql.no.plugin_auth_pam.diff
@@ -0,0 +1,11 @@
+--- ./cmake/build_configurations/mysql_release.cmake.orig 2019-09-08 16:02:29.000000000 -0500
++++ ./cmake/build_configurations/mysql_release.cmake 2019-09-11 14:56:53.845129062 -0500
+@@ -124,7 +124,7 @@
+
+ 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)