Sun Jun 5 10:11:04 2022 UTC ()
Pullup ticket #6640 - requested by nia
databases/mariadb106-client: security update
databases/mariadb106-server: security update

Revisions pulled up:
- databases/mariadb106-client/Makefile.common                   1.8
- databases/mariadb106-client/distinfo                          1.9
- databases/mariadb106-client/patches/patch-CMakeLists.txt      1.3
- databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h 1.3
- databases/mariadb106-server/Makefile                          1.15
- databases/mariadb106-server/PLIST                             1.7

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sat May 21 09:36:03 UTC 2022

   Modified Files:
   	pkgsrc/databases/mariadb106-client: Makefile.common distinfo
   	pkgsrc/databases/mariadb106-client/patches: patch-CMakeLists.txt
   	    patch-storage_innobase_include_transactional__lock__guard.h
   	pkgsrc/databases/mariadb106-server: Makefile PLIST

   Log Message:
   mariadb106: update to 10.6.8

                             MariaDB 10.6.8 Release Notes

   Notable Items

     InnoDB

        * innodb_disallow_writes removed (MDEV-25975)
        * InnoDB gap locking fixes (MDEV-20605, MDEV-28422)
        * InnoDB performance improvements (MDEV-27557, MDEV-28185, MDEV-27767,
          MDEV-28313, MDEV-28137, MDEV-28465, MDEV-26789)
        * Backup regression fixes (MDEV-27919)
        * InnoDB portability: FreeBSD futexes (MDEV-26476), POWER and s390x
          transactional memory (MDEV-27956)
        * ALTER TABLE: Fixed bogus duplicate key errors (MDEV-15250)
        * DDL and crash recovery fixes (MDEV-27274, MDEV-27234, MDEV-27817)
        * Requests to recalculate persistent statistics were sometimes lost
          (MDEV-27805)

     Replication

        * Semisync-slave server recovery is refined to correctly rollback
          prepared transaction (MDEV-28461)
        * Circular semisync setup endless event circulation is handled
          (MDEV-27760)
        * Semisync-slave server recovery is extended to work on new server_id
          server (MDEV-27342)
        * Server initialization time gtid_slave_pos purge related reason of
          crashing in binlog background thread is removed (MDEV-26473)
        * Shutdown of the semisync master can't produce inconsistent state
          anymore (MDEV-11853)
        * Binlogs disappear after rsync IST (MDEV-28583)
        * autocommit=0 slave hang is eliminated (DBAAS-7828)
        * master crash is eliminated in compressed semisync replication protocol
          with packet counting amendment (MDEV-25580)
        * OPTIMIZE on a sequence does not cause counterfactual
          ER_BINLOG_UNSAFE_STATEMENT anymore (MDEV-24617)
        * Automatically generated Gtid_log_list_event is made to recognize
          within replication event group as a formal member (MDEV-28550)
        * Replication unsafe INSERT .. ON DUPLICATE KEY UPDATE using two or more
          unique key values at a time with MIXED format binlogging is corrected
          (MDEV-28310)
        * Replication unsafe INSERT .. ON DUPLICATE KEY UPDATE stops issuing
          unnessary "Unsafe statement" with MIXED binlog format (MDEV-21810)
        * Incomplete replication event groups are detected to error out by the
          slave IO thread (MDEV-27697)
        * mysqlbinlog --stop-never --raw now flushes the result file to disk
          after each processed event so the file can be listed with the actual
          bytes (MDEV-14608)

     Backup

        * Incorrect binlogs after Galera SST using rsync and mariabackup
          (MDEV-27524)
        * mariabackup does not detect multi-source replication slave
          (MDEV-21037)
        * Useless warning "InnoDB: Allocated tablespace ID <id> for <tablename>,
          old maximum was 0" during backup stage (MDEV-27343)
        * mariabackup prepare fails for incrementals if a new schema is created
          after full backup is taken (MDEV-28446)

     Optimizer

        * Query performance degradation in newer MariaDB versions when using
          many tables (MDEV-28073)
        * A SEGV in Item_field::used_tables/update_depend_map_for_order...
          (MDEV-26402)
        * ANALYZE FORMAT=JSON fields are incorrect for UNION ALL queries
          (MDEV-27699)
        * Subquery in an UPDATE query uses full scan instead of range
          (MDEV-22377)
        * Assertion `item1->type() = Item::FIELD_ITEM ... (MDEV-19398)
        * Server crashes in Expression_cache_tracker::fetch_current_stats
          (MDEV-28268)
        * MariaDB server crash at Item_subselect::init_expr_cache_tracker
          (MDEV-26164, MDEV-26047)
        * Crash with union of my_decimal type in ORDER BY clause (MDEV-25994)
        * SIGSEGV in st_join_table::cleanup (MDEV-24560)
        * Assertion `!eliminated' failed in Item_subselect::exec (MDEV-28437)

     General

        * Server error messages are now available in Chinese (MDEV-28227)
        * For RHEL/CentOS 7, non x86_64 architectures are no longer supported
          upstream and so our support will also be dropped with this release
        * Packages for Ubuntu 22.04 LTS "Jammy" and Fedora 36 are not yet
          available pending the resolution of MDEV-28133: Backport OpenSSL-3.0
          compatibility to 10.6 branch

     Security

        * Fixes for the following security vulnerabilities:
             * CVE-2022-27376
             * CVE-2022-27377
             * CVE-2022-27378
             * CVE-2022-27379
             * CVE-2022-27380
             * CVE-2022-27381
             * CVE-2022-27382
             * CVE-2022-27383
             * CVE-2022-27384
             * CVE-2022-27386
             * CVE-2022-27387
             * CVE-2022-27444
             * CVE-2022-27445
             * CVE-2022-27446
             * CVE-2022-27447
             * CVE-2022-27448
             * CVE-2022-27449
             * CVE-2022-27451
             * CVE-2022-27452
             * CVE-2022-27455
             * CVE-2022-27456
             * CVE-2022-27457
             * CVE-2022-27458

   To generate a diff of this commit:
   cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/mariadb106-client/Makefile.common
   cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/mariadb106-client/distinfo
   cvs rdiff -u -r1.2 -r1.3 \
       pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt \
       pkgsrc/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h
   cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/mariadb106-server/Makefile
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mariadb106-server/PLIST


(spz)
diff -r1.7 -r1.7.2.1 pkgsrc/databases/mariadb106-client/Makefile.common
diff -r1.6 -r1.6.2.1 pkgsrc/databases/mariadb106-client/distinfo
diff -r1.2 -r1.2.4.1 pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt
diff -r1.2 -r1.2.2.1 pkgsrc/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h
diff -r1.6 -r1.6.4.1 pkgsrc/databases/mariadb106-server/PLIST
cvs diff -r1.7 -r1.7.2.1 pkgsrc/databases/mariadb106-client/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/mariadb106-client/Makefile.common 2022/02/19 09:13:21 1.7
+++ pkgsrc/databases/mariadb106-client/Makefile.common 2022/06/05 10:11:03 1.7.2.1
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.7 2022/02/19 09:13:21 nia Exp $ 1# $NetBSD: Makefile.common,v 1.7.2.1 2022/06/05 10:11:03 spz Exp $
2# 2#
3# used by databases/mariadb106-client/Makefile 3# used by databases/mariadb106-client/Makefile
4# used by databases/mariadb106-server/Makefile 4# used by databases/mariadb106-server/Makefile
5 5
6DISTNAME= mariadb-10.6.7 6DISTNAME= mariadb-10.6.8
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/ 8MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/
9 9
10MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://mariadb.org/ 11HOMEPAGE= https://mariadb.org/
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DISTINFO_FILE?= ${.CURDIR}/../../databases/mariadb106-client/distinfo 14DISTINFO_FILE?= ${.CURDIR}/../../databases/mariadb106-client/distinfo
15PATCHDIR?= ${.CURDIR}/../../databases/mariadb106-client/patches 15PATCHDIR?= ${.CURDIR}/../../databases/mariadb106-client/patches
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS+= perl:run pkg-config bison 19USE_TOOLS+= perl:run pkg-config bison
cvs diff -r1.6 -r1.6.2.1 pkgsrc/databases/mariadb106-client/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mariadb106-client/distinfo 2022/02/19 09:13:21 1.6
+++ pkgsrc/databases/mariadb106-client/distinfo 2022/06/05 10:11:03 1.6.2.1
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.6 2022/02/19 09:13:21 nia Exp $ 1$NetBSD: distinfo,v 1.6.2.1 2022/06/05 10:11:03 spz Exp $
2 2
3BLAKE2s (mariadb-10.6.7.tar.gz) = 5d4b482e6e06b337ff8180a2fe8b94b8e9f1cc1cea6b7dfe89eaa05c56eab701 3BLAKE2s (mariadb-10.6.8.tar.gz) = cef1165c096ddb486ac4eba76720639d66cea9c844ab5702f5a8b1a213898380
4SHA512 (mariadb-10.6.7.tar.gz) = 2d26f56ea5f39b800a6f279c8411d4091b4f4d3acbf3ea1864068328d34a1437e7c46c08d3772009357fd89602e58f214266038e177c0a4fac914a5e5d01e3e6 4SHA512 (mariadb-10.6.8.tar.gz) = b4327000eb3e5fc75bbd78de9890b0464217a432c8aac744948af94e092ffeef1f101885b81ec49029900a92b0018838e46efcf225056a9b06f35a04ecf26aab
5Size (mariadb-10.6.7.tar.gz) = 85882896 bytes 5Size (mariadb-10.6.8.tar.gz) = 88794744 bytes
6SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f 6SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
7SHA1 (patch-CMakeLists.txt) = ea2f334ff1743e1676fe73e9946d0759c68e1d31 7SHA1 (patch-CMakeLists.txt) = 042d9d361a5c3ff7e7df15f5de4a30eb7984cddd
8SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88 8SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
9SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad 9SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
10SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403 10SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
11SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51 11SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51
12SHA1 (patch-scripts_CMakeLists.txt) = b8a13304e314162ab0a1fc06c5620d6b757975f5 12SHA1 (patch-scripts_CMakeLists.txt) = b8a13304e314162ab0a1fc06c5620d6b757975f5
13SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f 13SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
14SHA1 (patch-sql_mysqld.cc) = 19d325124cde1b45376c9710cdd104dc460f4bea 14SHA1 (patch-sql_mysqld.cc) = 19d325124cde1b45376c9710cdd104dc460f4bea
15SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3 15SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3
16SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836 16SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836
17SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = e47938072cdbd5c21d24622d8550b2c127fbb9df 17SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = d5ff507acdd21858791246ef5a2559e653cb7833
18SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083 18SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083
19SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301 19SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301
20SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = 67ea4d154f4f623fdca739f50b236c973e118a12 20SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = 67ea4d154f4f623fdca739f50b236c973e118a12
21SHA1 (patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh) = 3b632521c23765c39f4638dc7a80d04b9e1d58bd 21SHA1 (patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh) = 3b632521c23765c39f4638dc7a80d04b9e1d58bd
22SHA1 (patch-support-files_mysql.server.sh) = a98d82cdda1dbd5ef8ebb7e457bb51661b5fd275 22SHA1 (patch-support-files_mysql.server.sh) = a98d82cdda1dbd5ef8ebb7e457bb51661b5fd275
cvs diff -r1.2 -r1.2.4.1 pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt 2021/11/27 23:40:28 1.2
+++ pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt 2022/06/05 10:11:03 1.2.4.1
@@ -1,49 +1,49 @@ @@ -1,49 +1,49 @@
1$NetBSD: patch-CMakeLists.txt,v 1.2 2021/11/27 23:40:28 nia Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2.4.1 2022/06/05 10:11:03 spz Exp $
2 2
3Allow building a server-only configuration. 3Allow building a server-only configuration.
4 4
5--- CMakeLists.txt.orig 2021-11-05 20:03:29.000000000 +0000 5--- CMakeLists.txt.orig 2022-05-18 08:34:14.000000000 +0000
6+++ CMakeLists.txt 6+++ CMakeLists.txt
7@@ -418,8 +418,6 @@ ENDIF() 7@@ -421,8 +421,6 @@ ENDIF()
8  8
9 UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE) 9 UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE)
10  10
11-INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) 11-INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb)
12- 12-
 13 INCLUDE(cpack_tgz)
13 INCLUDE(cpack_rpm) 14 INCLUDE(cpack_rpm)
14 INCLUDE(cpack_deb) 15 INCLUDE(cpack_deb)
15  16@@ -433,19 +431,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
16@@ -429,19 +427,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG) 
17 # Add storage engines and plugins. 17 # Add storage engines and plugins.
18 CONFIGURE_PLUGINS() 18 CONFIGURE_PLUGINS()
19  19
20-ADD_SUBDIRECTORY(include) 20-ADD_SUBDIRECTORY(include)
21 ADD_SUBDIRECTORY(dbug) 21 ADD_SUBDIRECTORY(dbug)
22 ADD_SUBDIRECTORY(strings) 22 ADD_SUBDIRECTORY(strings)
23 ADD_SUBDIRECTORY(vio) 23 ADD_SUBDIRECTORY(vio)
24 ADD_SUBDIRECTORY(mysys) 24 ADD_SUBDIRECTORY(mysys)
25 ADD_SUBDIRECTORY(mysys_ssl) 25 ADD_SUBDIRECTORY(mysys_ssl)
26-ADD_SUBDIRECTORY(client) 26-ADD_SUBDIRECTORY(client)
27 ADD_SUBDIRECTORY(extra) 27 ADD_SUBDIRECTORY(extra)
28 ADD_SUBDIRECTORY(libservices) 28 ADD_SUBDIRECTORY(libservices)
29 ADD_SUBDIRECTORY(sql/share) 29 ADD_SUBDIRECTORY(sql/share)
30  30
31 IF(NOT WITHOUT_SERVER) 31 IF(NOT WITHOUT_SERVER)
32- ADD_SUBDIRECTORY(tests) 32- ADD_SUBDIRECTORY(tests)
33 ADD_SUBDIRECTORY(sql) 33 ADD_SUBDIRECTORY(sql)
34 OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF) 34 OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF)
35 IF(WITH_EMBEDDED_SERVER) 35 IF(WITH_EMBEDDED_SERVER)
36@@ -460,23 +455,26 @@ IF(NOT WITHOUT_SERVER) 36@@ -464,23 +459,26 @@ IF(NOT WITHOUT_SERVER)
37 ADD_SUBDIRECTORY(win/upgrade_wizard) 37 ADD_SUBDIRECTORY(win/upgrade_wizard)
38 ADD_SUBDIRECTORY(win/packaging) 38 ADD_SUBDIRECTORY(win/packaging)
39 ENDIF() 39 ENDIF()
40-ENDIF() 40-ENDIF()
41- 41-
42-IF(UNIX) 42-IF(UNIX)
43+ELSE() 43+ELSE()
44+ INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) 44+ INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb)
45+ ADD_SUBDIRECTORY(client) 45+ ADD_SUBDIRECTORY(client)
46+ ADD_SUBDIRECTORY(include) 46+ ADD_SUBDIRECTORY(include)
47 ADD_SUBDIRECTORY(man) 47 ADD_SUBDIRECTORY(man)
48+ ADD_SUBDIRECTORY(support-files) 48+ ADD_SUBDIRECTORY(support-files)
49 ENDIF() 49 ENDIF()
@@ -55,27 +55,27 @@ Allow building a server-only configurati @@ -55,27 +55,27 @@ Allow building a server-only configurati
55-ADD_SUBDIRECTORY(support-files) 55-ADD_SUBDIRECTORY(support-files)
56 ADD_SUBDIRECTORY(extra/aws_sdk) 56 ADD_SUBDIRECTORY(extra/aws_sdk)
57  57
58 IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) 58 IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
59- SET(EXPORTED comp_err comp_sql factorial) 59- SET(EXPORTED comp_err comp_sql factorial)
60+ SET(EXPORTED comp_err factorial) 60+ SET(EXPORTED comp_err factorial)
61 IF(NOT WITHOUT_SERVER) 61 IF(NOT WITHOUT_SERVER)
62 SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token) 62 SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
63+ ELSE() 63+ ELSE()
64+ SET(EXPORTED ${EXPORTED} comp_sql)  64+ SET(EXPORTED ${EXPORTED} comp_sql)
65 ENDIF() 65 ENDIF()
66 # minimal target to build only binaries for export 66 # minimal target to build only binaries for export
67 ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED}) 67 ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
68@@ -557,41 +555,3 @@ IF(NON_DISTRIBUTABLE_WARNING) 68@@ -561,41 +559,3 @@ IF(NON_DISTRIBUTABLE_WARNING)
69 MESSAGE(WARNING " 69 MESSAGE(WARNING "
70 You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries! You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software Foundation.") 70 You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries! You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software Foundation.")
71 ENDIF() 71 ENDIF()
72- 72-
73-IF(NOT WITHOUT_SERVER) 73-IF(NOT WITHOUT_SERVER)
74- # Define target for minimal mtr-testable build 74- # Define target for minimal mtr-testable build
75- ADD_CUSTOM_TARGET(minbuild) 75- ADD_CUSTOM_TARGET(minbuild)
76- ADD_DEPENDENCIES(minbuild 76- ADD_DEPENDENCIES(minbuild
77- aria_chk 77- aria_chk
78- aria_pack 78- aria_pack
79- mariadb 79- mariadb
80- mariadb-admin 80- mariadb-admin
81- mariadb-binlog 81- mariadb-binlog
cvs diff -r1.2 -r1.2.2.1 pkgsrc/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h (expand / switch to unified diff)

--- pkgsrc/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h 2022/02/19 09:13:21 1.2
+++ pkgsrc/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h 2022/06/05 10:11:03 1.2.2.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-storage_innobase_include_transactional__lock__guard.h,v 1.2 2022/02/19 09:13:21 nia Exp $ 1$NetBSD: patch-storage_innobase_include_transactional__lock__guard.h,v 1.2.2.1 2022/06/05 10:11:03 spz Exp $
2 2
3Strange build failures on NetBSD: 3Strange build failures on NetBSD:
4error: 'rw_lock' is not an accessible base of 'page_hash_latch' 4error: 'rw_lock' is not an accessible base of 'page_hash_latch'
5 5
6--- storage/innobase/include/transactional_lock_guard.h.orig 2022-02-10 20:17:09.000000000 +0000 6--- storage/innobase/include/transactional_lock_guard.h.orig 2022-05-18 08:34:16.000000000 +0000
7+++ storage/innobase/include/transactional_lock_guard.h 7+++ storage/innobase/include/transactional_lock_guard.h
8@@ -21,12 +21,6 @@ this program; if not, write to the Free  8@@ -21,12 +21,6 @@ this program; if not, write to the Free
9 #if defined __powerpc64__ && defined __clang__ && defined __linux__ 9 #if defined __powerpc64__
10 #elif defined __powerpc64__&&defined __GNUC__&&defined __linux__&&__GNUC__ > 4 10 #elif defined __s390__
11 #elif defined _MSC_VER && (defined _M_IX86 || defined _M_X64) && !defined(__clang__) 11 #elif defined _MSC_VER && (defined _M_IX86 || defined _M_X64) && !defined(__clang__)
12-#elif defined __GNUC__ && (defined __i386__ || defined __x86_64__) 12-#elif defined __GNUC__ && (defined __i386__ || defined __x86_64__)
13-# if __GNUC__ >= 8 13-# if __GNUC__ >= 8
14-# elif defined __clang_major__ && __clang_major__ > 6 14-# elif defined __clang_major__ && __clang_major__ > 6
15-# else 15-# else
16-# define NO_ELISION 16-# define NO_ELISION
17-# endif 17-# endif
18 #else /* Transactional memory has not been implemented for this ISA */ 18 #else /* Transactional memory has not been implemented for this ISA */
19 # define NO_ELISION 19 # define NO_ELISION
20 #endif 20 #endif
cvs diff -r1.6 -r1.6.4.1 pkgsrc/databases/mariadb106-server/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/mariadb106-server/PLIST 2021/12/10 13:29:24 1.6
+++ pkgsrc/databases/mariadb106-server/PLIST 2022/06/05 10:11:04 1.6.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2021/12/10 13:29:24 nia Exp $ 1@comment $NetBSD: PLIST,v 1.6.4.1 2022/06/05 10:11:04 spz Exp $
2bin/aria_chk 2bin/aria_chk
3bin/aria_dump_log 3bin/aria_dump_log
4bin/aria_ftdump 4bin/aria_ftdump
5bin/aria_pack 5bin/aria_pack
6bin/aria_read_log 6bin/aria_read_log
7bin/aria_s3_copy 7bin/aria_s3_copy
8bin/innochecksum 8bin/innochecksum
9${PLIST.mariabackup}bin/mariabackup 9${PLIST.mariabackup}bin/mariabackup
10${PLIST.mariabackup}bin/mariadb-backup 10${PLIST.mariabackup}bin/mariadb-backup
11${PLIST.embedded}bin/mariadb-client-test-embedded 11${PLIST.embedded}bin/mariadb-client-test-embedded
12${PLIST.embedded}bin/mariadb-embedded 12${PLIST.embedded}bin/mariadb-embedded
13bin/mariadb-fix-extensions 13bin/mariadb-fix-extensions
14bin/mariadb-install-db 14bin/mariadb-install-db
@@ -33,26 +33,27 @@ bin/mysql_install_db @@ -33,26 +33,27 @@ bin/mysql_install_db
33${PLIST.rocksdb}bin/mysql_ldb 33${PLIST.rocksdb}bin/mysql_ldb
34bin/mysql_tzinfo_to_sql 34bin/mysql_tzinfo_to_sql
35bin/mysql_waitpid 35bin/mysql_waitpid
36bin/mysqld_multi 36bin/mysqld_multi
37bin/mysqld_safe 37bin/mysqld_safe
38bin/mysqld_safe_helper 38bin/mysqld_safe_helper
39${PLIST.embedded}bin/mysqltest_embedded 39${PLIST.embedded}bin/mysqltest_embedded
40bin/perror 40bin/perror
41bin/replace 41bin/replace
42bin/resolve_stack_dump 42bin/resolve_stack_dump
43bin/resolveip 43bin/resolveip
44${PLIST.rocksdb}bin/sst_dump 44${PLIST.rocksdb}bin/sst_dump
45${PLIST.embedded}bin/test-connect-t 45${PLIST.embedded}bin/test-connect-t
 46bin/wsrep_sst_backup
46bin/wsrep_sst_common 47bin/wsrep_sst_common
47bin/wsrep_sst_mariabackup 48bin/wsrep_sst_mariabackup
48bin/wsrep_sst_mysqldump 49bin/wsrep_sst_mysqldump
49bin/wsrep_sst_rsync 50bin/wsrep_sst_rsync
50bin/wsrep_sst_rsync_wan 51bin/wsrep_sst_rsync_wan
51include/mysql/server/private/authors.h 52include/mysql/server/private/authors.h
52include/mysql/server/private/backup.h 53include/mysql/server/private/backup.h
53include/mysql/server/private/bounded_queue.h 54include/mysql/server/private/bounded_queue.h
54include/mysql/server/private/client_settings.h 55include/mysql/server/private/client_settings.h
55include/mysql/server/private/compat56.h 56include/mysql/server/private/compat56.h
56include/mysql/server/private/contributors.h 57include/mysql/server/private/contributors.h
57include/mysql/server/private/create_options.h 58include/mysql/server/private/create_options.h
58include/mysql/server/private/create_tmp_table.h 59include/mysql/server/private/create_tmp_table.h
@@ -342,52 +343,54 @@ lib/mysql/plugin/test_versioning.so @@ -342,52 +343,54 @@ lib/mysql/plugin/test_versioning.so
342lib/mysql/plugin/type_mysql_json.so 343lib/mysql/plugin/type_mysql_json.so
343lib/mysql/plugin/type_test.so 344lib/mysql/plugin/type_test.so
344lib/mysql/plugin/wsrep_info.so 345lib/mysql/plugin/wsrep_info.so
345${PLIST.auth_pam}lib/security/pam_user_map.so 346${PLIST.auth_pam}lib/security/pam_user_map.so
346sbin/mariadbd 347sbin/mariadbd
347sbin/mysqld 348sbin/mysqld
348share/doc/mysql/COPYING 349share/doc/mysql/COPYING
349share/doc/mysql/CREDITS 350share/doc/mysql/CREDITS
350share/doc/mysql/INSTALL-BINARY 351share/doc/mysql/INSTALL-BINARY
351share/doc/mysql/README-wsrep 352share/doc/mysql/README-wsrep
352share/doc/mysql/README.md 353share/doc/mysql/README.md
353share/doc/mysql/THIRDPARTY 354share/doc/mysql/THIRDPARTY
354${PLIST.auth_pam}share/examples/mariadb_auth_pam/user_map.conf 355${PLIST.auth_pam}share/examples/mariadb_auth_pam/user_map.conf
 356share/mysql/bulgarian/errmsg.sys
355share/mysql/charsets/Index.xml 357share/mysql/charsets/Index.xml
356share/mysql/charsets/README 358share/mysql/charsets/README
357share/mysql/charsets/armscii8.xml 359share/mysql/charsets/armscii8.xml
358share/mysql/charsets/ascii.xml 360share/mysql/charsets/ascii.xml
359share/mysql/charsets/cp1250.xml 361share/mysql/charsets/cp1250.xml
360share/mysql/charsets/cp1251.xml 362share/mysql/charsets/cp1251.xml
361share/mysql/charsets/cp1256.xml 363share/mysql/charsets/cp1256.xml
362share/mysql/charsets/cp1257.xml 364share/mysql/charsets/cp1257.xml
363share/mysql/charsets/cp850.xml 365share/mysql/charsets/cp850.xml
364share/mysql/charsets/cp852.xml 366share/mysql/charsets/cp852.xml
365share/mysql/charsets/cp866.xml 367share/mysql/charsets/cp866.xml
366share/mysql/charsets/dec8.xml 368share/mysql/charsets/dec8.xml
367share/mysql/charsets/geostd8.xml 369share/mysql/charsets/geostd8.xml
368share/mysql/charsets/greek.xml 370share/mysql/charsets/greek.xml
369share/mysql/charsets/hebrew.xml 371share/mysql/charsets/hebrew.xml
370share/mysql/charsets/hp8.xml 372share/mysql/charsets/hp8.xml
371share/mysql/charsets/keybcs2.xml 373share/mysql/charsets/keybcs2.xml
372share/mysql/charsets/koi8r.xml 374share/mysql/charsets/koi8r.xml
373share/mysql/charsets/koi8u.xml 375share/mysql/charsets/koi8u.xml
374share/mysql/charsets/latin1.xml 376share/mysql/charsets/latin1.xml
375share/mysql/charsets/latin2.xml 377share/mysql/charsets/latin2.xml
376share/mysql/charsets/latin5.xml 378share/mysql/charsets/latin5.xml
377share/mysql/charsets/latin7.xml 379share/mysql/charsets/latin7.xml
378share/mysql/charsets/macce.xml 380share/mysql/charsets/macce.xml
379share/mysql/charsets/macroman.xml 381share/mysql/charsets/macroman.xml
380share/mysql/charsets/swe7.xml 382share/mysql/charsets/swe7.xml
 383share/mysql/chinese/errmsg.sys
381share/mysql/czech/errmsg.sys 384share/mysql/czech/errmsg.sys
382share/mysql/danish/errmsg.sys 385share/mysql/danish/errmsg.sys
383share/mysql/dutch/errmsg.sys 386share/mysql/dutch/errmsg.sys
384share/mysql/english/errmsg.sys 387share/mysql/english/errmsg.sys
385share/mysql/errmsg-utf8.txt 388share/mysql/errmsg-utf8.txt
386share/mysql/estonian/errmsg.sys 389share/mysql/estonian/errmsg.sys
387share/mysql/fill_help_tables.sql 390share/mysql/fill_help_tables.sql
388share/mysql/french/errmsg.sys 391share/mysql/french/errmsg.sys
389share/mysql/german/errmsg.sys 392share/mysql/german/errmsg.sys
390share/mysql/greek/errmsg.sys 393share/mysql/greek/errmsg.sys
391share/mysql/hindi/errmsg.sys 394share/mysql/hindi/errmsg.sys
392share/mysql/hungarian/errmsg.sys 395share/mysql/hungarian/errmsg.sys
393share/mysql/italian/errmsg.sys 396share/mysql/italian/errmsg.sys