CVS commit: pkgsrc/databases

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 19 09:09:49 UTC 2024

Modified Files:
        pkgsrc/databases/mariadb1011-client: distinfo
        pkgsrc/databases/mariadb1011-server: Makefile
Added Files:
        pkgsrc/databases/mariadb1011-client/patches:
            patch-extra_mariabackup_xtrabackup.cc

Log Message:
mariadb1011-server: fix mariadb-backup core dump on startup

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/mariadb1011-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mariadb1011-client/patches/patch-extra_mariabackup_xtrabackup.cc
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/mariadb1011-server/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mariadb1011-client/distinfo
diff -u pkgsrc/databases/mariadb1011-client/distinfo:1.10 pkgsrc/databases/mariadb1011-client/distinfo:1.11
--- pkgsrc/databases/mariadb1011-client/distinfo:1.10   Sat Aug 17 00:19:21 2024
+++ pkgsrc/databases/mariadb1011-client/distinfo        Mon Aug 19 09:09:48 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2024/08/17 00:19:21 nia Exp $
+$NetBSD: distinfo,v 1.11 2024/08/19 09:09:48 wiz Exp $
 
 BLAKE2s (mariadb-10.11.9.tar.gz) = 5505429a897f1b821a18ad1e303f9f81ee766a2c31da36c7ce012fe4041094d1
 SHA512 (mariadb-10.11.9.tar.gz) = a51680babed106ad52a8a9d57fb1db82fca02fd3eff7ef3f2cc3dd89bd9608e9f78ca5a11335a6be8d22950ca8caf1e859bd19550ab3fe129b73b856674cfdc0
@@ -8,6 +8,7 @@ SHA1 (patch-CMakeLists.txt) = b41fc869c3
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-client_mysql.cc) = e9c33cd51c11b6be309ee6d1404da2d9ece38efd
 SHA1 (patch-cmake_libfmt.cmake) = 2337c62c19d625b44e5082d0f1cae6afde708601
+SHA1 (patch-extra_mariabackup_xtrabackup.cc) = aaabf5998b29d4c15110d6e968c1c968a69d23a8
 SHA1 (patch-extra_readline_CMakeLists.txt) = 37873deaeccb37e1313179103bb12dcde4a496d6
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
 SHA1 (patch-libmariadb_cmake_FindGSSAPI.cmake) = 94b268478e680b82b1c108a12c0f37f3dc68ffce

Index: pkgsrc/databases/mariadb1011-server/Makefile
diff -u pkgsrc/databases/mariadb1011-server/Makefile:1.13 pkgsrc/databases/mariadb1011-server/Makefile:1.14
--- pkgsrc/databases/mariadb1011-server/Makefile:1.13   Sat Aug 17 00:19:22 2024
+++ pkgsrc/databases/mariadb1011-server/Makefile        Mon Aug 19 09:09:48 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2024/08/17 00:19:22 nia Exp $
+# $NetBSD: Makefile,v 1.14 2024/08/19 09:09:48 wiz Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
+PKGREVISION=   1
 COMMENT=       MariaDB 10.11, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

Added files:

Index: pkgsrc/databases/mariadb1011-client/patches/patch-extra_mariabackup_xtrabackup.cc
diff -u /dev/null pkgsrc/databases/mariadb1011-client/patches/patch-extra_mariabackup_xtrabackup.cc:1.1
--- /dev/null   Mon Aug 19 09:09:49 2024
+++ pkgsrc/databases/mariadb1011-client/patches/patch-extra_mariabackup_xtrabackup.cc   Mon Aug 19 09:09:48 2024
@@ -0,0 +1,31 @@
+$NetBSD: patch-extra_mariabackup_xtrabackup.cc,v 1.1 2024/08/19 09:09:48 wiz Exp $
+
+Fix mariadbbackup core dump.
+https://jira.mariadb.org/browse/MDEV-34340
+
+--- extra/mariabackup/xtrabackup.cc.orig       2024-08-03 07:29:56.000000000 +0000
++++ extra/mariabackup/xtrabackup.cc
+@@ -69,6 +69,11 @@ Street, Fifth Floor, Boston, MA 02110-13
+ # include <sys/sysctl.h>
+ #endif
+ 
++#ifdef __NetBSD__
++# include <sys/param.h>
++# include <sys/sysctl.h>
++#endif
++
+ #include "aria_backup_client.h"
+ 
+ #include <btr0sea.h>
+@@ -7690,6 +7695,11 @@ static int get_exepath(char *buf, size_t
+   if (sysctl(mib, 4, buf, &size, NULL, 0) == 0) {
+     return 0;
+   }
++#elif defined(__NetBSD__)
++  int mib[4] = {CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PATHNAME };
++  if (sysctl(mib, 4, buf, &size, NULL, 0) == 0) {
++    return 0;
++  }
+ #endif
+ 
+   return my_realpath(buf, argv0, 0);