CVS commit: pkgsrc/databases

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Feb  5 09:28:07 UTC 2021

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

Log Message:
mysql56: updated to 5.6.51

Changes in MySQL 5.6.51

Security Notes

The linked OpenSSL library for MySQL Server has been updated to version 1.1.1i. Issues fixed in the new OpenSSL version are described at https://www.openssl.org/news/cl111.txt and 
https://www.openssl.org/news/vulnerabilities.html.

Bugs Fixed

InnoDB: The full-text search synchronization thread attempted to read a previously-freed word from the index cache.

The server did not handle all cases of the WHERE_CONDITION optimization correctly.

Privileges for some INFORMATION_SCHEMA tables were checked incorrectly.

In certain cases, the server did not handle multiply-nested subqueries correctly.

A buffer overflow in the client library was fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/databases/mysql56-client/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/databases/mysql56-client/Makefile.common
cvs rdiff -u -r1.58 -r1.59 pkgsrc/databases/mysql56-client/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/databases/mysql56-client/patches/patch-cmake_ssl.cmake
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/mysql56-server/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/databases/mysql56-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/mysql56-client/Makefile
diff -u pkgsrc/databases/mysql56-client/Makefile:1.37 pkgsrc/databases/mysql56-client/Makefile:1.38
--- pkgsrc/databases/mysql56-client/Makefile:1.37       Sun Oct 25 22:38:58 2020
+++ pkgsrc/databases/mysql56-client/Makefile    Fri Feb  5 09:28:07 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2020/10/25 22:38:58 jnemeth Exp $
+# $NetBSD: Makefile,v 1.38 2021/02/05 09:28:07 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-#PKGREVISION=  1
 COMMENT=       MySQL 5, a free SQL database (client)
 
 CONFLICTS=     mysql3-client-[0-9]*

Index: pkgsrc/databases/mysql56-client/Makefile.common
diff -u pkgsrc/databases/mysql56-client/Makefile.common:1.59 pkgsrc/databases/mysql56-client/Makefile.common:1.60
--- pkgsrc/databases/mysql56-client/Makefile.common:1.59        Sun Oct 25 22:38:58 2020
+++ pkgsrc/databases/mysql56-client/Makefile.common     Fri Feb  5 09:28:07 2021
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.59 2020/10/25 22:38:58 jnemeth Exp $
+# $NetBSD: Makefile.common,v 1.60 2021/02/05 09:28:07 adam Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=      mysql-5.6.50
+DISTNAME=      mysql-5.6.51
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
@@ -63,6 +63,7 @@ CMAKE_ARGS+=  -DINSTALL_SQLBENCHDIR="shar
 CMAKE_ARGS+=   -DINSTALL_SUPPORTFILESDIR="share/mysql"
 CMAKE_ARGS+=   -DMYSQL_DATADIR=${MYSQL_DATADIR}
 
+CMAKE_ARGS+=   -DWITH_EDITLINE="system"
 CMAKE_ARGS+=   -DWITH_ZLIB="system"
 CMAKE_ARGS+=   -DDEFAULT_CHARSET=${MYSQL_CHARSET}
 CMAKE_ARGS+=   -DDEFAULT_COLLATION=${MYSQL_COLLATION}
@@ -136,12 +137,7 @@ SUBST_NOOP_OK.fixpaths=    yes # not needed
 USE_BUILTIN.editline=  no
 .endif
 
-.include "../../mk/readline.buildlink3.mk"
-.if ${READLINE_TYPE} == "readline"
-CMAKE_ARGS+=           -DWITH_READLINE="system"
-.else
-CMAKE_ARGS+=           -DWITH_EDITLINE="system"
-.endif
-
+.include "../../devel/editline/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/databases/mysql56-client/distinfo
diff -u pkgsrc/databases/mysql56-client/distinfo:1.58 pkgsrc/databases/mysql56-client/distinfo:1.59
--- pkgsrc/databases/mysql56-client/distinfo:1.58       Sun Oct 25 22:38:58 2020
+++ pkgsrc/databases/mysql56-client/distinfo    Fri Feb  5 09:28:07 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.58 2020/10/25 22:38:58 jnemeth Exp $
+$NetBSD: distinfo,v 1.59 2021/02/05 09:28:07 adam Exp $
 
-SHA1 (mysql-5.6.50.tar.gz) = 90ac210ad609e3e922ec10b0789222a88cbcd4d6
-RMD160 (mysql-5.6.50.tar.gz) = e95ba4b422b57d19c4d7f322da5e160049a5f28a
-SHA512 (mysql-5.6.50.tar.gz) = ea8f2c7348acda8454f2f090886c2f92042b4b1ee0407bfa6c19ed11859cedacdba124667dc52585a324f2292deb367888c0abb74f4e58a972f65d5fcc8302c6
-Size (mysql-5.6.50.tar.gz) = 32409084 bytes
+SHA1 (mysql-5.6.51.tar.gz) = bec5ae9e7e31881ce6dc5d6c20d4ffdc11097fb9
+RMD160 (mysql-5.6.51.tar.gz) = c6c43b04fc34fb9ceb55eb6f5be9ce4ea3bff56d
+SHA512 (mysql-5.6.51.tar.gz) = 2a214750f3a1607fb750c0ee7a4a4469ef150b03761c717862c8f4710d6d63f60d9163cfa8f3b279c06c5ad00a7789a594f3429959e253f8250284245449c419
+Size (mysql-5.6.51.tar.gz) = 32411131 bytes
 SHA1 (sphinx-2.2.11-release.tar.gz) = 34e83f43de0e69e258bf749ea00348c60a51632a
 RMD160 (sphinx-2.2.11-release.tar.gz) = 5804b4cce64bc03fa20bac26c7391cd661cecc77
 SHA512 (sphinx-2.2.11-release.tar.gz) = cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
@@ -15,7 +15,7 @@ SHA1 (patch-cmake_libutils.cmake) = c3e5
 SHA1 (patch-cmake_os_SunOS.cmake) = 60ba9f81c28bbb78295b8a12fe6cd3b176c03f91
 SHA1 (patch-cmake_plugin.cmake) = 5e7bfccd02fa66993f6615b2d57fb032ac9e8b14
 SHA1 (patch-cmake_readline.cmake) = 6bec6ca87b45c739d0614493477a18bb7c56d981
-SHA1 (patch-cmake_ssl.cmake) = b351b80c96e27e0f281bf2de8b3fc8911500f579
+SHA1 (patch-cmake_ssl.cmake) = d431ce3649c04a569f7710d0e821a087822b9e7b
 SHA1 (patch-cmd-line-utils_libedit_chartype.h) = 6b1453df648001ed1fc81190106e15872a69a04c
 SHA1 (patch-cmd-line-utils_libedit_vi.c) = 7c5ce1d07f650815d028e435a59e5d078ec74c2f
 SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4

Index: pkgsrc/databases/mysql56-client/patches/patch-cmake_ssl.cmake
diff -u pkgsrc/databases/mysql56-client/patches/patch-cmake_ssl.cmake:1.3 pkgsrc/databases/mysql56-client/patches/patch-cmake_ssl.cmake:1.4
--- pkgsrc/databases/mysql56-client/patches/patch-cmake_ssl.cmake:1.3   Mon Oct 14 19:44:47 2019
+++ pkgsrc/databases/mysql56-client/patches/patch-cmake_ssl.cmake       Fri Feb  5 09:28:07 2021
@@ -1,21 +1,29 @@
-$NetBSD: patch-cmake_ssl.cmake,v 1.3 2019/10/14 19:44:47 adam Exp $
+$NetBSD: patch-cmake_ssl.cmake,v 1.4 2021/02/05 09:28:07 adam Exp $
 
 Allow OpenSSH versions below 1.0.
 Do not prefer static libraries (or linking will fail).
 
---- cmake/ssl.cmake.orig       2019-09-27 07:04:56.000000000 +0000
+--- cmake/ssl.cmake.orig       2021-01-05 10:19:59.000000000 +0000
 +++ cmake/ssl.cmake
-@@ -152,9 +152,7 @@ MACRO (MYSQL_CHECK_SSL)
-     ENDIF()
- 
+@@ -154,7 +154,6 @@ MACRO (MYSQL_CHECK_SSL)
      # On mac this list is <.dylib;.so;.a>
--    # We prefer static libraries, so we revert it here.
+     # We prefer static libraries, so we revert it here.
      IF (WITH_SSL_PATH)
 -      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
        MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
      ENDIF()
  
-@@ -194,8 +192,7 @@ MACRO (MYSQL_CHECK_SSL)
+@@ -164,9 +163,6 @@ MACRO (MYSQL_CHECK_SSL)
+     FIND_LIBRARY(CRYPTO_LIBRARY
+                  NAMES crypto libcrypto libeay32
+                  HINTS ${OPENSSL_ROOT_DIR}/lib)
+-    IF (WITH_SSL_PATH)
+-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+-    ENDIF()
+ 
+     IF(OPENSSL_INCLUDE_DIR)
+       # Verify version number. Version information looks like:
+@@ -194,8 +190,7 @@ MACRO (MYSQL_CHECK_SSL)
      ENDIF()
      IF(OPENSSL_INCLUDE_DIR AND
         OPENSSL_LIBRARY   AND

Index: pkgsrc/databases/mysql56-server/Makefile
diff -u pkgsrc/databases/mysql56-server/Makefile:1.45 pkgsrc/databases/mysql56-server/Makefile:1.46
--- pkgsrc/databases/mysql56-server/Makefile:1.45       Sun Oct 25 22:38:58 2020
+++ pkgsrc/databases/mysql56-server/Makefile    Fri Feb  5 09:28:07 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2020/10/25 22:38:58 jnemeth Exp $
+# $NetBSD: Makefile,v 1.46 2021/02/05 09:28:07 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-#PKGREVISION=  1
 COMMENT=       MySQL 5, a free SQL database (server)
 
 CONFLICTS=     mysql3-server-[0-9]*

Index: pkgsrc/databases/mysql56-server/PLIST
diff -u pkgsrc/databases/mysql56-server/PLIST:1.39 pkgsrc/databases/mysql56-server/PLIST:1.40
--- pkgsrc/databases/mysql56-server/PLIST:1.39  Sun Oct 25 22:38:58 2020
+++ pkgsrc/databases/mysql56-server/PLIST       Fri Feb  5 09:28:07 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2020/10/25 22:38:58 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.40 2021/02/05 09:28:07 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -593,6 +593,7 @@ share/mysql/test/include/mrr_innodb_test
 share/mysql/test/include/mrr_tests.inc
 share/mysql/test/include/mtr_check.sql
 share/mysql/test/include/mtr_warnings.sql
+share/mysql/test/include/mysql_have_debug.inc
 share/mysql/test/include/mysql_upgrade_preparation.inc
 share/mysql/test/include/mysqlbinlog_have_debug.inc
 share/mysql/test/include/mysqlbinlog_raw_mode.inc