Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 5E63D1A9239 for ; Sat, 27 Nov 2021 23:40:31 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 9C26E84EBC; Sat, 27 Nov 2021 23:40:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D8D0684EB2 for ; Sat, 27 Nov 2021 23:40:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Uw_yCHuuSrqX for ; Sat, 27 Nov 2021 23:40:28 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 714F784CD9 for ; Sat, 27 Nov 2021 23:40:28 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6ACE8FAEC; Sat, 27 Nov 2021 23:40:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_163805642875600" MIME-Version: 1.0 Date: Sat, 27 Nov 2021 23:40:28 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/databases To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20211127234028.6ACE8FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_163805642875600 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Nov 27 23:40:28 UTC 2021 Modified Files: pkgsrc/databases/mariadb106-client: Makefile Makefile.common PLIST distinfo pkgsrc/databases/mariadb106-client/patches: patch-CMakeLists.txt patch-scripts_CMakeLists.txt pkgsrc/databases/mariadb106-server: Makefile PLIST Added Files: pkgsrc/databases/mariadb106-client/patches: patch-storage_innobase_include_transactional__lock__guard.h Removed Files: pkgsrc/databases/mariadb106-client/patches: patch-plugin_auth__pam_CMakeLists.txt patch-plugin_auth__socket_auth__socket.c Log Message: mariadb106*: Update to 10.6.5 Release notes: https://mariadb.com/kb/en/mariadb-1065-release-notes/ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mariadb106-client/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/mariadb106-client/Makefile.common cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb106-client/PLIST cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mariadb106-client/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt \ pkgsrc/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt cvs rdiff -u -r1.1 -r0 \ pkgsrc/databases/mariadb106-client/patches/patch-plugin_auth__pam_CMakeLists.txt \ pkgsrc/databases/mariadb106-client/patches/patch-plugin_auth__socket_auth__socket.c cvs rdiff -u -r0 -r1.1 \ pkgsrc/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mariadb106-server/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mariadb106-server/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_163805642875600 Content-Disposition: inline Content-Length: 12872 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/mariadb106-client/Makefile diff -u pkgsrc/databases/mariadb106-client/Makefile:1.3 pkgsrc/databases/mariadb106-client/Makefile:1.4 --- pkgsrc/databases/mariadb106-client/Makefile:1.3 Thu Oct 21 07:46:33 2021 +++ pkgsrc/databases/mariadb106-client/Makefile Sat Nov 27 23:40:27 2021 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2021/10/21 07:46:33 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2021/11/27 23:40:27 nia Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} -PKGREVISION= 2 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.5 pkgsrc/databases/mariadb106-client/Makefile.common:1.6 --- pkgsrc/databases/mariadb106-client/Makefile.common:1.5 Wed Sep 1 06:21:46 2021 +++ pkgsrc/databases/mariadb106-client/Makefile.common Sat Nov 27 23:40:27 2021 @@ -1,12 +1,11 @@ -# $NetBSD: Makefile.common,v 1.5 2021/09/01 06:21:46 nia Exp $ +# $NetBSD: Makefile.common,v 1.6 2021/11/27 23:40:27 nia Exp $ # # used by databases/mariadb106-client/Makefile # used by databases/mariadb106-server/Makefile -DISTNAME= mariadb-10.6.4 +DISTNAME= mariadb-10.6.5 CATEGORIES= databases -MASTER_SITES= https://downloads.mariadb.org/f/${DISTNAME}/source/ -MASTER_SITES+= https://archive.mariadb.org/${DISTNAME}/source/ +MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/ MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE= https://mariadb.org/ @@ -47,6 +46,8 @@ CMAKE_ARGS+= -DINSTALL_LIBDIR="lib" CMAKE_ARGS+= -DINSTALL_MANDIR="${PKGMANDIR}" CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql" CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="" +CMAKE_ARGS+= -DINSTALL_PAMDIR="lib/security" +CMAKE_ARGS+= -DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam" CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin" CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin" CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin" Index: pkgsrc/databases/mariadb106-client/PLIST diff -u pkgsrc/databases/mariadb106-client/PLIST:1.1 pkgsrc/databases/mariadb106-client/PLIST:1.2 --- pkgsrc/databases/mariadb106-client/PLIST:1.1 Wed Aug 4 15:47:24 2021 +++ pkgsrc/databases/mariadb106-client/PLIST Sat Nov 27 23:40:27 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2021/08/04 15:47:24 nia Exp $ +@comment $NetBSD: PLIST,v 1.2 2021/11/27 23:40:27 nia Exp $ bin/mariadb bin/mariadb-access bin/mariadb-admin @@ -181,6 +181,7 @@ include/mysql/server/private/my_default. include/mysql/server/private/my_handler_errors.h include/mysql/server/private/my_libwrap.h include/mysql/server/private/my_md5.h +include/mysql/server/private/my_minidump.h include/mysql/server/private/my_nosys.h include/mysql/server/private/my_rdtsc.h include/mysql/server/private/my_rnd.h Index: pkgsrc/databases/mariadb106-client/distinfo diff -u pkgsrc/databases/mariadb106-client/distinfo:1.4 pkgsrc/databases/mariadb106-client/distinfo:1.5 --- pkgsrc/databases/mariadb106-client/distinfo:1.4 Tue Oct 26 10:09:23 2021 +++ pkgsrc/databases/mariadb106-client/distinfo Sat Nov 27 23:40:27 2021 @@ -1,21 +1,20 @@ -$NetBSD: distinfo,v 1.4 2021/10/26 10:09:23 nia Exp $ +$NetBSD: distinfo,v 1.5 2021/11/27 23:40:27 nia Exp $ -BLAKE2s (mariadb-10.6.4.tar.gz) = e3cb10854165b9ef08347b0638ac6b9556bbbc25f37a916f92c8ed16fa34094f -SHA512 (mariadb-10.6.4.tar.gz) = c216244ce126e6f8954303a76078dc12146e8ea941041edd215dc05201adda1d5158cd7f1c9831328f783aba4f884965ae288f33bbc43229bc6224a4f1079071 -Size (mariadb-10.6.4.tar.gz) = 84947143 bytes +BLAKE2s (mariadb-10.6.5.tar.gz) = 44cd77d1120c509d6df6386feda2302e544be6d90d08d3f6cd0ed39ab12ae5a5 +SHA512 (mariadb-10.6.5.tar.gz) = 5aafe0a8d5ae54a6f798a6fd0cf922521f5b8e54ef5fb5c7db1cf798a7755f5910bb0b8a6c371cb8253dfb48f4ebca0becd6eb543b68473d564d2092df3185a1 +Size (mariadb-10.6.5.tar.gz) = 85061860 bytes SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f -SHA1 (patch-CMakeLists.txt) = 893f329ed03e01144df166debb4d902ad0304811 +SHA1 (patch-CMakeLists.txt) = ea2f334ff1743e1676fe73e9946d0759c68e1d31 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403 -SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51 -SHA1 (patch-plugin_auth__socket_auth__socket.c) = 094d49d8302be8e7111b6eddd3b6462a553cc22a -SHA1 (patch-scripts_CMakeLists.txt) = e58c21db8fe03f85c496bbdc04c8e30f4a7a7f24 +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) = 1db38a9c1ec3ce7274dc08cb9c5b42d474b431aa SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301 SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = 67ea4d154f4f623fdca739f50b236c973e118a12 Index: pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt diff -u pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt:1.1 pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt:1.2 --- pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt:1.1 Wed Aug 4 15:47:24 2021 +++ pkgsrc/databases/mariadb106-client/patches/patch-CMakeLists.txt Sat Nov 27 23:40:28 2021 @@ -1,10 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2021/08/04 15:47:24 nia Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2021/11/27 23:40:28 nia Exp $ Allow building a server-only configuration. ---- CMakeLists.txt.orig 2021-05-05 21:00:18.000000000 +0000 +--- CMakeLists.txt.orig 2021-11-05 20:03:29.000000000 +0000 +++ CMakeLists.txt -@@ -421,8 +421,6 @@ ENDIF() +@@ -418,8 +418,6 @@ ENDIF() UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE) @@ -13,7 +13,7 @@ Allow building a server-only configurati INCLUDE(cpack_rpm) INCLUDE(cpack_deb) -@@ -432,13 +430,11 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG) +@@ -429,19 +427,16 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG) # Add storage engines and plugins. CONFIGURE_PLUGINS() @@ -27,7 +27,13 @@ Allow building a server-only configurati ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) ADD_SUBDIRECTORY(sql/share) -@@ -461,23 +457,26 @@ IF(NOT WITHOUT_SERVER) + + IF(NOT WITHOUT_SERVER) +- ADD_SUBDIRECTORY(tests) + ADD_SUBDIRECTORY(sql) + OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF) + IF(WITH_EMBEDDED_SERVER) +@@ -460,23 +455,26 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) ENDIF() @@ -59,3 +65,45 @@ Allow building a server-only configurati ENDIF() # minimal target to build only binaries for export ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED}) +@@ -557,41 +555,3 @@ IF(NON_DISTRIBUTABLE_WARNING) + MESSAGE(WARNING " + 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.") + ENDIF() +- +-IF(NOT WITHOUT_SERVER) +- # Define target for minimal mtr-testable build +- ADD_CUSTOM_TARGET(minbuild) +- ADD_DEPENDENCIES(minbuild +- aria_chk +- aria_pack +- mariadb +- mariadb-admin +- mariadb-binlog +- mariadb-check +- mariadb-client-test +- mariadb-conv +- mariadb-dump +- mariadb-import +- mariadb-plugin +- mariadb-show +- mariadb-slap +- mariadb-test +- mariadb-tzinfo-to-sql +- mariadb-upgrade +- mariadbd +- my_print_defaults +- my_safe_process +- myisam_ftdump +- myisamchk +- myisamlog +- myisampack +- perror +- replace) +- IF(WIN32) +- ADD_DEPENDENCIES(minbuild echo mariadb-install-db my_safe_kill) +- ENDIF() +- ADD_CUSTOM_TARGET(smoketest +- COMMAND perl ./mysql-test-run.pl main.1st +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/mysql-test) +- ADD_DEPENDENCIES(smoketest minbuild) +-ENDIF() Index: pkgsrc/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt diff -u pkgsrc/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt:1.1 pkgsrc/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt:1.2 --- pkgsrc/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt:1.1 Wed Aug 4 15:47:24 2021 +++ pkgsrc/databases/mariadb106-client/patches/patch-scripts_CMakeLists.txt Sat Nov 27 23:40:28 2021 @@ -1,8 +1,8 @@ -$NetBSD: patch-scripts_CMakeLists.txt,v 1.1 2021/08/04 15:47:24 nia Exp $ +$NetBSD: patch-scripts_CMakeLists.txt,v 1.2 2021/11/27 23:40:28 nia Exp $ Allow building a server-only configuration. ---- scripts/CMakeLists.txt.orig 2021-07-05 10:15:49.000000000 +0000 +--- scripts/CMakeLists.txt.orig 2021-11-05 20:03:30.000000000 +0000 +++ scripts/CMakeLists.txt @@ -324,22 +324,26 @@ ELSE() mariadbd-safe Index: pkgsrc/databases/mariadb106-server/Makefile diff -u pkgsrc/databases/mariadb106-server/Makefile:1.6 pkgsrc/databases/mariadb106-server/Makefile:1.7 --- pkgsrc/databases/mariadb106-server/Makefile:1.6 Thu Oct 21 07:46:34 2021 +++ pkgsrc/databases/mariadb106-server/Makefile Sat Nov 27 23:40:28 2021 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2021/10/21 07:46:34 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2021/11/27 23:40:28 nia Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 3 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.4 pkgsrc/databases/mariadb106-server/PLIST:1.5 --- pkgsrc/databases/mariadb106-server/PLIST:1.4 Sun Aug 8 21:22:12 2021 +++ pkgsrc/databases/mariadb106-server/PLIST Sat Nov 27 23:40:28 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2021/08/08 21:22:12 nia Exp $ +@comment $NetBSD: PLIST,v 1.5 2021/11/27 23:40:28 nia Exp $ bin/aria_chk bin/aria_dump_log bin/aria_ftdump @@ -8,7 +8,6 @@ bin/aria_s3_copy bin/innochecksum ${PLIST.mariabackup}bin/mariabackup ${PLIST.mariabackup}bin/mariadb-backup -bin/mariadb-client-test ${PLIST.embedded}bin/mariadb-client-test-embedded ${PLIST.embedded}bin/mariadb-embedded bin/mariadb-fix-extensions @@ -27,7 +26,6 @@ bin/myisamchk bin/myisamlog bin/myisampack ${PLIST.rocksdb}bin/myrocks_hotbackup -bin/mysql_client_test ${PLIST.embedded}bin/mysql_client_test_embedded ${PLIST.embedded}bin/mysql_embedded bin/mysql_fix_extensions @@ -344,6 +342,7 @@ lib/mysql/plugin/test_versioning.so lib/mysql/plugin/type_mysql_json.so lib/mysql/plugin/type_test.so lib/mysql/plugin/wsrep_info.so +lib/security/pam_user_map.so sbin/mariadbd sbin/mysqld share/doc/mysql/COPYING @@ -352,6 +351,7 @@ share/doc/mysql/INSTALL-BINARY share/doc/mysql/README-wsrep share/doc/mysql/README.md share/doc/mysql/THIRDPARTY +share/examples/mariadb_auth_pam/user_map.conf share/mysql/charsets/Index.xml share/mysql/charsets/README share/mysql/charsets/armscii8.xml Added files: Index: pkgsrc/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h diff -u /dev/null pkgsrc/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h:1.1 --- /dev/null Sat Nov 27 23:40:28 2021 +++ pkgsrc/databases/mariadb106-client/patches/patch-storage_innobase_include_transactional__lock__guard.h Sat Nov 27 23:40:28 2021 @@ -0,0 +1,20 @@ +$NetBSD: patch-storage_innobase_include_transactional__lock__guard.h,v 1.1 2021/11/27 23:40:28 nia Exp $ + +Strange build failures on NetBSD: +error: 'rw_lock' is not an accessible base of 'page_hash_latch' + +--- storage/innobase/include/transactional_lock_guard.h.orig 2021-11-05 20:03:31.000000000 +0000 ++++ storage/innobase/include/transactional_lock_guard.h +@@ -21,12 +21,6 @@ this program; if not, write to the Free + #if defined __powerpc64__ && defined __clang__ && defined __linux__ + #elif defined __powerpc64__&&defined __GNUC__&&defined __linux__&&__GNUC__ > 4 + #elif defined _MSC_VER && (defined _M_IX86 || defined _M_X64) +-#elif defined __GNUC__ && (defined __i386__ || defined __x86_64__) +-# if __GNUC__ >= 8 +-# elif defined __clang_major__ && __clang_major__ > 6 +-# else +-# define NO_ELISION +-# endif + #else /* Transactional memory has not been implemented for this ISA */ + # define NO_ELISION + #endif --_----------=_163805642875600--