summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-08-30 15:35:35 +0200
committerSergei Golubchik <serg@mariadb.org>2021-08-31 09:21:08 +0200
commit865e5b6405d163c5591b400689717af80e99427f (patch)
tree182c50bdb177911c4d1d189225d7ef0066c99b4f /plugin
parent04647611260a77041186ace12f96b05d50bed4da (diff)
downloadmariadb-git-865e5b6405d163c5591b400689717af80e99427f.tar.gz
MDEV-26487 cpack rpm failed to build packages with cmake < 3.7.0
buggy regexp in old CPackRPM.cmake: string(REGEX REPLACE "%[A-Za-z0-9\(\),-]* " "" F_PATH ${F}) string(REGEX MATCH "%[A-Za-z0-9\(\),-]*" F_PREFIX ${F}) it treats everything after the first space as a path
Diffstat (limited to 'plugin')
-rw-r--r--plugin/auth_pam/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin/auth_pam/CMakeLists.txt b/plugin/auth_pam/CMakeLists.txt
index 5b2ca3c708a..44e0142afe9 100644
--- a/plugin/auth_pam/CMakeLists.txt
+++ b/plugin/auth_pam/CMakeLists.txt
@@ -39,8 +39,8 @@ IF(HAVE_PAM_APPL_H AND HAVE_GETGROUPLIST)
MYSQL_ADD_EXECUTABLE(auth_pam_tool auth_pam_tool.c DESTINATION ${INSTALL_PLUGINDIR}/auth_pam_tool_dir COMPONENT Server)
TARGET_LINK_LIBRARIES(auth_pam_tool pam)
SET(CPACK_RPM_server_USER_FILELIST ${CPACK_RPM_server_USER_FILELIST}
- "%attr(700, -, -) ${INSTALL_PLUGINDIRABS}/auth_pam_tool_dir"
- "%attr(4755, -, -) ${INSTALL_PLUGINDIRABS}/auth_pam_tool_dir/auth_pam_tool")
+ "%attr(700,-,-) ${INSTALL_PLUGINDIRABS}/auth_pam_tool_dir"
+ "%attr(4755,-,-) ${INSTALL_PLUGINDIRABS}/auth_pam_tool_dir/auth_pam_tool")
SET(CPACK_RPM_server_USER_FILELIST ${CPACK_RPM_server_USER_FILELIST} PARENT_SCOPE)
ENDIF()
IF(TARGET auth_pam OR TARGET auth_pam_v1)