databases/mariadb103-server: Update to 10.3.24

6 files changed, 42 insertions, 96 deletions

diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile
index 84b048704683..85786dbd1c0a 100644
--- a/databases/mariadb103-server/Makefile
+++ b/databases/mariadb103-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.3.23
+PORTVERSION=	10.3.24
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
@@ -79,7 +79,7 @@ CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_SHAREDIR="share" \
 		-DINSTALL_SQLBENCHDIR= \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \
+		-DINSTALL_SYSCONFDIR="${PREFIX}/etc" \
 		-DWITH_SSL="${OPENSSLBASE}" \
 		-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
 		-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
@@ -95,8 +95,7 @@ DISABLED_PLUGINS+=	DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \
 
 DATADIR=	${PREFIX}/share/mysql
 
-CONFLICTS_INSTALL=	mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
+CONFLICTS_INSTALL=	mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mysqlwsrep* \
 			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
@@ -146,6 +145,7 @@ MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack
 OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 			libJudy.so:devel/judy
 ROCKSDB_USES=		python
+ROCKSDB_CMAKE_ON=	-DPYTHON_SHEBANG=${PYTHON_CMD}
 SNAPPY_CMAKE_ON=	-DWITH_INNODB_SNAPPY=ON  -DWITH_ROCKSDB_snappy=ON
 SNAPPY_CMAKE_OFF=	-DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
 SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
@@ -154,6 +154,9 @@ TOKUDB_PORTDOCS=	README.md
 TOKUDB_VARS=		LICENSE+=PerconaFT LICENSE_COMB=multi
 WSREP_CMAKE_BOOL=	WITH_WSREP
 WSREP_LIB_DEPENDS=	libgalera.so:databases/galera
+WSREP_RUN_DEPENDS=	bash:shells/bash \
+			rsync:net/rsync \
+	#		stunnel:security/stunnel
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
 ZSTD_CMAKE_ON=		-DWITH_ROCKSDB_zstd=ON
 ZSTD_CMAKE_OFF=		-DWITH_ROCKSDB_zstd=OFF
@@ -188,45 +191,36 @@ CMAKE_OFF+=	WITH_TOKUDB
 .endif
 
 post-patch:
-	${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
-	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \
+	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
+	${REINPLACE_CMD} 's|/etc/my.cnf.d|${LOCALBASE}/etc/mysql/conf.d|' \
+		${WRKSRC}/support-files/rpm/my.cnf
 	${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt
 .if ${OPSYS} == DragonFly
 	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
 		${WRKSRC}/cmake/os/DragonFly.cmake
 .endif
 
-post-configure:
-	${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
-		-e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
-		${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
-
-# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 	 
-post-configure-INNOBASE-on: 	 
-	${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \
-		-e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \
-		-e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \
-		-e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \
-		${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt
-
 .if ${PKGNAMESUFFIX:M*-client}
 post-install:
-	${RM} -r ${STAGEDIR}${DATADIR}
-	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server
 	${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
+	${RM} -r ${STAGEDIR}${DATADIR} \
+		${STAGEDIR}${PREFIX}/include/mysql/server \
+		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
+	${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/mysql/conf.d
 
 post-install-GSSAPI_NONE-off:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
 
 .else # ! ${PKGNAMESUFFIX:M*-client}
 post-install:
-	${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy
-	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
+	${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
+		${STAGEDIR}${PREFIX}/include/mysql/server/private \
+		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
+	${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \
+		${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
 .endif # ${PKGNAMESUFFIX:M*-client}
 
 .include <bsd.port.post.mk>
diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo
index b398bd4a2488..f5c806ed9c5f 100644
--- a/databases/mariadb103-server/distinfo
+++ b/databases/mariadb103-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1589620713
-SHA256 (mariadb-10.3.23.tar.gz) = fc405022457d8eec5991b870cc1c9a07b83b551d6165c414c4d8f31523aa86ae
-SIZE (mariadb-10.3.23.tar.gz) = 72582611
+TIMESTAMP = 1597410090
+SHA256 (mariadb-10.3.24.tar.gz) = 713cfbe78475bf152d711280096756bd12cce3ba01a1130027da4901598a9a4e
+SIZE (mariadb-10.3.24.tar.gz) = 72714002
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})
diff --git a/databases/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist
index 011010822b1c..84812a14303d 100644
--- a/databases/mariadb103-server/pkg-plist
+++ b/databases/mariadb103-server/pkg-plist
@@ -50,6 +50,10 @@ bin/resolveip
 %%WSREP%%bin/wsrep_sst_rsync
 %%WSREP%%bin/wsrep_sst_rsync_wan
 @comment data/test/db.opt
+@comment etc/init.d/mysql
+etc/logrotate.d/mysql
+@comment etc/my.cnf
+@sample etc/mysql/user_map.conf.sample
 @comment include/mysql/mariadb_rpl.h
 @comment include/mysql/my_config.h
 @comment include/mysql/my_global.h
@@ -183,6 +187,7 @@ lib/mysql/plugin/ha_test_sql_discovery.so
 lib/mysql/plugin/handlersocket.so
 lib/mysql/plugin/locales.so
 lib/mysql/plugin/metadata_lock_info.so
+lib/mysql/plugin/pam_user_map.so
 lib/mysql/plugin/qa_auth_client.so
 lib/mysql/plugin/qa_auth_interface.so
 lib/mysql/plugin/qa_auth_server.so
@@ -194,6 +199,7 @@ lib/mysql/plugin/sql_errlog.so
 lib/mysql/plugin/test_versioning.so
 %%WSREP%%lib/mysql/plugin/wsrep_info.so
 libexec/mysqld
+@comment libexec/rcmysql
 man/man1/aria_chk.1.gz
 man/man1/aria_dump_log.1.gz
 man/man1/aria_ftdump.1.gz
@@ -244,6 +250,7 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/maria_add_gis_sp.sql
 %%DATADIR%%/maria_add_gis_sp_bootstrap.sql
 %%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
+@comment %%DATADIR%%/mroonga/COPYING
 %%MROONGA%%%%DATADIR%%/mroonga/install.sql
 %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
 %%DATADIR%%/mysql-log-rotate
@@ -308,17 +315,12 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/ukrainian/errmsg.sys
 %%WSREP%%%%DATADIR%%/wsrep.cnf
 %%WSREP%%%%DATADIR%%/wsrep_notify
-share/pam_user_map.so
-share/user_map.conf
 @comment %%DOCSDIR%%/COPYING
 @comment %%DOCSDIR%%/COPYING.thirdparty
 @comment share/groonga-normalizer-mysql/lgpl-2.0.txt
 @comment share/groonga/COPYING
-@comment storage/groonga/COPYING
-@comment share/mysql/mroonga/COPYING
 %%MROONGA%%share/groonga-normalizer-mysql/README.md
 %%MROONGA%%share/groonga/README.md
-@comment share/pkgconfig/mariadb.pc
 @comment bin/mariadb_config
 @comment bin/mysql
 @comment bin/mysqladmin