CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 2 Oct 2023 10:31:59 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Oct  2 10:31:59 UTC 2023

Modified Files:
        pkgsrc/databases/mysql57-client: Makefile.common PLIST distinfo
        pkgsrc/databases/mysql57-client/patches: patch-cmake_ssl.cmake
        pkgsrc/databases/mysql57-server: PLIST

Log Message:
mysql57: updated to 5.7.43

Changes in MySQL 5.7.43

Compilation Notes

Improved Clang 15 usage, although it's not officially supported in v5.7.

Functionality Added or Changed

Important Change: The linked OpenSSL library for MySQL Server has been upgraded from OpenSSL 1.1.1 to OpenSSL 3.0. The exact version is now 3.0.9. More information on changes from 1.1.1 to 3.0 can be 
found at https://www.openssl.org/docs/man3.0/man7/migration_guide.html.

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

Bugs Fixed

Group Replication: After one machine halted and restarted in a three-node MySQL InnoDB Cluster, one node failed to start; after restarting all nodes, the cluster shut down unexpectedly.

Our thanks to Zetang Zeng for the contribution.

Fortified parsing of the network packet data sent by the server to the client.

Some floating-point literals were not always handled correctly.

Executing a query with an implicit aggregation should return exactly one row, unless the query has a HAVING clause that filters out the row, but a query with a HAVING clause which evaluated to FALSE 
sometimes ignored this, and returned a row regardless.

During optimization, range-select tree creation uses logic which differs based on the left-hand side of the IN() predicate. For a field item, each value on the right-hand side is added to an OR tree 
to create the necessary expression. In the case of a row item comparison (example: WHERE (a,b) IN ((n1,m1), (n2, m2), ...)), an expression in disjunctive normal form (DNF) is needed. A DNF expression 
is created by adding an AND tree with column values to an OR tree for each set of RHS values, but instead the OR tree was added to the AND tree causing the tree merge to require exponential time due 
to O(n2) runtime complexity.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/databases/mysql57-client/Makefile.common
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/mysql57-client/PLIST
cvs rdiff -u -r1.52 -r1.53 pkgsrc/databases/mysql57-client/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake
cvs rdiff -u -r1.27 -r1.28 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.44 pkgsrc/databases/mysql57-client/Makefile.common:1.45
--- pkgsrc/databases/mysql57-client/Makefile.common:1.44        Wed Jul 19 22:03:04 2023
+++ pkgsrc/databases/mysql57-client/Makefile.common     Mon Oct  2 10:31:58 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.44 2023/07/19 22:03:04 nia Exp $
+# $NetBSD: Makefile.common,v 1.45 2023/10/02 10:31:58 adam Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=      mysql-5.7.42
+DISTNAME=      mysql-5.7.43
 CATEGORIES=    databases
 MASTER_SITES=  https://dev.mysql.com/get/Downloads/MySQL-5.7/
 DISTFILES=     mysql-boost-${PKGVERSION_NOREV}${EXTRACT_SUFX}

Index: pkgsrc/databases/mysql57-client/PLIST
diff -u pkgsrc/databases/mysql57-client/PLIST:1.28 pkgsrc/databases/mysql57-client/PLIST:1.29
--- pkgsrc/databases/mysql57-client/PLIST:1.28  Thu May 25 09:06:57 2023
+++ pkgsrc/databases/mysql57-client/PLIST       Mon Oct  2 10:31:58 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2023/05/25 09:06:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.29 2023/10/02 10:31:58 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.29
+lib/libmysqlclient.so.20.3.30
 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.52 pkgsrc/databases/mysql57-client/distinfo:1.53
--- pkgsrc/databases/mysql57-client/distinfo:1.52       Thu May 25 09:06:57 2023
+++ pkgsrc/databases/mysql57-client/distinfo    Mon Oct  2 10:31:58 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.52 2023/05/25 09:06:57 adam Exp $
+$NetBSD: distinfo,v 1.53 2023/10/02 10:31:58 adam Exp $
 
-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
+BLAKE2s (mysql-boost-5.7.43.tar.gz) = 97211c8094140ddcfbb539f56aa08c061f3bf9e59498f8ee52929369f2b458be
+SHA512 (mysql-boost-5.7.43.tar.gz) = 296645c4beb1c55fc17eb0cea59968020a6396bca73fe1042e19b52d396834a4cf156abd4193babc6cf83418b2d8db0ee154b7779f830d21f1813e74365bfaa3
+Size (mysql-boost-5.7.43.tar.gz) = 53291096 bytes
 SHA1 (patch-CMakeLists.txt) = 03c15cfdc396448bb7db31434d2e7afaac708223
 SHA1 (patch-client_CMakeLists.txt) = 4af2fb3f3d05a66a9ee89f3653e2fcccadfa5f79
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
@@ -13,7 +13,7 @@ SHA1 (patch-cmake_ldap.cmake) = 9bdc3c31
 SHA1 (patch-cmake_os_SunOS.cmake) = b71c3e1fafb48ebbba77c19bb1c31556ebe1ad2a
 SHA1 (patch-cmake_plugin.cmake) = 4480438969e297f67890b1974a86fb88a23d28ed
 SHA1 (patch-cmake_readline.cmake) = 96ee989be126c939a4c9ef80f8cbb27e0c0719a5
-SHA1 (patch-cmake_ssl.cmake) = dd5bb94818d480a42ab5f971f08b3b4cdbb24034
+SHA1 (patch-cmake_ssl.cmake) = 5eb9736b1153191d9df94992d3dec556ce970432
 SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a
 SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5
 SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2

Index: pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake
diff -u pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake:1.5 pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake:1.6
--- pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake:1.5   Wed Nov 10 11:03:52 2021
+++ pkgsrc/databases/mysql57-client/patches/patch-cmake_ssl.cmake       Mon Oct  2 10:31:59 2023
@@ -1,10 +1,48 @@
-$NetBSD: patch-cmake_ssl.cmake,v 1.5 2021/11/10 11:03:52 jperkin Exp $
+$NetBSD: patch-cmake_ssl.cmake,v 1.6 2023/10/02 10:31:59 adam Exp $
 
 Do not prefer static libraries (or linking will fail).
 
---- cmake/ssl.cmake.orig       2021-09-07 05:26:47.000000000 +0000
+--- cmake/ssl.cmake.orig       2023-06-21 13:02:02.000000000 +0000
 +++ cmake/ssl.cmake
-@@ -153,7 +153,6 @@ MACRO (MYSQL_CHECK_SSL)
+@@ -128,6 +128,29 @@ MACRO(FIND_OPENSSL_VERSION)
+       OPENSSL_VERSION_NUMBER
+       REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+       )
++    IF (NOT OPENSSL_VERSION_NUMBER)
++      FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
++        OPENSSL_VERSION_NUMBER
++        REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_MAJOR[\t ]+[0-9].*$"
++      )
++      STRING(REGEX REPLACE "^.*MAJOR[\t ]+([0-9]).*$" "\\1"
++        OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
++      )
++      FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
++        OPENSSL_VERSION_NUMBER
++        REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_MINOR[\t ]+[0-9].*"
++      )
++      STRING(REGEX REPLACE "^.*MINOR[\t ]+([0-9]).*$" "\\1"
++        OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
++      )
++      FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
++        OPENSSL_VERSION_NUMBER
++        REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_PATCH[\t ]+[0-9].*"
++      )
++      STRING(REGEX REPLACE "^.*PATCH[\t ]+([0-9]).*$" "\\1"
++        OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
++      )
++    ELSE()
+     STRING(REGEX REPLACE
+       "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
+       OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
+@@ -140,6 +163,7 @@ MACRO(FIND_OPENSSL_VERSION)
+       "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
+       OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
+       )
++    ENDIF()
+   ENDIF()
+   SET(OPENSSL_VERSION
+     "${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}"
+@@ -235,7 +259,6 @@ MACRO (MYSQL_CHECK_SSL)
      # On mac this list is <.dylib;.so;.a>
      # We prefer static libraries, so we reverse it here.
      IF (WITH_SSL_PATH)
@@ -12,7 +50,7 @@ Do not prefer static libraries (or linki
        MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
      ENDIF()
  
-@@ -163,9 +162,6 @@ MACRO (MYSQL_CHECK_SSL)
+@@ -245,9 +268,6 @@ MACRO (MYSQL_CHECK_SSL)
      FIND_LIBRARY(CRYPTO_LIBRARY
                   NAMES crypto libcrypto libeay32
                   HINTS ${OPENSSL_ROOT_DIR}/lib)
@@ -21,46 +59,8 @@ Do not prefer static libraries (or linki
 -    ENDIF()
  
      IF(OPENSSL_INCLUDE_DIR)
-       # Verify version number. Version information looks like:
-@@ -175,6 +171,29 @@ MACRO (MYSQL_CHECK_SSL)
-         OPENSSL_VERSION_NUMBER
-         REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-         )
-+      IF (NOT OPENSSL_VERSION_NUMBER)
-+        FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-+          OPENSSL_VERSION_NUMBER
-+          REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_MAJOR[\t ]+[0-9].*$"
-+        )
-+        STRING(REGEX REPLACE "^.*MAJOR[\t ]+([0-9]).*$" "\\1"
-+          OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-+        )
-+        FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-+          OPENSSL_VERSION_NUMBER
-+          REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_MINOR[\t ]+[0-9].*"
-+        )
-+        STRING(REGEX REPLACE "^.*MINOR[\t ]+([0-9]).*$" "\\1"
-+          OPENSSL_MINOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-+        )
-+        FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-+          OPENSSL_VERSION_NUMBER
-+          REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_PATCH[\t ]+[0-9].*"
-+        )
-+        STRING(REGEX REPLACE "^.*PATCH[\t ]+([0-9]).*$" "\\1"
-+          OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-+        )
-+      ELSE()
-       STRING(REGEX REPLACE
-         "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
-         OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}"
-@@ -187,6 +206,7 @@ MACRO (MYSQL_CHECK_SSL)
-         "^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
-         OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-         )
-+      ENDIF()
-     ENDIF()
-     SET(OPENSSL_VERSION
-       "${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}"
-@@ -196,14 +216,14 @@ MACRO (MYSQL_CHECK_SSL)
+       FIND_OPENSSL_VERSION()
+@@ -256,7 +276,7 @@ MACRO (MYSQL_CHECK_SSL)
      IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0")
         ADD_DEFINITIONS(-DHAVE_TLSv13)
         SET(HAVE_TLSv13 1)
@@ -69,11 +69,3 @@ Do not prefer static libraries (or linki
           SET(FORCE_SSL_SOLARIS "-Wl,--undefined,address_of_sk_new_null")
         ENDIF()
      ENDIF()
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
-        CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "3")
-       )
-       SET(OPENSSL_FOUND TRUE)
-     ELSE()

Index: pkgsrc/databases/mysql57-server/PLIST
diff -u pkgsrc/databases/mysql57-server/PLIST:1.27 pkgsrc/databases/mysql57-server/PLIST:1.28
--- pkgsrc/databases/mysql57-server/PLIST:1.27  Thu May 25 09:06:57 2023
+++ pkgsrc/databases/mysql57-server/PLIST       Mon Oct  2 10:31:59 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2023/05/25 09:06:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.28 2023/10/02 10:31:59 adam Exp $
 bin/innochecksum
 bin/lz4_decompress
 bin/my_print_defaults
@@ -776,6 +776,7 @@ share/mysql/test/include/only_mts_slave_
 share/mysql/test/include/only_mts_slave_parallel_type_logical_clock.inc
 share/mysql/test/include/only_mts_slave_parallel_workers.inc
 share/mysql/test/include/only_with_option.inc
+share/mysql/test/include/openssl3_legacy_tls.cnf
 share/mysql/test/include/openssl_cert_generation_debug_test.inc
 share/mysql/test/include/order_by.inc
 share/mysql/test/include/parser-big.inc
@@ -2442,7 +2443,9 @@ share/mysql/test/suite/auth_sec/t/ssl_au
 share/mysql/test/suite/auth_sec/t/ssl_auto_detect_openssl-master.opt
 share/mysql/test/suite/auth_sec/t/ssl_auto_detect_openssl.test
 share/mysql/test/suite/auth_sec/t/ssl_mode.test
+share/mysql/test/suite/auth_sec/t/tls.cnf
 share/mysql/test/suite/auth_sec/t/tls.test
+share/mysql/test/suite/auth_sec/t/tls12_tls1.cnf
 share/mysql/test/suite/auth_sec/t/tls12_tls1.test
 share/mysql/test/suite/auth_sec/t/wrong_keyring_file_data-master.opt
 share/mysql/test/suite/auth_sec/t/wrong_keyring_file_data.test
@@ -11261,6 +11264,7 @@ share/mysql/test/suite/rpl/t/rpl_sql_thr
 share/mysql/test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock-slave.opt
 share/mysql/test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock.test
 share/mysql/test/suite/rpl/t/rpl_ssl.test
+share/mysql/test/suite/rpl/t/rpl_ssl1.cnf
 share/mysql/test/suite/rpl/t/rpl_ssl1.test
 share/mysql/test/suite/rpl/t/rpl_ssl_semisync-master.opt
 share/mysql/test/suite/rpl/t/rpl_ssl_semisync-slave.opt
@@ -13455,12 +13459,14 @@ share/mysql/test/suite/x/t/connection.te
 share/mysql/test/suite/x/t/connection_default_schema.test
 share/mysql/test/suite/x/t/connection_expire.test
 share/mysql/test/suite/x/t/connection_expired_certs-master.opt
+share/mysql/test/suite/x/t/connection_expired_certs.cnf
 share/mysql/test/suite/x/t/connection_expired_certs.test
 share/mysql/test/suite/x/t/connection_ipv6-master.opt
 share/mysql/test/suite/x/t/connection_ipv6.test
 share/mysql/test/suite/x/t/connection_nonssl-master.opt
 share/mysql/test/suite/x/t/connection_nonssl.test
 share/mysql/test/suite/x/t/connection_openssl-master.opt
+share/mysql/test/suite/x/t/connection_openssl.cnf
 share/mysql/test/suite/x/t/connection_openssl.test
 share/mysql/test/suite/x/t/connection_require_secure_transport.test
 share/mysql/test/suite/x/t/connection_reset_by_peer.test
@@ -13470,6 +13476,7 @@ share/mysql/test/suite/x/t/connection_sk
 share/mysql/test/suite/x/t/connection_skip_networking_win.test
 share/mysql/test/suite/x/t/connection_timeout.test
 share/mysql/test/suite/x/t/connection_tls_version-master.opt
+share/mysql/test/suite/x/t/connection_tls_version.cnf
 share/mysql/test/suite/x/t/connection_tls_version.test
 share/mysql/test/suite/x/t/connection_unixsocket.test
 share/mysql/test/suite/x/t/connection_unixsocket_invalid.test
@@ -14613,6 +14620,7 @@ share/mysql/test/t/ssl_crl_clients_valid
 share/mysql/test/t/ssl_crl_crlpath-master.opt
 share/mysql/test/t/ssl_crl_crlpath.test
 share/mysql/test/t/ssl_deprecated_tls_versions-master.opt
+share/mysql/test/t/ssl_deprecated_tls_versions.cnf
 share/mysql/test/t/ssl_deprecated_tls_versions.test
 share/mysql/test/t/ssl_verify_identity-master.opt
 share/mysql/test/t/ssl_verify_identity.test

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

Home | Main Index | Thread Index | Old Index