mariadb: move mariadb_mtr to share/pam
This commit is contained in:
parent
2f0396776e
commit
a1ec028812
@ -1,12 +0,0 @@
|
||||
diff --git a/plugin/auth_pam/CMakeLists.txt b/plugin/auth_pam/CMakeLists.txt
|
||||
index a556b870..918a26f9 100644
|
||||
--- a/plugin/auth_pam/CMakeLists.txt
|
||||
+++ b/plugin/auth_pam/CMakeLists.txt
|
||||
@@ -22,7 +22,6 @@ IF(HAVE_PAM_APPL_H)
|
||||
COMPONENT Server)
|
||||
ENDIF()
|
||||
IF(TARGET auth_pam OR TARGET auth_pam_v1)
|
||||
- ADD_SUBDIRECTORY(testing)
|
||||
ADD_LIBRARY(pam_user_map MODULE mapper/pam_user_map.c)
|
||||
TARGET_LINK_LIBRARIES(pam_user_map pam)
|
||||
SET_TARGET_PROPERTIES (pam_user_map PROPERTIES PREFIX "")
|
@ -162,10 +162,7 @@ server = stdenv.mkDerivation (common // {
|
||||
++ optional stdenv.hostPlatform.isLinux linux-pam
|
||||
++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv;
|
||||
|
||||
patches = common.patches ++ [
|
||||
# Disable build unused plugin pam_mariadb_mtr.so. See https://jira.mariadb.org/browse/MDEV-21654
|
||||
./cmake-disable-auth-pam-testing.patch
|
||||
] ++ optionals stdenv.hostPlatform.isDarwin [
|
||||
patches = common.patches ++ optionals stdenv.hostPlatform.isDarwin [
|
||||
./cmake-without-plugin-auth-pam.patch
|
||||
];
|
||||
|
||||
@ -204,6 +201,9 @@ server = stdenv.mkDerivation (common // {
|
||||
chmod +x "$out"/bin/wsrep_sst_common
|
||||
rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest}
|
||||
rm -r "$out"/data # Don't need testing data
|
||||
mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security
|
||||
mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security
|
||||
rm -r "$out"/OFF
|
||||
'' + optionalString withStorageMroonga ''
|
||||
mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
|
||||
'' + optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
|
Loading…
Reference in New Issue
Block a user