head 1.4; access; symbols pkgsrc-2021Q1:1.3.0.34 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.32 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.30 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.26 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.6 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.28 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.24 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.22 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.20 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.18 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.16 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.14 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.12 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.10 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.8 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.4 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.2 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.2.0.14 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.12 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.10 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.8 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.6 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.4 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.2 pkgsrc-2015Q2-base:1.2; locks; strict; comment @# @; 1.4 date 2021.05.13.11.04.43; author nia; state dead; branches; next 1.3; commitid zFc4Kz2fU7I2FYSC; 1.3 date 2017.02.03.16.20.18; author roy; state Exp; branches; next 1.2; commitid hEJ0UQASCLPkywEz; 1.2 date 2015.05.07.12.45.29; author fhajny; state Exp; branches; next 1.1; commitid DX2hQUV4EHGaSvky; 1.1 date 2015.04.16.20.20.15; author ryoon; state Exp; branches; next ; commitid 916JhNYlUmQ34Rhy; desc @@ 1.4 log @Remove mariadb55, EOL since April 2020. @ text @$NetBSD: patch-cmake_readline.cmake,v 1.3 2017/02/03 16:20:18 roy Exp $ --- cmake/readline.cmake.orig 2016-09-12 14:54:54.000000000 +0000 +++ cmake/readline.cmake @@@@ -180,8 +180,11 @@@@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT) #include int main(int argc, char **argv) { - int res= (*rl_completion_entry_function)(0,0); + typedef char * MYFunction(const char*, int); + MYFunction* myf= rl_completion_entry_function; + char * res= (myf)(NULL, 0); completion_matches(0,0); + return 0; }" LIBEDIT_INTERFACE) SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE}) @ 1.3 log @Fix build with clang and libedit. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @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/ @ text @d3 1 a3 3 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 d5 1 a5 39 @@@@ -132,7 +132,7 @@@@ MACRO (MYSQL_FIND_SYSTEM_READLINE) SET(CMAKE_REQUIRED_INCLUDES ${READLINE_INCLUDE_DIR}) CHECK_CXX_SOURCE_COMPILES(" #include - #include + #include int main(int argc, char **argv) { rl_completion_func_t *func1= (rl_completion_func_t*)0; @@@@ -142,7 +142,7 @@@@ MACRO (MYSQL_FIND_SYSTEM_READLINE) CHECK_C_SOURCE_COMPILES(" #include - #include + #include #if RL_VERSION_MAJOR > 5 #error #endif @@@@ -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) d10 1 a10 1 + typedef int MYFunction(const char*, int); d12 1 a12 1 + int res= (myf)(NULL, 0); d14 1 a14 1 + return res; a17 35 @@@@ -195,32 +211,13 @@@@ MACRO (MYSQL_CHECK_READLINE) SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline") FIND_CURSES() - IF(WITH_READLINE) - MYSQL_USE_BUNDLED_READLINE() - ELSE() - # OSX includes incompatible readline lib - IF (NOT APPLE) - MYSQL_FIND_SYSTEM_READLINE() - ENDIF() - IF(USE_NEW_READLINE_INTERFACE) - SET(MY_READLINE_INCLUDE_DIR ${READLINE_INCLUDE_DIR}) - SET(MY_READLINE_LIBRARY ${READLINE_LIBRARY} ${CURSES_LIBRARY}) - ELSE() - MYSQL_FIND_SYSTEM_LIBEDIT() - IF(USE_LIBEDIT_INTERFACE) - SET(MY_READLINE_INCLUDE_DIR ${LIBEDIT_INCLUDE_DIR}) - SET(MY_READLINE_LIBRARY ${LIBEDIT_LIBRARY} ${CURSES_LIBRARY}) - ELSE() - MYSQL_USE_BUNDLED_READLINE() - ENDIF() - ENDIF() - ENDIF() + MYSQL_FIND_SYSTEM_READLINE() SET(CMAKE_REQUIRED_LIBRARIES ${MY_READLINE_LIBRARY}) SET(CMAKE_REQUIRED_INCLUDES ${MY_READLINE_INCLUDE_DIR}) CHECK_CXX_SOURCE_COMPILES(" #include - #include + #include int main(int argc, char **argv) { HIST_ENTRY entry; @ 1.1 log @Import mariadb-client-5.5.42 as databases/mariadb55-client. MariaDB is a fork of MySQL relational database management system. It is an enhanced, drop-in replacement for MySQL. This package contains client libraries. @ text @d1 1 a1 3 $NetBSD: patch-cmake_readline.cmake,v 1.1 2013/08/22 12:28:08 ryoon Exp $ * Fix cmake's check build error. Borrowed from mysql56's readline.cmake. d3 2 d25 21 a45 1 @@@@ -180,8 +180,11 @@@@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT) d58 1 a58 1 @@@@ -195,32 +198,13 @@@@ MACRO (MYSQL_CHECK_READLINE) @