[pkgsrc/pkgsrc-2016Q3]: pkgsrc/databases Pullup ticket #5142 - requested by taca

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2016Q3]: pkgsrc/databases Pullup ticket #5142 - requested by taca
From: bsiegert <bsiegert%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 12:53:07 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/9a7c5154b390
branches:  pkgsrc-2016Q3
changeset: 408796:9a7c5154b390
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Oct 22 16:18:27 2016 +0000

description:
Pullup ticket #5142 - requested by taca
databases/mysql56-client: security fix
databases/mysql56-server: security fix

Revisions pulled up:
- databases/mysql56-client/Makefile.common                      1.36-1.37
- databases/mysql56-client/distinfo                             1.38-1.39
- databases/mysql56-client/patches/patch-client_mysql.cc        deleted
- databases/mysql56-client/patches/patch-cmake_readline.cmake   1.4
- databases/mysql56-server/PLIST                                1.27

---
   Module Name: pkgsrc
   Committed By:        fhajny
   Date:                Fri Sep 30 11:54:49 UTC 2016

   Modified Files:
        pkgsrc/databases/mysql56-client: Makefile.common distinfo
        pkgsrc/databases/mysql56-client/patches: patch-cmake_readline.cmake
   Removed Files:
        pkgsrc/databases/mysql56-client/patches: patch-client_mysql.cc

   Log Message:
   Change the way readline/editline support is patched, based on what
   mysql57-client has. This fixes at least SmartOS builds, no changes for
   NetBSD (and presumably elsewhere).

---
   Module Name: pkgsrc
   Committed By:        adam
   Date:                Wed Oct 12 16:58:21 UTC 2016

   Modified Files:
        pkgsrc/databases/mysql56-client: Makefile.common distinfo
        pkgsrc/databases/mysql56-server: PLIST

   Log Message:
   Changes 5.6.34:
   Packaging Notes
   ---------------
   RPM and Debian packages now create the /var/lib/mysql-files directory, which is now the default value of the secure_file_priv system variable that specifies a directory for import and export 
operations.

   Security Notes
   --------------
   Incompatible Change: The secure_file_priv system variable is used to limit the effect of data import and export operations.

   Functionality Added or Changed
   ------------------------------
   yaSSL was upgraded to version 2.4.2. This upgrade corrects issues with: Potential AES side channel leaks; DSA padding for unusual sizes; the SSL_CTX_load_verify_locations() OpenSSL compatibility 
function failing to handle long path directory names.

diffstat:

 databases/mysql56-client/Makefile.common                    |  12 ++-
 databases/mysql56-client/distinfo                           |  13 +--
 databases/mysql56-client/patches/patch-client_mysql.cc      |  13 ----
 databases/mysql56-client/patches/patch-cmake_readline.cmake |  41 +++---------
 databases/mysql56-server/PLIST                              |  12 +++-
 5 files changed, 36 insertions(+), 55 deletions(-)

diffs (163 lines):

diff -r 8595fcaf2795 -r 9a7c5154b390 databases/mysql56-client/Makefile.common
--- a/databases/mysql56-client/Makefile.common  Sat Oct 22 16:02:56 2016 +0000
+++ b/databases/mysql56-client/Makefile.common  Sat Oct 22 16:18:27 2016 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.35 2016/09/07 12:58:25 adam Exp $
+# $NetBSD: Makefile.common,v 1.35.2.1 2016/10/22 16:18:27 bsiegert Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
 
-DISTNAME=      mysql-5.6.33
+DISTNAME=      mysql-5.6.34
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_MYSQL:=MySQL-5.6/}
 
@@ -124,8 +124,10 @@
 .endif
 
 .include "../../mk/readline.buildlink3.mk"
-
-CMAKE_ARGS+=   -DWITH_EDITLINE=system
-CMAKE_ARGS+=   -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline
+.if ${READLINE_TYPE} == "readline"
+CMAKE_ARGS+=           -DWITH_READLINE="system"
+.else
+CMAKE_ARGS+=           -DWITH_EDITLINE="system"
+.endif
 
 .include "../../devel/zlib/buildlink3.mk"
diff -r 8595fcaf2795 -r 9a7c5154b390 databases/mysql56-client/distinfo
--- a/databases/mysql56-client/distinfo Sat Oct 22 16:02:56 2016 +0000
+++ b/databases/mysql56-client/distinfo Sat Oct 22 16:18:27 2016 +0000
@@ -1,22 +1,21 @@
-$NetBSD: distinfo,v 1.37 2016/09/07 12:58:25 adam Exp $
+$NetBSD: distinfo,v 1.37.2.1 2016/10/22 16:18:27 bsiegert Exp $
 
-SHA1 (mysql-5.6.33.tar.gz) = 4f1c2e25ce681f92862a75ad52012fbe4017bf42
-RMD160 (mysql-5.6.33.tar.gz) = 2fa192fa1cec9d791cfa9b7347cb5cd9adc7944f
-SHA512 (mysql-5.6.33.tar.gz) = d6f96dfd379b7ddaf3897a04ad756169a9d71319894551cba561e5ab2298dc21526004f656f50850c81bbe52af158926f87badc34d07b2b92107bc136e08359a
-Size (mysql-5.6.33.tar.gz) = 32094894 bytes
+SHA1 (mysql-5.6.34.tar.gz) = b352b44385668f0d327d3f275f33f660d85497b3
+RMD160 (mysql-5.6.34.tar.gz) = 4095f4276623432d235211a445b5d5f540658b2d
+SHA512 (mysql-5.6.34.tar.gz) = 2395455d6b62161695b6923a3da05480f5a6044e695adf3619459655adbfa63e9c82abbbe20f2ba1096a5900bb850af8b5b3a9306526fceb42f4479bae5dd6f2
+Size (mysql-5.6.34.tar.gz) = 32094762 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
 Size (sphinx-2.2.11-release.tar.gz) = 3061998 bytes
 SHA1 (patch-CMakeLists.txt) = cc14caabcb6ca55eba33595f98ad4b3db14504da
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
-SHA1 (patch-client_mysql.cc) = 8f1fabf6f975dbffbeaef13426a43f9b7f4d5336
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
 SHA1 (patch-client_sql_string.h) = f26aff4ce4cf6dfef44c85ef95120331ca8fef52
 SHA1 (patch-cmake_dtrace.cmake) = d953fdf976f3a7e7f0c2c16a9a2d2615f2777396
 SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
 SHA1 (patch-cmake_plugin.cmake) = 03e7a7debd61e870bd76d5c5b253a620662b3595
-SHA1 (patch-cmake_readline.cmake) = 5436d4bf4148e97deef2a9811a09e54503a4e744
+SHA1 (patch-cmake_readline.cmake) = 6bec6ca87b45c739d0614493477a18bb7c56d981
 SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247
 SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4
 SHA1 (patch-include_my__global.h) = 843b9527faf880eee59cf02239ba601f5985ddfb
diff -r 8595fcaf2795 -r 9a7c5154b390 databases/mysql56-client/patches/patch-client_mysql.cc
--- a/databases/mysql56-client/patches/patch-client_mysql.cc    Sat Oct 22 16:02:56 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-client_mysql.cc,v 1.1 2015/10/07 11:22:00 adam Exp $
-
---- client/mysql.cc.orig       2015-10-07 10:53:49.000000000 +0000
-+++ client/mysql.cc
-@@ -97,7 +97,7 @@ extern "C" {
- #if defined(__WIN__)
- #include <conio.h>
- #else
--#include <readline.h>
-+#include <readline/readline.h>
- #define HAVE_READLINE
- #define USE_POPEN
- #endif
diff -r 8595fcaf2795 -r 9a7c5154b390 databases/mysql56-client/patches/patch-cmake_readline.cmake
--- a/databases/mysql56-client/patches/patch-cmake_readline.cmake       Sat Oct 22 16:02:56 2016 +0000
+++ b/databases/mysql56-client/patches/patch-cmake_readline.cmake       Sat Oct 22 16:18:27 2016 +0000
@@ -1,36 +1,19 @@
-$NetBSD: patch-cmake_readline.cmake,v 1.3 2015/10/07 11:22:00 adam Exp $
+$NetBSD: patch-cmake_readline.cmake,v 1.3.8.1 2016/10/22 16:18:27 bsiegert Exp $
+
+Fix for pkgsrc editline.
 
-* If devel/editline is installed and use base libedit, cmake
-  readline.h detection fails. Disable mis-detection of
-  /usr/pkg/include/editline/readline.h.
-
---- cmake/readline.cmake.orig  2013-05-21 15:18:39.000000000 +0000
+--- cmake/readline.cmake.orig  2016-08-26 11:22:35.000000000 +0000
 +++ cmake/readline.cmake
-@@ -130,9 +130,6 @@ MACRO (MYSQL_USE_BUNDLED_EDITLINE)
- ENDMACRO()
+@@ -131,10 +131,10 @@ ENDMACRO()
  
  MACRO (FIND_SYSTEM_EDITLINE)
--  FIND_PATH(FOUND_EDITLINE_READLINE
+   FIND_PATH(FOUND_EDITLINE_READLINE
 -    NAMES editline/readline.h
--  )
++    NAMES readline/readline.h
+   )
    IF(FOUND_EDITLINE_READLINE)
-     SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
+-    SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
++    SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/readline")
    ELSE()
-@@ -160,7 +157,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
-     SET(CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
-     CHECK_CXX_SOURCE_COMPILES("
-     #include <stdio.h>
--    #include <readline.h>
-+    #include <readline/readline.h>
-     int main(int argc, char **argv)
-     {
-        HIST_ENTRY entry;
-@@ -170,7 +167,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
- 
-     CHECK_CXX_SOURCE_COMPILES("
-     #include <stdio.h>
--    #include <readline.h>
-+    #include <readline/readline.h>
-     int main(int argc, char **argv)
-     {
-       typedef int MYFunction(const char*, int);
+     # Different path on FreeBSD
+     FIND_PATH(FOUND_EDIT_READLINE_READLINE
diff -r 8595fcaf2795 -r 9a7c5154b390 databases/mysql56-server/PLIST
--- a/databases/mysql56-server/PLIST    Sat Oct 22 16:02:56 2016 +0000
+++ b/databases/mysql56-server/PLIST    Sat Oct 22 16:18:27 2016 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2016/09/07 12:58:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.26.2.1 2016/10/22 16:18:27 bsiegert Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -1898,6 +1898,11 @@
 share/mysql/test/suite/auth_sec/r/not_ssl.require
 share/mysql/test/suite/auth_sec/r/openssl.require
 share/mysql/test/suite/auth_sec/r/password_expired.result
+share/mysql/test/suite/auth_sec/r/secure_file_priv_error.result
+share/mysql/test/suite/auth_sec/r/secure_file_priv_null.result
+share/mysql/test/suite/auth_sec/r/secure_file_priv_warnings.result
+share/mysql/test/suite/auth_sec/r/secure_file_priv_warnings_not_win.result
+share/mysql/test/suite/auth_sec/r/secure_file_priv_warnings_win.result
 share/mysql/test/suite/auth_sec/r/server_withoutssl_client_withoutssl.result
 share/mysql/test/suite/auth_sec/r/server_withoutssl_client_withssl.result
 share/mysql/test/suite/auth_sec/r/server_withssl_client_withoutssl.result
@@ -1919,6 +1924,11 @@
 share/mysql/test/suite/auth_sec/t/mysql_sha256_plugin.test
 share/mysql/test/suite/auth_sec/t/password_expired-master.opt
 share/mysql/test/suite/auth_sec/t/password_expired.test
+share/mysql/test/suite/auth_sec/t/secure_file_priv_error.test
+share/mysql/test/suite/auth_sec/t/secure_file_priv_null.test
+share/mysql/test/suite/auth_sec/t/secure_file_priv_warnings.test
+share/mysql/test/suite/auth_sec/t/secure_file_priv_warnings_not_win.test
+share/mysql/test/suite/auth_sec/t/secure_file_priv_warnings_win.test
 share/mysql/test/suite/auth_sec/t/server_withoutssl_client_withoutssl.test
 share/mysql/test/suite/auth_sec/t/server_withoutssl_client_withssl.test
 share/mysql/test/suite/auth_sec/t/server_withssl_client_withoutssl-master.opt
Prev by Date: [pkgsrc/pkgsrc-2016Q3]: pkgsrc/lang Pullup ticket #5140 - requested by taca
Next by Date: [pkgsrc/pkgsrc-2016Q3]: pkgsrc/databases Pullup ticket #5141 - requested by taca
Previous by Thread: [pkgsrc/pkgsrc-2016Q3]: pkgsrc/lang Pullup ticket #5140 - requested by taca
Next by Thread: [pkgsrc/pkgsrc-2016Q3]: pkgsrc/databases Pullup ticket #5141 - requested by taca
Indexes:
Home | Main Index | Thread Index | Old Index