databases/mariadb103-server: Update to 10.3.24

3 files changed, 13 insertions, 63 deletions

diff --git a/databases/mariadb103-server/files/patch-MDEV-15961 b/databases/mariadb103-server/files/patch-MDEV-15961
deleted file mode 100644
index 65fb24a2f46d..000000000000
--- a/databases/mariadb103-server/files/patch-MDEV-15961
+++ /dev/null
@@ -1,50 +0,0 @@
-MDEV-15961: Fix stacktraces under FreeBSD
-
-https://jira.mariadb.org/browse/MDEV-15961
---- mysys/stacktrace.c.orig	2018-07-02 07:34:11 UTC
-+++ mysys/stacktrace.c
-@@ -34,19 +34,19 @@
- #include <execinfo.h>
- #endif
- 
-+#ifdef __linux__
- #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end)
--
- static char *heap_start;
--
--#if(defined HAVE_BSS_START) && !(defined __linux__)
- extern char *__bss_start;
--#endif
-+#else
-+#define PTR_SANE(p) (p)
-+#endif /* __linux */
- 
- void my_init_stacktrace()
- {
--#if(defined HAVE_BSS_START) && !(defined __linux__)
-+#ifdef __linux__
-   heap_start = (char*) &__bss_start;
--#endif
-+#endif /* __linux__ */
- }
- 
- #ifdef __linux__
-@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad
- 
- int my_safe_print_str(const char* val, size_t max_len)
- {
-+#ifdef __linux__
-+/* Only needed by the linux version of PTR_SANE */
-   char *heap_end;
- 
--#ifdef __linux__
-   // Try and make use of /proc filesystem to safely print memory contents.
-   if (!safe_print_str(val, max_len))
-     return 0;
--#endif
- 
-   heap_end= (char*) sbrk(0);
-+#endif
- 
-   if (!PTR_SANE(val))
-   {
diff --git a/databases/mariadb103-server/files/patch-cmake_install__layout.cmake b/databases/mariadb103-server/files/patch-cmake_install__layout.cmake
new file mode 100644
index 000000000000..2f6b38ffa45d
--- /dev/null
+++ b/databases/mariadb103-server/files/patch-cmake_install__layout.cmake
@@ -0,0 +1,13 @@
+--- cmake/install_layout.cmake.orig	2020-05-09 19:27:56 UTC
++++ cmake/install_layout.cmake
+@@ -128,8 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE  "support-files
+ SET(INSTALL_MYSQLDATADIR_STANDALONE     "data")
+ 
+ SET(INSTALL_UNIX_ADDRDIR_STANDALONE     "/tmp/mysql.sock")
+-SET(INSTALL_PAMDIR_STANDALONE           "share")
+-SET(INSTALL_PAMDATADIR_STANDALONE       "share")
++SET(INSTALL_PAMDIR_STANDALONE           "lib/mysql/plugin")
++SET(INSTALL_PAMDATADIR_STANDALONE       "etc/mysql")
+ #
+ # RPM layout
+ #
diff --git a/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake b/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake
deleted file mode 100644
index be036e0a597f..000000000000
--- a/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- storage/rocksdb/build_rocksdb.cmake.orig	2018-10-02 09:45:43 UTC
-+++ storage/rocksdb/build_rocksdb.cmake
-@@ -69,10 +69,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD
-   SET(CMAKE_REQUIRED_LIBRARIES zstd)
-   CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID)
-   UNSET(CMAKE_REQUIRED_LIBRARIES)
--  if (WITH_ROCKSDB_ZSTD STREQUAL "ON" AND NOT ZSTD_VALID)
--    MESSAGE(FATAL_ERROR
--      "WITH_ROCKSDB_ZSTD is ON and ZSTD library was found, but the version needs to be >= 1.1.3")
--  endif()
-   if (ZSTD_VALID)
-     add_definitions(-DZSTD)
-     include_directories(${ZSTD_INCLUDE_DIR})