From aeb8ae61cec8075470a648d36d7b9d40e2417ef8 Mon Sep 17 00:00:00 2001 From: fhajny Date: Thu, 7 May 2015 12:45:28 +0000 Subject: Update mariadb55-* to 5.5.43. pkgsrc changes: * Fix PLIST for dtrace and embedded-server options on and off. * Patch for when readline>6 is used where some deprecated symbols were removed. Fixes build with devel/readline. * DTrace support still not fixes for recent SunOS platforms. upstream changes: * XtraDB updated to 5.5.42-37.1 * TokuDB updated to version 7.5.6 * Fix for CVE-2015-0501 * Fix for CVE-2015-2571 * Fix for CVE-2015-0505 * Fix for CVE-2015-0499 See full changelog: https://mariadb.com/kb/en/mariadb/mariadb-5543-changelog/ --- databases/mariadb55-client/Makefile.common | 6 ++--- databases/mariadb55-client/PLIST | 4 +-- databases/mariadb55-client/buildlink3.mk | 4 +-- databases/mariadb55-client/distinfo | 17 +++++++----- databases/mariadb55-client/options.mk | 4 ++- .../mariadb55-client/patches/patch-CMakeLists.txt | 4 +-- .../mariadb55-client/patches/patch-client_mysql.cc | 23 ++++++++++++++++- .../patches/patch-cmake_dtrace.cmake | 21 +++++++++++++++ .../patches/patch-cmake_readline.cmake | 30 ++++++++++++++++++---- .../mariadb55-client/patches/patch-config.h.cmake | 12 +++++++++ .../patches/patch-include_my__context.h | 16 ++++++++++++ 11 files changed, 118 insertions(+), 23 deletions(-) create mode 100644 databases/mariadb55-client/patches/patch-cmake_dtrace.cmake create mode 100644 databases/mariadb55-client/patches/patch-config.h.cmake create mode 100644 databases/mariadb55-client/patches/patch-include_my__context.h (limited to 'databases/mariadb55-client') diff --git a/databases/mariadb55-client/Makefile.common b/databases/mariadb55-client/Makefile.common index d168f5ff4bc..96a5abe3bea 100644 --- a/databases/mariadb55-client/Makefile.common +++ b/databases/mariadb55-client/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.1 2015/04/16 20:20:15 ryoon Exp $ +# $NetBSD: Makefile.common,v 1.2 2015/05/07 12:45:28 fhajny Exp $ # # used by databases/mariadb55-client/Makefile # used by databases/mariadb55-server/Makefile -DISTNAME= mariadb-5.5.42 +DISTNAME= mariadb-5.5.43 CATEGORIES= databases -MASTER_SITES= https://downloads.mariadb.org/f/mariadb-5.5.42/source/ +MASTER_SITES= https://downloads.mariadb.org/f/${DISTNAME}/source/ MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.mariadb.org/ diff --git a/databases/mariadb55-client/PLIST b/databases/mariadb55-client/PLIST index 88a4b3d9d20..e65bfcc5612 100644 --- a/databases/mariadb55-client/PLIST +++ b/databases/mariadb55-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2015/04/16 20:20:15 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2015/05/07 12:45:28 fhajny Exp $ bin/msql2mysql bin/mysql bin/mysql_client_test @@ -105,7 +105,7 @@ include/mysql/private/mysqld_default_groups.h include/mysql/private/mysys_err.h include/mysql/private/password.h include/mysql/private/probes_mysql.h -include/mysql/private/probes_mysql_dtrace.h +${PLIST.dtrace}include/mysql/private/probes_mysql_dtrace.h include/mysql/private/probes_mysql_nodtrace.h include/mysql/private/queues.h include/mysql/private/rijndael.h diff --git a/databases/mariadb55-client/buildlink3.mk b/databases/mariadb55-client/buildlink3.mk index 8d6f8b3a841..62e3f35dd19 100644 --- a/databases/mariadb55-client/buildlink3.mk +++ b/databases/mariadb55-client/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/04/16 20:20:15 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2015/05/07 12:45:28 fhajny Exp $ BUILDLINK_TREE+= mariadb-client .if !defined(MARIADB_CLIENT_BUILDLINK3_MK) MARIADB_CLIENT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.mariadb-client+= mariadb-client>=5.5.42 +BUILDLINK_API_DEPENDS.mariadb-client+= mariadb-client>=5.5.43 BUILDLINK_PKGSRCDIR.mariadb-client?= ../../databases/mariadb55-client BUILDLINK_PKGSRCDIR.mariadb-client?= ../../databases/mariadb55-client BUILDLINK_INCDIRS.mariadb-client?= include/mysql diff --git a/databases/mariadb55-client/distinfo b/databases/mariadb55-client/distinfo index f15d7f155e7..da74106ab97 100644 --- a/databases/mariadb55-client/distinfo +++ b/databases/mariadb55-client/distinfo @@ -1,22 +1,25 @@ -$NetBSD: distinfo,v 1.1 2015/04/16 20:20:15 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2015/05/07 12:45:28 fhajny Exp $ -SHA1 (mariadb-5.5.42.tar.gz) = df5164df0ff3f21fac4400932dc075864b0fac98 -RMD160 (mariadb-5.5.42.tar.gz) = d9633171d9184498dba14837d1cf307fd4342079 -Size (mariadb-5.5.42.tar.gz) = 45586372 bytes +SHA1 (mariadb-5.5.43.tar.gz) = 80223c91ecda64ec30a5056af225eee39a3782fd +RMD160 (mariadb-5.5.43.tar.gz) = 93296e8d9e14949d47d4d0195f566891ba83bc76 +Size (mariadb-5.5.43.tar.gz) = 45651398 bytes SHA1 (sphinx-2.2.7-release.tar.gz) = dedae28c0deafda90109745230dacbe0dc441e1a RMD160 (sphinx-2.2.7-release.tar.gz) = d9f0150f6779b43457e30c77be50aa9bc658b03a Size (sphinx-2.2.7-release.tar.gz) = 2969037 bytes SHA1 (patch-BUILD_compile-pentium-gcov) = 02b414235a2cdfc1d5c95946010e0cdbada76c5d -SHA1 (patch-CMakeLists.txt) = cc69f38e761ee5956dde27745377acde1728d63b +SHA1 (patch-CMakeLists.txt) = 9c56523626837ab83ecef26f1c0609e084976fa7 SHA1 (patch-client_completion_hash.cc) = 810dab31e17a19804323059d38f5ec7f0d55c3ab -SHA1 (patch-client_mysql.cc) = a5296801f6960f77da12eeb749cc32a86f6bc545 +SHA1 (patch-client_mysql.cc) = bb50cbd627ce71bcc792ad285016e0269dbc741c SHA1 (patch-client_mysqladmin.cc) = ab05c6944d50c9b22365426656f0b61a5906d632 SHA1 (patch-client_mysqlbinlog.cc) = 00146dfd7d0a6e0bb1a8c30395bc707af3b4a6c7 SHA1 (patch-client_mysqlshow.c) = 82ddfb98ab85b3e96e56b5ecc0df25cc315b8dbc +SHA1 (patch-cmake_dtrace.cmake) = 460799dee4d7f9d6c1e3b2dbf0412f8576297991 SHA1 (patch-cmake_libutils.cmake) = 0c3f25f8e73ab0a062b539a8d551342a6ddf57c4 SHA1 (patch-cmake_plugin.cmake) = b7566d25c80c2492a96c5617b96f9b6212b0fe93 -SHA1 (patch-cmake_readline.cmake) = 5b975b817c5c62712e061b121056816425368e92 +SHA1 (patch-cmake_readline.cmake) = eeadad96a6c8f042c82134b5488956f8094ba4ac +SHA1 (patch-config.h.cmake) = 75d4c09eb34353057c6a8e36523f55d1bfdace59 SHA1 (patch-include_CMakeLists.txt) = 9ce9db088fda6ed76039b818c27b74d584bae151 +SHA1 (patch-include_my__context.h) = 2f74d458d10c24261fdd532d197b84c44719c552 SHA1 (patch-include_my_compare.h) = 9d04f444d56d705f3a57add7ad5f8fc5c7ce8341 SHA1 (patch-include_my_net.h) = b6361a0871afdf66feabc82c5ad3559ff5b34c37 SHA1 (patch-include_my_pthread.h) = 6d4ec91f90e717b0a075133fea535ee62d64d3ef diff --git a/databases/mariadb55-client/options.mk b/databases/mariadb55-client/options.mk index 7d8596a2701..b6f514dcdd2 100644 --- a/databases/mariadb55-client/options.mk +++ b/databases/mariadb55-client/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2015/04/16 20:20:15 ryoon Exp $ +# $NetBSD: options.mk,v 1.2 2015/05/07 12:45:28 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mariadb55 @@ -17,8 +17,10 @@ CMAKE_ARGS+= -DWITH_SSL=no .endif # Enable DTrace support +PLIST_VARS+= dtrace .if !empty(PKG_OPTIONS:Mdtrace) CMAKE_ARGS+= -DENABLE_DTRACE=ON +PLIST.dtrace= yes .endif # Enable Sphinx SE support diff --git a/databases/mariadb55-client/patches/patch-CMakeLists.txt b/databases/mariadb55-client/patches/patch-CMakeLists.txt index ce0d5edf249..9d60f78e712 100644 --- a/databases/mariadb55-client/patches/patch-CMakeLists.txt +++ b/databases/mariadb55-client/patches/patch-CMakeLists.txt @@ -1,4 +1,4 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2015/04/16 20:20:15 ryoon Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2015/05/07 12:45:29 fhajny Exp $ Split configuration between mysql-client and mysql-server. Build with newer DTrace. @@ -9,7 +9,7 @@ Build with newer DTrace. SET(WITHOUT_DYNAMIC_PLUGINS 1) ENDIF() OPTION(ENABLED_PROFILING "Enable profiling" ON) -+OPTION(ENABLED_DTRACE "Include support for DTrace probes" OFF) ++OPTION(ENABLE_DTRACE "Include support for DTrace probes" OFF) OPTION(CYBOZU "" OFF) OPTION(BACKUP_TEST "" OFF) OPTION(WITHOUT_SERVER OFF) diff --git a/databases/mariadb55-client/patches/patch-client_mysql.cc b/databases/mariadb55-client/patches/patch-client_mysql.cc index 0f929e87dfd..71c4552a74d 100644 --- a/databases/mariadb55-client/patches/patch-client_mysql.cc +++ b/databases/mariadb55-client/patches/patch-client_mysql.cc @@ -1,4 +1,4 @@ -$NetBSD: patch-client_mysql.cc,v 1.1 2015/04/16 20:20:15 ryoon Exp $ +$NetBSD: patch-client_mysql.cc,v 1.2 2015/05/07 12:45:29 fhajny Exp $ --- client/mysql.cc.orig 2015-02-13 12:07:00.000000000 +0000 +++ client/mysql.cc @@ -11,3 +11,24 @@ $NetBSD: patch-client_mysql.cc,v 1.1 2015/04/16 20:20:15 ryoon Exp $ #define HAVE_READLINE #define USE_POPEN #endif +@@ -2640,7 +2640,11 @@ static void initialize_readline (char *n + rl_completion_entry_function= &no_completion; + rl_add_defun("magic-space", (Function*)&fake_magic_space, -1); + #else ++# if defined(USE_READLINE_V6) ++ rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion; ++# else + rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; ++# endif + rl_completion_entry_function= &no_completion; + #endif + } +@@ -2657,7 +2661,7 @@ static char **new_mysql_completion(const + int end __attribute__((unused))) + { + if (!status.batch && !quick) +-#if defined(USE_NEW_READLINE_INTERFACE) ++#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_READLINE_V6) + return rl_completion_matches(text, new_command_generator); + #else + return completion_matches((char *)text, (CPFunction *)new_command_generator); diff --git a/databases/mariadb55-client/patches/patch-cmake_dtrace.cmake b/databases/mariadb55-client/patches/patch-cmake_dtrace.cmake new file mode 100644 index 00000000000..23772af2947 --- /dev/null +++ b/databases/mariadb55-client/patches/patch-cmake_dtrace.cmake @@ -0,0 +1,21 @@ +$NetBSD: patch-cmake_dtrace.cmake,v 1.1 2015/05/07 12:45:29 fhajny Exp $ + +Build with newer DTrace. + +--- cmake/dtrace.cmake.orig 2014-05-10 22:36:23.000000000 +0000 ++++ cmake/dtrace.cmake +@@ -40,10 +40,10 @@ MACRO(CHECK_DTRACE) + ENDIF() + + # On FreeBSD, dtrace does not handle userland tracing yet +- IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD" +- AND NOT BUGGY_GCC_NO_DTRACE_MODULES +- AND NOT BUGGY_LINUX_DTRACE) +- SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace") ++ IF(ENABLE_DTRACE AND (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" ++ OR BUGGY_GCC_NO_DTRACE_MODULES ++ OR BUGGY_LINUX_DTRACE OR NOT DTRACE)) ++ MESSAGE(FATAL_ERROR "dtrace is not supported on this system") + ENDIF() + SET(HAVE_DTRACE ${ENABLE_DTRACE}) + IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") diff --git a/databases/mariadb55-client/patches/patch-cmake_readline.cmake b/databases/mariadb55-client/patches/patch-cmake_readline.cmake index d549bc39986..d867e5f624b 100644 --- a/databases/mariadb55-client/patches/patch-cmake_readline.cmake +++ b/databases/mariadb55-client/patches/patch-cmake_readline.cmake @@ -1,7 +1,7 @@ -$NetBSD: patch-cmake_readline.cmake,v 1.1 2015/04/16 20:20:15 ryoon Exp $ - -* Fix cmake's check build error. Borrowed from mysql56's readline.cmake. +$NetBSD: patch-cmake_readline.cmake,v 1.2 2015/05/07 12:45:29 fhajny Exp $ +Fix cmake's check build error. Borrowed from mysql56's readline.cmake. +Fi build with pkgsrc readline>=6 that removed some deprecated symbols. --- cmake/readline.cmake.orig 2015-02-13 12:07:00.000000000 +0000 +++ cmake/readline.cmake @@ -132,7 +132,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE) @@ -22,7 +22,27 @@ $NetBSD: patch-cmake_readline.cmake,v 1.1 2015/04/16 20:20:15 ryoon Exp $ #if RL_VERSION_MAJOR > 5 #error #endif -@@ -180,8 +180,11 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT) +@@ -152,6 +152,19 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE) + }" + READLINE_V5) + ++ CHECK_C_SOURCE_COMPILES(" ++ #include ++ #include ++ #if RL_VERSION_MAJOR < 6 ++ #error ++ #endif ++ int main(int argc, char **argv) ++ { ++ return 0; ++ }" ++ READLINE_V6) ++ SET(USE_READLINE_V6 ${READLINE_V6}) ++ + IF(NEW_READLINE_INTERFACE) + IF (READLINE_V5) + SET(USE_NEW_READLINE_INTERFACE 1) +@@ -180,8 +193,11 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT) #include int main(int argc, char **argv) { @@ -35,7 +55,7 @@ $NetBSD: patch-cmake_readline.cmake,v 1.1 2015/04/16 20:20:15 ryoon Exp $ }" LIBEDIT_INTERFACE) SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE}) -@@ -195,32 +198,13 @@ MACRO (MYSQL_CHECK_READLINE) +@@ -195,32 +211,13 @@ MACRO (MYSQL_CHECK_READLINE) SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline") FIND_CURSES() diff --git a/databases/mariadb55-client/patches/patch-config.h.cmake b/databases/mariadb55-client/patches/patch-config.h.cmake new file mode 100644 index 00000000000..5fe995b1bc6 --- /dev/null +++ b/databases/mariadb55-client/patches/patch-config.h.cmake @@ -0,0 +1,12 @@ +$NetBSD: patch-config.h.cmake,v 1.1 2015/05/07 12:45:29 fhajny Exp $ + +--- config.h.cmake.orig 2015-02-13 12:07:00.000000000 +0000 ++++ config.h.cmake +@@ -126,6 +126,7 @@ + #cmakedefine HAVE_HIST_ENTRY 1 + #cmakedefine USE_LIBEDIT_INTERFACE 1 + #cmakedefine USE_NEW_READLINE_INTERFACE 1 ++#cmakedefine USE_READLINE_V6 1 + + #cmakedefine FIONREAD_IN_SYS_IOCTL 1 + #cmakedefine GWINSZ_IN_SYS_IOCTL 1 diff --git a/databases/mariadb55-client/patches/patch-include_my__context.h b/databases/mariadb55-client/patches/patch-include_my__context.h new file mode 100644 index 00000000000..00229152742 --- /dev/null +++ b/databases/mariadb55-client/patches/patch-include_my__context.h @@ -0,0 +1,16 @@ +$NetBSD: patch-include_my__context.h,v 1.1 2015/05/07 12:45:29 fhajny Exp $ + +--- include/my_context.h.orig 2015-02-13 12:07:01.000000000 +0000 ++++ include/my_context.h +@@ -27,9 +27,9 @@ + + #ifdef __WIN__ + #define MY_CONTEXT_USE_WIN32_FIBERS 1 +-#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && !defined(__ILP32__) ++#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && !defined(__ILP32__) && !defined(__sun) + #define MY_CONTEXT_USE_X86_64_GCC_ASM +-#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) ++#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) && !defined(__sun) + #define MY_CONTEXT_USE_I386_GCC_ASM + #elif defined(HAVE_UCONTEXT) + #define MY_CONTEXT_USE_UCONTEXT -- cgit v1.2.3