CVS commit: pkgsrc/databases

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Dec 24 18:52:22 UTC 2024

Modified Files:
        pkgsrc/databases/mysql80-client: Makefile Makefile.common PLIST
            distinfo
        pkgsrc/databases/mysql80-server: Makefile
Added Files:
        pkgsrc/databases/mysql80-client/patches:
            patch-storage_innobase_include_ut0crc32.h

Log Message:
mysql80: updated to 8.0.40

MySQL 8.0.40
https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-40.html


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/mysql80-client/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/mysql80-client/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/mysql80-client/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/mysql80-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mysql80-client/patches/patch-storage_innobase_include_ut0crc32.h
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/mysql80-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/mysql80-client/Makefile
diff -u pkgsrc/databases/mysql80-client/Makefile:1.21 pkgsrc/databases/mysql80-client/Makefile:1.22
--- pkgsrc/databases/mysql80-client/Makefile:1.21       Thu Nov 14 22:19:03 2024
+++ pkgsrc/databases/mysql80-client/Makefile    Tue Dec 24 18:52:22 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2024/11/14 22:19:03 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2024/12/24 18:52:22 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   3
 COMMENT=       MySQL 8, a free SQL database (client)
 
 CONFLICTS=     mysql3-client-[0-9]* mariadb-client-[0-9]*

Index: pkgsrc/databases/mysql80-client/Makefile.common
diff -u pkgsrc/databases/mysql80-client/Makefile.common:1.13 pkgsrc/databases/mysql80-client/Makefile.common:1.14
--- pkgsrc/databases/mysql80-client/Makefile.common:1.13        Thu Aug 29 14:42:13 2024
+++ pkgsrc/databases/mysql80-client/Makefile.common     Tue Dec 24 18:52:22 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.13 2024/08/29 14:42:13 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.14 2024/12/24 18:52:22 adam Exp $
 #
 # used by databases/mysql80-client/Makefile
 # used by databases/mysql80-server/Makefile
 
-DISTNAME=      mysql-8.0.39
+DISTNAME=      mysql-8.0.40
 CATEGORIES=    databases
 MASTER_SITES=  https://cdn.mysql.com/Downloads/MySQL-8.0/
 DISTFILES=     mysql-boost-${PKGVERSION_NOREV}${EXTRACT_SUFX}
@@ -15,7 +15,8 @@ LICENSE=      gnu-gpl-v2
 DISTINFO_FILE?=        ${.CURDIR}/../../databases/mysql80-client/distinfo
 PATCHDIR?=     ${.CURDIR}/../../databases/mysql80-client/patches
 
-USE_LANGUAGES=         c c++14
+USE_CXX_FEATURES=      c++14
+USE_LANGUAGES=         c c++
 USE_TOOLS+=            bash bison gmake perl:run pkg-config
 USE_GCC_RUNTIME=       yes
 USE_BUILTIN.libevent=  no

Index: pkgsrc/databases/mysql80-client/PLIST
diff -u pkgsrc/databases/mysql80-client/PLIST:1.5 pkgsrc/databases/mysql80-client/PLIST:1.6
--- pkgsrc/databases/mysql80-client/PLIST:1.5   Thu Aug 29 14:42:13 2024
+++ pkgsrc/databases/mysql80-client/PLIST       Tue Dec 24 18:52:22 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2024/08/29 14:42:13 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.6 2024/12/24 18:52:22 adam Exp $
 bin/mysql
 bin/mysql_client_test
 bin/mysql_config
@@ -29,7 +29,7 @@ include/mysql/mysqld_error.h
 lib/libmysqlclient.a
 lib/libmysqlclient.so
 lib/libmysqlclient.so.21
-lib/libmysqlclient.so.21.2.39
+lib/libmysqlclient.so.21.2.40
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/ibd2sdi.1

Index: pkgsrc/databases/mysql80-client/distinfo
diff -u pkgsrc/databases/mysql80-client/distinfo:1.14 pkgsrc/databases/mysql80-client/distinfo:1.15
--- pkgsrc/databases/mysql80-client/distinfo:1.14       Wed Dec  4 22:13:00 2024
+++ pkgsrc/databases/mysql80-client/distinfo    Tue Dec 24 18:52:22 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2024/12/04 22:13:00 schmonz Exp $
+$NetBSD: distinfo,v 1.15 2024/12/24 18:52:22 adam Exp $
 
-BLAKE2s (mysql-boost-8.0.39.tar.gz) = 1fb0b49bc3d648b15bce455aa18ab4ed95a698419697744edcdf92445d03ee55
-SHA512 (mysql-boost-8.0.39.tar.gz) = 2a2785c89b59cb198d1cf383584d453d058352f0d42e485e5315163fd03e404ea4c6281ab9eb0eb7103768057af52a99dd93cb1890b61edada0d27e0ba32ed44
-Size (mysql-boost-8.0.39.tar.gz) = 449265424 bytes
+BLAKE2s (mysql-boost-8.0.40.tar.gz) = 4fba24ee573376052daa912a055c62341c88dc5f8e6e769487dde4ebf49e6bb8
+SHA512 (mysql-boost-8.0.40.tar.gz) = fcece6e3c09dc4733767effb5c22a55e4add1c9f6b6b911e1eccdd0444f08dc5714b3c8b2a40c85a75a63ff117b6c9881904b6b4732b5ca9bef96de1cb2e284a
+Size (mysql-boost-8.0.40.tar.gz) = 490502884 bytes
 SHA1 (patch-CMakeLists.txt) = ecca84044c0b5901918ed1a3b0d073584c19185e
 SHA1 (patch-client_CMakeLists.txt) = 4fbaf94d43b6c58aa14712213c08b897bd6227cf
 SHA1 (patch-cmake_ldap.cmake) = 46f0df1109ca0886e0d0903a39e25278139f1849
@@ -37,5 +37,6 @@ SHA1 (patch-sql_resourcegroups_platform_
 SHA1 (patch-sql_resourcegroups_platform_thread__attrs__api__solaris.cc) = 1ce0aec798a22f966c37d9ee38b3dee3d855a7e3
 SHA1 (patch-storage_innobase_include_detail_ut_large__page__alloc-linux.h) = cc5bdab29e542f172dc6d4c0d4af1f264e37ba35
 SHA1 (patch-storage_innobase_include_detail_ut_large__page__alloc-solaris.h) = 2b41381af66e22231e897ebc97346c13b1f1e3a7
+SHA1 (patch-storage_innobase_include_ut0crc32.h) = 1c14e803d27dd1fcbdde4c77970de5ff64c13bb2
 SHA1 (patch-utilities_CMakeLists.txt) = 61f18c7639977d15591507ad7e4facb685a4ffb4
 SHA1 (patch-vio_viosocket.cc) = fcbe1eccb58fb840857f22178291ed2fb2c870b0

Index: pkgsrc/databases/mysql80-server/Makefile
diff -u pkgsrc/databases/mysql80-server/Makefile:1.29 pkgsrc/databases/mysql80-server/Makefile:1.30
--- pkgsrc/databases/mysql80-server/Makefile:1.29       Tue Dec  3 15:04:54 2024
+++ pkgsrc/databases/mysql80-server/Makefile    Tue Dec 24 18:52:22 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2024/12/03 15:04:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.30 2024/12/24 18:52:22 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   4
 COMMENT=       MySQL 8, a free SQL database (server)
 
 CONFLICTS=     mysql3-server-[0-9]*

Added files:

Index: pkgsrc/databases/mysql80-client/patches/patch-storage_innobase_include_ut0crc32.h
diff -u /dev/null pkgsrc/databases/mysql80-client/patches/patch-storage_innobase_include_ut0crc32.h:1.1
--- /dev/null   Tue Dec 24 18:52:22 2024
+++ pkgsrc/databases/mysql80-client/patches/patch-storage_innobase_include_ut0crc32.h   Tue Dec 24 18:52:22 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-storage_innobase_include_ut0crc32.h,v 1.1 2024/12/24 18:52:22 adam Exp $
+
+BSD platforms should behave like Darwin.
+
+--- storage/innobase/include/ut0crc32.h.orig   2024-12-24 10:54:43.926389541 +0000
++++ storage/innobase/include/ut0crc32.h
+@@ -59,7 +59,7 @@ this program; if not, write to the Free 
+ #endif /* _WIN32 */
+ #elif defined(__aarch64__) && defined(__GNUC__)
+ #define CRC32_ARM64
+-#ifdef APPLE_ARM
++#if defined(APPLE_ARM) || !defined(__linux__)
+ #define CRC32_ARM64_APPLE
+ #else /* APPLE_ARM */
+ #define CRC32_ARM64_DEFAULT