diff options
Diffstat (limited to 'databases/mariadb118-server')
| -rw-r--r-- | databases/mariadb118-server/Makefile | 6 | ||||
| -rw-r--r-- | databases/mariadb118-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mariadb118-server/files/patch-FreeBSD15 | 14 | ||||
| -rw-r--r-- | databases/mariadb118-server/files/patch-tpool_CMakeLists.txt | 14 | ||||
| -rw-r--r-- | databases/mariadb118-server/pkg-plist | 1 |
5 files changed, 18 insertions, 23 deletions
diff --git a/databases/mariadb118-server/Makefile b/databases/mariadb118-server/Makefile index f437ed4270d6..c85dd252976c 100644 --- a/databases/mariadb118-server/Makefile +++ b/databases/mariadb118-server/Makefile @@ -1,6 +1,6 @@ PORTNAME?= mariadb -PORTVERSION= 11.8.3 -PORTREVISION?= 1 +PORTVERSION= 11.8.5 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= \ https://ftp.nluug.nl/db/${SITESDIR}/ \ @@ -193,7 +193,7 @@ LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack-c -OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ +OQGRAPH_LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_BROKEN= RocksDB engine build failyure "jemalloc_helper.h:65:61: error: use of undeclared identifier 'nothrow'" ROCKSDB_USES= python diff --git a/databases/mariadb118-server/distinfo b/databases/mariadb118-server/distinfo index 4eb53439229e..14b98d2da219 100644 --- a/databases/mariadb118-server/distinfo +++ b/databases/mariadb118-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754733163 -SHA256 (mariadb-11.8.3.tar.gz) = 1014a85c768de8f9e9c6d4bf0b42617f3b1588be1ad371f71674ea32b87119c0 -SIZE (mariadb-11.8.3.tar.gz) = 119640174 +TIMESTAMP = 1763196908 +SHA256 (mariadb-11.8.5.tar.gz) = bcb7394569c08877c283e1649869504531bee8caafa30288f078e30d99fcb9f6 +SIZE (mariadb-11.8.5.tar.gz) = 119948843 diff --git a/databases/mariadb118-server/files/patch-FreeBSD15 b/databases/mariadb118-server/files/patch-FreeBSD15 index 7fb744032638..6b1462bb0c14 100644 --- a/databases/mariadb118-server/files/patch-FreeBSD15 +++ b/databases/mariadb118-server/files/patch-FreeBSD15 @@ -22,20 +22,14 @@ FreeBSD 14.x and 15.x when LD_LIBRARY_PATH is not set (when using FreeBSD packages or installing from FreeBSD ports). Setting LD_LIBRARY_PATH manually like the script does, breaks mariadb-backup with the "Undefined symbol" error on FreeBSD 15.0 but not on 14.x. ---- - scripts/wsrep_sst_common.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh -index 38aa18d5f6967..edde8328effe9 100644 ---- scripts/wsrep_sst_common.sh.orig +--- scripts/wsrep_sst_common.sh.orig 2025-11-07 08:07:31 UTC +++ scripts/wsrep_sst_common.sh -@@ -25,7 +25,7 @@ OS="$(uname)" +@@ -25,7 +25,7 @@ export PATH="${PATH:+$PATH:}/usr/local/bin:/usr/local/ # Setting the paths for some utilities on CentOS - export PATH="${PATH:+$PATH:}/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin" + export PATH="${PATH:+$PATH:}/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin" -if [ "$OS" != 'Darwin' ]; then +if [ "$OS" != 'Darwin' ] && [ "$OS" != 'FreeBSD' ]; then - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/local/lib:/usr/lib:/lib:/opt/lib" + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/local/lib:/lib:/usr/lib:/opt/lib" fi diff --git a/databases/mariadb118-server/files/patch-tpool_CMakeLists.txt b/databases/mariadb118-server/files/patch-tpool_CMakeLists.txt index ac7ffa59c4c2..a383d718c8e0 100644 --- a/databases/mariadb118-server/files/patch-tpool_CMakeLists.txt +++ b/databases/mariadb118-server/files/patch-tpool_CMakeLists.txt @@ -1,11 +1,11 @@ ---- tpool/CMakeLists.txt.orig 2025-07-28 19:35:07 UTC +--- tpool/CMakeLists.txt.orig 2025-11-04 17:38:14 UTC +++ tpool/CMakeLists.txt -@@ -11,7 +11,7 @@ TARGET_INCLUDE_DIRECTORIES(tpool PUBLIC "${CMAKE_CURRE +@@ -8,7 +8,7 @@ SET(COMMON_SOURCES + wait_notification.cc + ) - TARGET_INCLUDE_DIRECTORIES(tpool PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" - PRIVATE ${PROJECT_SOURCE_DIR}/include) - +ADD_DEFINITIONS(-fPIC) - IF(WIN32) - TARGET_SOURCES(tpool PRIVATE tpool_win.cc aio_win.cc) - ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") + IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") + ADD_LIBRARY(tpool OBJECT ${COMMON_SOURCES} aio_simulated.cc) + IF(WIN32) diff --git a/databases/mariadb118-server/pkg-plist b/databases/mariadb118-server/pkg-plist index 47c3e6dc7c8d..290abfbc0690 100644 --- a/databases/mariadb118-server/pkg-plist +++ b/databases/mariadb118-server/pkg-plist @@ -179,6 +179,7 @@ lib/mysql/plugin/auth_0x0100.so lib/mysql/plugin/auth_ed25519.so @comment lib/mysql/plugin/auth_gssapi_client.so %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so +lib/mysql/plugin/auth_mysql_sha2.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool lib/mysql/plugin/auth_pam_v1.so |