CVS commit: pkgsrc/databases

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Sep 22 20:30:09 UTC 2022

Modified Files:
        pkgsrc/databases/mariadb106-client: Makefile Makefile.common PLIST
            distinfo
        pkgsrc/databases/mariadb106-server: Makefile PLIST
Removed Files:
        pkgsrc/databases/mariadb106-client/patches:
            patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh
            patch-storage_connect_ioapi.c

Log Message:
mariadb106: Update to 10.6.10

Notable Items

     * Fix Assertion mysql_mutex_assert_owner(&log_sys.flush_order_mutex)
       failed in mtr_t::commit() (MDEV-29383)
     * Fix Frequent "Data structure corruption" in InnoDB after OOM
       (MDEV-29374)
     * Fix Recovery or backup of instant ALTER TABLE is incorrect
       (MDEV-29438)
     * Fix InnoDB Temporary Tablespace (ibtmp1) is continuously growing
       (MDEV-28240)
     * Fix full text index corruption if shutdown before changes are fully
       flushed (MDEV-29342)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mariadb106-client/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/mariadb106-client/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mariadb106-client/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/mariadb106-client/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/mariadb106-client/patches/patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh \
    pkgsrc/databases/mariadb106-client/patches/patch-storage_connect_ioapi.c
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/mariadb106-server/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mariadb106-server/PLIST

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

Modified files:

Index: pkgsrc/databases/mariadb106-client/Makefile
diff -u pkgsrc/databases/mariadb106-client/Makefile:1.7 pkgsrc/databases/mariadb106-client/Makefile:1.8
--- pkgsrc/databases/mariadb106-client/Makefile:1.7     Tue Jun 28 11:31:18 2022
+++ pkgsrc/databases/mariadb106-client/Makefile Thu Sep 22 20:30:09 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2022/06/28 11:31:18 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/09/22 20:30:09 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   1
 COMMENT=       MariaDB 10.6, a free MySQL compatible database (client)
 
 CONFLICTS=     mysql-client-[0-9]*

Index: pkgsrc/databases/mariadb106-client/Makefile.common
diff -u pkgsrc/databases/mariadb106-client/Makefile.common:1.8 pkgsrc/databases/mariadb106-client/Makefile.common:1.9
--- pkgsrc/databases/mariadb106-client/Makefile.common:1.8      Sat May 21 09:36:02 2022
+++ pkgsrc/databases/mariadb106-client/Makefile.common  Thu Sep 22 20:30:09 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.8 2022/05/21 09:36:02 nia Exp $
+# $NetBSD: Makefile.common,v 1.9 2022/09/22 20:30:09 nia Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
 
-DISTNAME=      mariadb-10.6.8
+DISTNAME=      mariadb-10.6.10
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 
@@ -89,6 +89,7 @@ CMAKE_ARGS+=          -DDTRACE_FLAGS="-${ABI}"
 .endif
 
 CFLAGS.SunOS+=         -fPIC
+CFLAGS.NetBSD+=                -DIOAPI_NO_64
 
 REPLACE_PERL+=         scripts/mytop.sh
 REPLACE_PERL+=         sql-bench/*.sh
@@ -107,6 +108,7 @@ CHECK_PORTABILITY_SKIP+=    BUILD/compile-p
 PKGCONFIG_OVERRIDE+=   support-files/mariadb.pc.in
 PKGCONFIG_OVERRIDE+=   libmariadb/mariadb_config/libmariadb.pc.in
 
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"

Index: pkgsrc/databases/mariadb106-client/PLIST
diff -u pkgsrc/databases/mariadb106-client/PLIST:1.3 pkgsrc/databases/mariadb106-client/PLIST:1.4
--- pkgsrc/databases/mariadb106-client/PLIST:1.3        Sat Feb 19 09:13:21 2022
+++ pkgsrc/databases/mariadb106-client/PLIST    Thu Sep 22 20:30:09 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2022/02/19 09:13:21 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/09/22 20:30:09 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -153,6 +153,7 @@ include/mysql/server/mysql_version.h
 include/mysql/server/mysqld_ername.h
 include/mysql/server/mysqld_error.h
 include/mysql/server/pack.h
+include/mysql/server/private/aligned.h
 include/mysql/server/private/aria_backup.h
 include/mysql/server/private/assume_aligned.h
 include/mysql/server/private/atomic/gcc_builtins.h
@@ -247,6 +248,7 @@ lib/mysql/plugin/client_ed25519.so
 lib/mysql/plugin/dialog.so
 lib/mysql/plugin/mysql_clear_password.so
 lib/mysql/plugin/sha256_password.so
+lib/mysql/plugin/zstd.so
 lib/pkgconfig/libmariadb.pc
 man/man1/mariadb-access.1
 man/man1/mariadb-admin.1

Index: pkgsrc/databases/mariadb106-client/distinfo
diff -u pkgsrc/databases/mariadb106-client/distinfo:1.9 pkgsrc/databases/mariadb106-client/distinfo:1.10
--- pkgsrc/databases/mariadb106-client/distinfo:1.9     Sat May 21 09:36:02 2022
+++ pkgsrc/databases/mariadb106-client/distinfo Thu Sep 22 20:30:09 2022
@@ -1,20 +1,18 @@
-$NetBSD: distinfo,v 1.9 2022/05/21 09:36:02 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/09/22 20:30:09 nia Exp $
 
-BLAKE2s (mariadb-10.6.8.tar.gz) = cef1165c096ddb486ac4eba76720639d66cea9c844ab5702f5a8b1a213898380
-SHA512 (mariadb-10.6.8.tar.gz) = b4327000eb3e5fc75bbd78de9890b0464217a432c8aac744948af94e092ffeef1f101885b81ec49029900a92b0018838e46efcf225056a9b06f35a04ecf26aab
-Size (mariadb-10.6.8.tar.gz) = 88794744 bytes
+BLAKE2s (mariadb-10.6.10.tar.gz) = fd204e79a191619f2d5cffad39c8bc1e8a2cde422c8088075d1bff1f7de0953f
+SHA512 (mariadb-10.6.10.tar.gz) = 912219878e2201280f5927ee8a34dafe83ac2c3ce8c6fa3d90731d10fd693c369872aff840edc8329b82c53e9908fbdb1ba731ba140e2b99048edb5eb21f22c4
+Size (mariadb-10.6.10.tar.gz) = 96453293 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 042d9d361a5c3ff7e7df15f5de4a30eb7984cddd
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-client_mysql.cc) = f49f942b765ccf427e9bcc9e4e0045ec74c94815
-SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
 SHA1 (patch-plugin_auth__pam_testing_pam__mariadb__mtr.c) = 6062cfbb200af5b95ac05e4759f08b414f63db3d
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51
 SHA1 (patch-scripts_CMakeLists.txt) = b8a13304e314162ab0a1fc06c5620d6b757975f5
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
 SHA1 (patch-sql_mysqld.cc) = 19d325124cde1b45376c9710cdd104dc460f4bea
-SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3
 SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836
 SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = d5ff507acdd21858791246ef5a2559e653cb7833
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083

Index: pkgsrc/databases/mariadb106-server/Makefile
diff -u pkgsrc/databases/mariadb106-server/Makefile:1.16 pkgsrc/databases/mariadb106-server/Makefile:1.17
--- pkgsrc/databases/mariadb106-server/Makefile:1.16    Tue Jun 28 11:31:18 2022
+++ pkgsrc/databases/mariadb106-server/Makefile Thu Sep 22 20:30:09 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2022/06/28 11:31:18 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2022/09/22 20:30:09 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   1
 COMMENT=       MariaDB 10.6, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

Index: pkgsrc/databases/mariadb106-server/PLIST
diff -u pkgsrc/databases/mariadb106-server/PLIST:1.7 pkgsrc/databases/mariadb106-server/PLIST:1.8
--- pkgsrc/databases/mariadb106-server/PLIST:1.7        Sat May 21 09:36:02 2022
+++ pkgsrc/databases/mariadb106-server/PLIST    Thu Sep 22 20:30:09 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2022/05/21 09:36:02 nia Exp $
+@comment $NetBSD: PLIST,v 1.8 2022/09/22 20:30:09 nia Exp $
 bin/aria_chk
 bin/aria_dump_log
 bin/aria_ftdump
@@ -244,6 +244,8 @@ include/mysql/server/private/sql_trigger
 include/mysql/server/private/sql_truncate.h
 include/mysql/server/private/sql_tvc.h
 include/mysql/server/private/sql_type.h
+include/mysql/server/private/sql_type_fixedbin.h
+include/mysql/server/private/sql_type_fixedbin_storage.h
 include/mysql/server/private/sql_type_geom.h
 include/mysql/server/private/sql_type_int.h
 include/mysql/server/private/sql_type_json.h
@@ -281,6 +283,7 @@ include/mysql/server/private/wsrep_high_
 include/mysql/server/private/wsrep_mutex.h
 include/mysql/server/private/wsrep_mysqld.h
 include/mysql/server/private/wsrep_mysqld_c.h
+include/mysql/server/private/wsrep_on.h
 include/mysql/server/private/wsrep_priv.h
 include/mysql/server/private/wsrep_schema.h
 include/mysql/server/private/wsrep_server_service.h
@@ -311,6 +314,7 @@ lib/mysql/plugin/auth_test_plugin.so
 lib/mysql/plugin/daemon_example.ini
 lib/mysql/plugin/debug_key_management.so
 lib/mysql/plugin/dialog_examples.so
+lib/mysql/plugin/disks.so
 lib/mysql/plugin/example_key_management.so
 lib/mysql/plugin/file_key_management.so
 lib/mysql/plugin/func_test.so