From 15fd740a8fb6ddbffd8a1042e25f6a7f43894e0b Mon Sep 17 00:00:00 2001 From: Bernard Spil Date: Fri, 7 Nov 2025 17:18:31 +0100 Subject: databases/mariadb118-server: Update to 11.8.4 --- databases/mariadb118-server/files/patch-FreeBSD15 | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'databases/mariadb118-server/files/patch-FreeBSD15') 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 -- cgit v1.2.3