CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 25 May 2023 09:06:57 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu May 25 09:06:57 UTC 2023

Modified Files:
        pkgsrc/databases/mysql57-client: Makefile.common PLIST distinfo
            options.mk
        pkgsrc/databases/mysql57-client/patches: patch-CMakeLists.txt
        pkgsrc/databases/mysql57-server: PLIST
Removed Files:
        pkgsrc/databases/mysql57-client/patches: patch-cmake_curl.cmake
            patch-storage_ndb_mcc_frontend_dojo_dojox_mobile_build_build.sh

Log Message:
mysql57: updated to 5.7.42

Changes in MySQL 5.7.42

Functionality Added or Changed

Important Change: The linked OpenSSL library for MySQL Server has been updated to version 1.1.1t. Issues fixed in OpenSSL version 1.1.1t are described at https://www.openssl.org/news/cl111.txt.

The linked curl library for MySQL Server (Enterprise Edition) has been updated to version 7.88.1.

Bugs Fixed

InnoDB: Prevent online DDL operations from accessing out-of-bounds memory.

Replication: Some binary log events were not always handled correctly.

Replication: Setting binlog_order_commits to OFF could lead to a missed GTID in the next binary log file's Previous_gtids event.

Our thanks to Yewei Xu and the Tencent team for the contribution.

A client setting the character set to an impermissible client character set (ucs2, utf16, utf16le, or utf32) could cause unexpected behavior when the client used an authentication plugin.

The scope of the connect_timeout limit was extended to full-packet reads.

Using --single-transaction with mysqldump version 5.7.41 required either the RELOAD or FLUSH_TABLES privilege. This requirement now applies only when both gtid_mode=ON (default OFF) and with 
--set-gtid-purged = ON|AUTO (default AUTO).


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/databases/mysql57-client/Makefile.common
cvs rdiff -u -r1.27 -r1.28 pkgsrc/databases/mysql57-client/PLIST
cvs rdiff -u -r1.51 -r1.52 pkgsrc/databases/mysql57-client/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mysql57-client/options.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/mysql57-client/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_curl.cmake \
    pkgsrc/databases/mysql57-client/patches/patch-storage_ndb_mcc_frontend_dojo_dojox_mobile_build_build.sh
cvs rdiff -u -r1.26 -r1.27 pkgsrc/databases/mysql57-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/mysql57-client/Makefile.common
diff -u pkgsrc/databases/mysql57-client/Makefile.common:1.40 pkgsrc/databases/mysql57-client/Makefile.common:1.41
--- pkgsrc/databases/mysql57-client/Makefile.common:1.40        Wed Feb  1 16:38:12 2023
+++ pkgsrc/databases/mysql57-client/Makefile.common     Thu May 25 09:06:57 2023
@@ -1,21 +1,17 @@
-# $NetBSD: Makefile.common,v 1.40 2023/02/01 16:38:12 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.41 2023/05/25 09:06:57 adam Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=      mysql-5.7.41
+DISTNAME=      mysql-5.7.42
 CATEGORIES=    databases
-#MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/}
 MASTER_SITES=  https://dev.mysql.com/get/Downloads/MySQL-5.7/
+DISTFILES=     mysql-boost-${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
 MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.mysql.com/
 LICENSE=       gnu-gpl-v2
 
-BOOST=                 boost_1_59_0
-DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} ${BOOST}.tar.bz2
-SITES.${BOOST}.tar.bz2=        ${MASTER_SITE_SOURCEFORGE:=boost/}
-
 DISTINFO_FILE?=        ${.CURDIR}/../../databases/mysql57-client/distinfo
 PATCHDIR?=     ${.CURDIR}/../../databases/mysql57-client/patches
 
@@ -69,7 +65,8 @@ CMAKE_ARGS+=  -DMYSQL_DATADIR=${MYSQL_DAT
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
 
-CMAKE_ARGS+=   -DWITH_BOOST=${WRKDIR}/${BOOST}
+CMAKE_ARGS+=   -DWITH_BOOST=${WRKSRC}/boost
+CMAKE_ARGS+=   -DWITH_CURL="system"
 CMAKE_ARGS+=   -DWITH_EDITLINE="system"
 CMAKE_ARGS+=   -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline}/${BUILDLINK_INCDIRS.editline}
 CMAKE_ARGS+=   -DWITH_LIBEVENT="system"
@@ -128,5 +125,6 @@ CHECK_PORTABILITY_SKIP+=    packaging/deb-i
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/atomic64.mk"

Index: pkgsrc/databases/mysql57-client/PLIST
diff -u pkgsrc/databases/mysql57-client/PLIST:1.27 pkgsrc/databases/mysql57-client/PLIST:1.28
--- pkgsrc/databases/mysql57-client/PLIST:1.27  Wed Feb  1 16:38:12 2023
+++ pkgsrc/databases/mysql57-client/PLIST       Thu May 25 09:06:57 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2023/02/01 16:38:12 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.28 2023/05/25 09:06:57 adam Exp $
 bin/mysql
 bin/mysql_client_test
 bin/mysql_config
@@ -122,7 +122,7 @@ include/mysql/typelib.h
 lib/libmysqlclient.a
 lib/libmysqlclient.so
 lib/libmysqlclient.so.20
-lib/libmysqlclient.so.20.3.28
+lib/libmysqlclient.so.20.3.29
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/innochecksum.1

Index: pkgsrc/databases/mysql57-client/distinfo
diff -u pkgsrc/databases/mysql57-client/distinfo:1.51 pkgsrc/databases/mysql57-client/distinfo:1.52
--- pkgsrc/databases/mysql57-client/distinfo:1.51       Wed Feb  1 16:38:12 2023
+++ pkgsrc/databases/mysql57-client/distinfo    Thu May 25 09:06:57 2023
@@ -1,18 +1,14 @@
-$NetBSD: distinfo,v 1.51 2023/02/01 16:38:12 jperkin Exp $
+$NetBSD: distinfo,v 1.52 2023/05/25 09:06:57 adam Exp $
 
-BLAKE2s (boost_1_59_0.tar.bz2) = 8738bf3fbcfd42ce18f2f9e2b9f49f496d3a84c038ace73b02f72889ad7da49b
-SHA512 (boost_1_59_0.tar.bz2) = 8139e1ae997a86974071c5714ad3307e3d8fd15ef702b81a953410dd4d424b932135f53a0ef4891d9b9b747a38e539e66d6a803388fe0cc98e5166be872d682a
-Size (boost_1_59_0.tar.bz2) = 70389425 bytes
-BLAKE2s (mysql-5.7.41.tar.gz) = 6cb4ea06ff270855a0b06220db2bfbdaa13035a877281c579c7aa705e586bd14
-SHA512 (mysql-5.7.41.tar.gz) = b2085cf2eee6c3ab4cce88be4eec8a3ac4ffb21556d2824eae9e459f4771034ae2aff725ee441164440d13792f3f30707ca3129d5b36ebbf197f864b06a5b1fa
-Size (mysql-5.7.41.tar.gz) = 56535698 bytes
-SHA1 (patch-CMakeLists.txt) = 1409a98380c999c6973fa3106dc35684b7c3b3cc
+BLAKE2s (mysql-boost-5.7.42.tar.gz) = df33375b4df62b11e348817540cd651d5c140b8d22d0e816405aa4f536d63a09
+SHA512 (mysql-boost-5.7.42.tar.gz) = c17cc29f99b9944edf27cb5fa9064ba7a0b4ed8a28f10a3d0bc6b3d45f69bc804efc7fc3a20faece6fe341f5ce8f965f914925e8d55a2f2c8c5fa337ada94df9
+Size (mysql-boost-5.7.42.tar.gz) = 53288125 bytes
+SHA1 (patch-CMakeLists.txt) = 03c15cfdc396448bb7db31434d2e7afaac708223
 SHA1 (patch-client_CMakeLists.txt) = 4af2fb3f3d05a66a9ee89f3653e2fcccadfa5f79
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
 SHA1 (patch-cmake_build__configurations_compiler__options.cmake) = 999110815237c53a69c74c42e66c45df83cbf355
 SHA1 (patch-cmake_build__configurations_mysql__release.cmake) = 7a1fb8c686f187db8fd9d8ad203c1f764d6e55a6
-SHA1 (patch-cmake_curl.cmake) = 08ff31eb8de6b94a46ff90edb6df66a61a94fd9d
 SHA1 (patch-cmake_ldap.cmake) = 9bdc3c311330852286838e6159295ecc5fbdc0ea
 SHA1 (patch-cmake_os_SunOS.cmake) = b71c3e1fafb48ebbba77c19bb1c31556ebe1ad2a
 SHA1 (patch-cmake_plugin.cmake) = 4480438969e297f67890b1974a86fb88a23d28ed
@@ -51,5 +47,4 @@ SHA1 (patch-storage_federated_CMakeLists
 SHA1 (patch-storage_heap_CMakeLists.txt) = 038be371238eab52708a1eba164541fea7b4b848
 SHA1 (patch-storage_myisam_CMakeLists.txt) = debeb74ec2d4a7d2e8a1166595a1deb384b03a7a
 SHA1 (patch-storage_myisammrg_CMakeLists.txt) = e4755536adfb6e837f997061690244da9aa7a6d3
-SHA1 (patch-storage_ndb_mcc_frontend_dojo_dojox_mobile_build_build.sh) = e6939ef781054b4bff006038905e28f7c5cd8d7e
 SHA1 (patch-strings_decimal.c) = 069c9d930c735f74510702baa9bef38aec425903

Index: pkgsrc/databases/mysql57-client/options.mk
diff -u pkgsrc/databases/mysql57-client/options.mk:1.4 pkgsrc/databases/mysql57-client/options.mk:1.5
--- pkgsrc/databases/mysql57-client/options.mk:1.4      Thu May  7 05:31:53 2020
+++ pkgsrc/databases/mysql57-client/options.mk  Thu May 25 09:06:57 2023
@@ -1,9 +1,8 @@
-# $NetBSD: options.mk,v 1.4 2020/05/07 05:31:53 adam Exp $
+# $NetBSD: options.mk,v 1.5 2023/05/25 09:06:57 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mysql5
 
-# ndb-cluster does not configure with cmake
-PKG_SUPPORTED_OPTIONS+=        dtrace embedded-server ldap memcached ndb-cluster
+PKG_SUPPORTED_OPTIONS+=        dtrace embedded-server ldap memcached
 PKG_SUGGESTED_OPTIONS+=        embedded-server
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/databases/mysql57-client/patches/patch-CMakeLists.txt
diff -u pkgsrc/databases/mysql57-client/patches/patch-CMakeLists.txt:1.2 pkgsrc/databases/mysql57-client/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/databases/mysql57-client/patches/patch-CMakeLists.txt:1.2    Sun Jan 20 18:22:10 2019
+++ pkgsrc/databases/mysql57-client/patches/patch-CMakeLists.txt        Thu May 25 09:06:57 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2019/01/20 18:22:10 maya Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2023/05/25 09:06:57 adam Exp $
 
 Split configuration between mysql-client and mysql-server.
 
@@ -6,9 +6,11 @@ Backport of https://github.com/mysql/mys
 Avoid disclosure of files from a client to a malicious server, described here:
 https://gwillem.gitlab.io/2019/01/17/adminer-4.6.2-file-disclosure-vulnerability/
 
---- CMakeLists.txt.orig        2018-10-04 05:48:22.000000000 +0000
+ndb is not available anymore.
+
+--- CMakeLists.txt.orig        2023-03-16 15:25:04.000000000 +0000
 +++ CMakeLists.txt
-@@ -408,7 +408,7 @@ IF(REPRODUCIBLE_BUILD)
+@@ -482,7 +482,7 @@ IF(REPRODUCIBLE_BUILD)
  ENDIF()
  
  OPTION(ENABLED_LOCAL_INFILE
@@ -17,7 +19,7 @@ https://gwillem.gitlab.io/2019/01/17/adm
  MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE)
  
  OPTION(OPTIMIZER_TRACE "Support tracing of Optimizer" ON)
-@@ -636,7 +636,6 @@ ADD_SUBDIRECTORY(vio)
+@@ -702,7 +702,6 @@ ADD_SUBDIRECTORY(vio)
  ADD_SUBDIRECTORY(regex)
  ADD_SUBDIRECTORY(mysys)
  ADD_SUBDIRECTORY(mysys_ssl)
@@ -25,7 +27,17 @@ https://gwillem.gitlab.io/2019/01/17/adm
  ADD_SUBDIRECTORY(libbinlogevents)
  ADD_SUBDIRECTORY(libbinlogstandalone)
  
-@@ -674,12 +673,12 @@ ADD_SUBDIRECTORY(client)
+@@ -716,9 +715,6 @@ IF(NOT WITHOUT_SERVER)
+   SET (MYSQLD_STATIC_EMBEDDED_PLUGIN_LIBS "" CACHE INTERNAL "")
+   # Add storage engines and plugins.
+   CONFIGURE_PLUGINS()
+-ELSE()
+-  # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1
+-  ADD_SUBDIRECTORY(storage/ndb)
+ ENDIF()
+ 
+ IF(WITH_UNIT_TESTS)
+@@ -745,12 +741,12 @@ ADD_SUBDIRECTORY(client)
  ADD_SUBDIRECTORY(sql/share)
  ADD_SUBDIRECTORY(libservices)
  

Index: pkgsrc/databases/mysql57-server/PLIST
diff -u pkgsrc/databases/mysql57-server/PLIST:1.26 pkgsrc/databases/mysql57-server/PLIST:1.27
--- pkgsrc/databases/mysql57-server/PLIST:1.26  Wed Feb  1 16:38:13 2023
+++ pkgsrc/databases/mysql57-server/PLIST       Thu May 25 09:06:57 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2023/02/01 16:38:13 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.27 2023/05/25 09:06:57 adam Exp $
 bin/innochecksum
 bin/lz4_decompress
 bin/my_print_defaults
@@ -1609,6 +1609,7 @@ share/mysql/test/r/mysqldump_bug30042589
 share/mysql/test/r/mysqldump_bugs.result
 share/mysql/test/r/mysqldump_gtid_state.result
 share/mysql/test/r/mysqldump_restore.result
+share/mysql/test/r/mysqldump_single_trans_min_privs.result
 share/mysql/test/r/mysqldumpslow.result
 share/mysql/test/r/mysqlimport.result
 share/mysql/test/r/mysqlpump.result
@@ -2453,6 +2454,7 @@ share/mysql/test/suite/binlog/r/binlog_b
 share/mysql/test/suite/binlog/r/binlog_cache_write_failure.result
 share/mysql/test/suite/binlog/r/binlog_check_flush_log_assertion.result
 share/mysql/test/suite/binlog/r/binlog_checksum.result
+share/mysql/test/suite/binlog/r/binlog_corrupt_update_log_event.result
 share/mysql/test/suite/binlog/r/binlog_crash_safe_master_checksum.result
 share/mysql/test/suite/binlog/r/binlog_database.result
 share/mysql/test/suite/binlog/r/binlog_delete_and_flush_index.result
@@ -2648,6 +2650,7 @@ share/mysql/test/suite/binlog/t/binlog_c
 share/mysql/test/suite/binlog/t/binlog_cache_write_failure.test
 share/mysql/test/suite/binlog/t/binlog_check_flush_log_assertion.test
 share/mysql/test/suite/binlog/t/binlog_checksum.test
+share/mysql/test/suite/binlog/t/binlog_corrupt_update_log_event.test
 share/mysql/test/suite/binlog/t/binlog_crash_safe_master_checksum-master.opt
 share/mysql/test/suite/binlog/t/binlog_crash_safe_master_checksum.test
 share/mysql/test/suite/binlog/t/binlog_database.test
@@ -5330,6 +5333,7 @@ share/mysql/test/suite/innodb/r/innodb_b
 share/mysql/test/suite/innodb/r/innodb_bug31205266.result
 share/mysql/test/suite/innodb/r/innodb_bug34053.result
 share/mysql/test/suite/innodb/r/innodb_bug34300.result
+share/mysql/test/suite/innodb/r/innodb_bug34750489.result
 share/mysql/test/suite/innodb/r/innodb_bug35220.result
 share/mysql/test/suite/innodb/r/innodb_bug38231.result
 share/mysql/test/suite/innodb/r/innodb_bug39438.result
@@ -5740,6 +5744,8 @@ share/mysql/test/suite/innodb/t/innodb_b
 share/mysql/test/suite/innodb/t/innodb_bug31205266.test
 share/mysql/test/suite/innodb/t/innodb_bug34053.test
 share/mysql/test/suite/innodb/t/innodb_bug34300.test
+share/mysql/test/suite/innodb/t/innodb_bug34750489-master.opt
+share/mysql/test/suite/innodb/t/innodb_bug34750489.test
 share/mysql/test/suite/innodb/t/innodb_bug35220.test
 share/mysql/test/suite/innodb/t/innodb_bug38231.test
 share/mysql/test/suite/innodb/t/innodb_bug39438-master.opt
@@ -10043,6 +10049,7 @@ share/mysql/test/suite/rpl/r/rpl_perfsch
 share/mysql/test/suite/rpl/r/rpl_perfschema_order_by.result
 share/mysql/test/suite/rpl/r/rpl_perfschema_threads_processlist_status.result
 share/mysql/test/suite/rpl/r/rpl_plugin_load.result
+share/mysql/test/suite/rpl/r/rpl_previous_gtids.result
 share/mysql/test/suite/rpl/r/rpl_ps.result
 share/mysql/test/suite/rpl/r/rpl_pump.result
 share/mysql/test/suite/rpl/r/rpl_rbr_to_sbr.result
@@ -10921,6 +10928,8 @@ share/mysql/test/suite/rpl/t/rpl_perfsch
 share/mysql/test/suite/rpl/t/rpl_plugin_load-master.opt
 share/mysql/test/suite/rpl/t/rpl_plugin_load-slave.opt
 share/mysql/test/suite/rpl/t/rpl_plugin_load.test
+share/mysql/test/suite/rpl/t/rpl_previous_gtids-master.opt
+share/mysql/test/suite/rpl/t/rpl_previous_gtids.test
 share/mysql/test/suite/rpl/t/rpl_ps.test
 share/mysql/test/suite/rpl/t/rpl_pump-master.opt
 share/mysql/test/suite/rpl/t/rpl_pump-slave.opt
@@ -14249,6 +14258,8 @@ share/mysql/test/t/mysqldump_bugs.test
 share/mysql/test/t/mysqldump_gtid_state-master.opt
 share/mysql/test/t/mysqldump_gtid_state.test
 share/mysql/test/t/mysqldump_restore.test
+share/mysql/test/t/mysqldump_single_trans_min_privs-master.opt
+share/mysql/test/t/mysqldump_single_trans_min_privs.test
 share/mysql/test/t/mysqldumpslow.test
 share/mysql/test/t/mysqlimport.test
 share/mysql/test/t/mysqlpump.test

Prev by Date: CVS commit: pkgsrc/net/synergy
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/net/synergy
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index