Date: Sun, 27 Mar 2016 20:57:51 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412011 - in head/databases: mariadb101-client mariadb101-client/files mariadb101-server mariadb101-server/files Message-ID: <201603272057.u2RKvpk8075614@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sun Mar 27 20:57:51 2016 New Revision: 412011 URL: https://svnweb.freebsd.org/changeset/ports/412011 Log: databases/mariadb101-{server,client}: Update to 10.1.13 - Update to version 10.1.13 - Make GSSAPI plugin optional [2] - Remove patches that are merged upstream - Re-generate patches that required fuzzing - Server - Fix OQGraph build failure [1] - Install server gssapi plugin only - Don't install gssapi libs/files that were moved to -client - Add license and readme file for TokuDB - Add tokuft_logprint and tokuftdump binaries - Client - Install client gssapi plugin - Enable PLIST_SUB for optional gssapi plugin - Add new plugins and ini file - Remove taocrypt patch, we don't build bundled SSL PR: 207675 [1], 207883 [2] Reviewed by: feld (mentor) Approved by: feld (mentor) Differential Revision: D5751 Added: head/databases/mariadb101-client/files/patch-include_my__compare.h - copied unchanged from r411925, head/databases/mariadb101-client/files/patch-include_my_compare.h head/databases/mariadb101-client/files/patch-mysys_my__default.c - copied, changed from r411925, head/databases/mariadb101-client/files/patch-mysys_my_default.c head/databases/mariadb101-client/files/patch-scripts_mysql__config.sh - copied unchanged from r411925, head/databases/mariadb101-client/files/patch-scripts_mysql_config.sh head/databases/mariadb101-server/files/patch-storage_oqgraph_graphcore.cc (contents, props changed) head/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h (contents, props changed) head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt (contents, props changed) Deleted: head/databases/mariadb101-client/files/patch-cmake_jemalloc.cmake head/databases/mariadb101-client/files/patch-extra_yassl_taocrypt_src_integer.cpp head/databases/mariadb101-client/files/patch-include_my_compare.h head/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h head/databases/mariadb101-client/files/patch-mysys_my_default.c head/databases/mariadb101-client/files/patch-scripts_mysql_config.sh head/databases/mariadb101-server/files/patch-cmake_jemalloc.cmake head/databases/mariadb101-server/files/patch-include_mysql_service__encryption.h head/databases/mariadb101-server/files/patch-plugin_auth__gssapi_gssapi__server.cc head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_buildheader_CMakeLists.txt head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake Modified: head/databases/mariadb101-client/Makefile head/databases/mariadb101-client/files/patch-CMakeLists.txt head/databases/mariadb101-client/files/patch-cmake_ssl.cmake head/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt head/databases/mariadb101-client/pkg-plist head/databases/mariadb101-server/Makefile head/databases/mariadb101-server/distinfo head/databases/mariadb101-server/files/patch-CMakeLists.txt head/databases/mariadb101-server/files/patch-cmake_ssl.cmake head/databases/mariadb101-server/files/patch-extra_CMakeLists.txt head/databases/mariadb101-server/files/patch-mysys_my__default.c head/databases/mariadb101-server/files/patch-pcre_CMakeLists.txt head/databases/mariadb101-server/files/patch-sql_sys__vars.cc head/databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt head/databases/mariadb101-server/files/patch-support-files_CMakeLists.txt head/databases/mariadb101-server/pkg-plist Modified: head/databases/mariadb101-client/Makefile ============================================================================== --- head/databases/mariadb101-client/Makefile Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-client/Makefile Sun Mar 27 20:57:51 2016 (r412011) @@ -26,7 +26,13 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${b} . endfor ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.18 +. for b in dialog.so mysql_clear_password.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/${b} +. endfor # Fix https://mariadb.atlassian.net/browse/MDEV-9388 @${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config +post-install-GSSAPI_NONE: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so + .include "${MASTERDIR}/Makefile" Modified: head/databases/mariadb101-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mariadb101-client/files/patch-CMakeLists.txt Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-client/files/patch-CMakeLists.txt Sun Mar 27 20:57:51 2016 (r412011) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2015-12-23 15:33:29 UTC +--- CMakeLists.txt.orig 2016-03-24 09:12:10 UTC +++ CMakeLists.txt -@@ -382,7 +382,6 @@ ADD_SUBDIRECTORY(libmysql) +@@ -380,7 +380,6 @@ ADD_SUBDIRECTORY(libmysql) ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) @@ -8,7 +8,7 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(tests) -@@ -461,6 +460,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -460,6 +459,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) @@ -16,7 +16,7 @@ INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty EXCEPTIONS-CLIENT COMPONENT Readme) # MDEV-6526 these files are not installed anymore -@@ -471,6 +471,7 @@ IF(UNIX) +@@ -470,6 +470,7 @@ IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) ENDIF() Modified: head/databases/mariadb101-client/files/patch-cmake_ssl.cmake ============================================================================== --- head/databases/mariadb101-client/files/patch-cmake_ssl.cmake Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-client/files/patch-cmake_ssl.cmake Sun Mar 27 20:57:51 2016 (r412011) @@ -1,7 +1,7 @@ MariaDB prefers static libraries, breaks builds with ports' OpenSSL libs ---- cmake/ssl.cmake.orig 2015-12-23 15:33:29 UTC +--- cmake/ssl.cmake.orig 2016-03-24 09:12:10 UTC +++ cmake/ssl.cmake @@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL) @@ -16,3 +16,16 @@ ports' OpenSSL libs FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD HINTS ${OPENSSL_ROOT_DIR}/lib) +@@ -156,9 +156,9 @@ MACRO (MYSQL_CHECK_SSL) + HINTS ${OPENSSL_ROOT_DIR}/lib) + MARK_AS_ADVANCED(CRYPTO_LIBRARY OPENSSL_LIBRARIES OPENSSL_ROOT_DIR + OPENSSL_INCLUDE_DIR) +- IF (WITH_SSL_PATH) +- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) +- ENDIF() ++# IF (WITH_SSL_PATH) ++# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) ++# ENDIF() + + INCLUDE(CheckSymbolExists) + SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) Copied: head/databases/mariadb101-client/files/patch-include_my__compare.h (from r411925, head/databases/mariadb101-client/files/patch-include_my_compare.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb101-client/files/patch-include_my__compare.h Sun Mar 27 20:57:51 2016 (r412011, copy of r411925, head/databases/mariadb101-client/files/patch-include_my_compare.h) @@ -0,0 +1,11 @@ +--- include/my_compare.h.orig 2015-12-23 15:33:29 UTC ++++ include/my_compare.h +@@ -40,7 +40,7 @@ extern "C" { + But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. + */ + +-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ ++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ + #define HA_MAX_KEY_SEG 32 /* Max segments for key */ + + #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) Copied and modified: head/databases/mariadb101-client/files/patch-mysys_my__default.c (from r411925, head/databases/mariadb101-client/files/patch-mysys_my_default.c) ============================================================================== --- head/databases/mariadb101-client/files/patch-mysys_my_default.c Sat Mar 26 12:36:59 2016 (r411925, copy source) +++ head/databases/mariadb101-client/files/patch-mysys_my__default.c Sun Mar 27 20:57:51 2016 (r412011) @@ -1,4 +1,4 @@ ---- mysys/my_default.c.orig 2015-12-23 15:33:31 UTC +--- mysys/my_default.c.orig 2016-03-24 09:12:11 UTC +++ mysys/my_default.c @@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA @@ -9,7 +9,7 @@ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -784,7 +784,7 @@ static int search_default_file_with_ext( +@@ -785,7 +785,7 @@ static int search_default_file_with_ext( { MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(0))) @@ -18,7 +18,7 @@ /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -802,6 +802,14 @@ static int search_default_file_with_ext( +@@ -803,6 +803,14 @@ static int search_default_file_with_ext( if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) return 1; /* Ignore wrong files */ @@ -33,7 +33,7 @@ while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) { line++; -@@ -1066,7 +1074,8 @@ void my_print_default_files(const char * +@@ -1067,7 +1075,8 @@ void my_print_default_files(const char * if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ *end++= '.'; strxmov(end, conf_file, *ext, " ", NullS); @@ -43,7 +43,7 @@ } } } -@@ -1222,13 +1231,10 @@ static const char **init_default_directo +@@ -1223,13 +1232,10 @@ static const char **init_default_directo #else Modified: head/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt Sun Mar 27 20:57:51 2016 (r412011) @@ -1,4 +1,4 @@ ---- scripts/CMakeLists.txt.orig 2015-12-23 15:33:31 UTC +--- scripts/CMakeLists.txt.orig 2016-03-24 09:12:11 UTC +++ scripts/CMakeLists.txt @@ -73,6 +73,7 @@ IF(UNIX) ) @@ -8,7 +8,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -84,6 +85,7 @@ INSTALL(FILES +@@ -82,6 +83,7 @@ INSTALL(FILES ${FIX_PRIVILEGES_SQL} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) @@ -16,7 +16,7 @@ # TCMalloc hacks IF(MALLOC_LIB) -@@ -136,6 +138,7 @@ ENDIF() +@@ -134,6 +136,7 @@ ENDIF() SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") @@ -24,7 +24,7 @@ # Required for mysqlbug until autotools are deprecated, once done remove these # and expand default cmake variables SET(CC ${CMAKE_C_COMPILER}) -@@ -170,6 +173,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI +@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI DESTINATION ${INSTALL_BINDIR} COMPONENT Server ) @@ -32,7 +32,7 @@ ENDIF(UNIX) -@@ -195,6 +199,7 @@ ELSE() +@@ -193,6 +197,7 @@ ELSE() SET(localstatedir ${MYSQL_DATADIR}) ENDIF() @@ -40,7 +40,7 @@ IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -208,6 +213,7 @@ INSTALL_SCRIPT( +@@ -206,6 +211,7 @@ INSTALL_SCRIPT( COMPONENT Server ) ENDIF() @@ -48,7 +48,7 @@ SET(prefix "${CMAKE_INSTALL_PREFIX}") IF(INSTALL_SYSCONFDIR) -@@ -286,18 +292,8 @@ ELSE() +@@ -284,18 +290,8 @@ ELSE() SET(BIN_SCRIPTS msql2mysql mysql_config Copied: head/databases/mariadb101-client/files/patch-scripts_mysql__config.sh (from r411925, head/databases/mariadb101-client/files/patch-scripts_mysql_config.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb101-client/files/patch-scripts_mysql__config.sh Sun Mar 27 20:57:51 2016 (r412011, copy of r411925, head/databases/mariadb101-client/files/patch-scripts_mysql_config.sh) @@ -0,0 +1,12 @@ +--- scripts/mysql_config.sh.orig 2016-01-14 20:12:38 UTC ++++ scripts/mysql_config.sh +@@ -106,7 +106,9 @@ fi + + # Create options + libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" ++libs="$libs -L%%LOCALBASE%%/lib " + embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" ++embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " + + include="-I$pkgincludedir" + if [ "$basedir" != "/usr" ]; then Modified: head/databases/mariadb101-client/pkg-plist ============================================================================== --- head/databases/mariadb101-client/pkg-plist Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-client/pkg-plist Sun Mar 27 20:57:51 2016 (r412011) @@ -93,6 +93,12 @@ lib/mysql/libmysqlclient.so.18 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.18 +%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so +lib/mysql/plugin/daemon_example.ini +lib/mysql/plugin/dialog.so +lib/mysql/plugin/mysql_clear_password.so +%%DATADIR%%/maria_add_gis_sp.sql +%%DATADIR%%/maria_add_gis_sp_bootstrap.sql man/man1/msql2mysql.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz Modified: head/databases/mariadb101-server/Makefile ============================================================================== --- head/databases/mariadb101-server/Makefile Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-server/Makefile Sun Mar 27 20:57:51 2016 (r412011) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.11 +PORTVERSION= 10.1.13 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -17,6 +17,9 @@ MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 +LICENSE_NAME_PerconaFT= PerconaFT patents license +LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS +LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -26,10 +29,11 @@ USES= bison:build cmake compiler:c++11- USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source +DOCSDIR= ${PREFIX}/share/doc/mysql OPTIONS_DEFINE= FASTMTX OPTIONS_SINGLE= GSSAPI -OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT +OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE FASTMTX_DESC= Replace mutexes with spinlocks @@ -46,7 +50,7 @@ ENGINES_DESC= Optional MariaDB storage e INNOBASE_DESC= Build InnoDB engine next to XtraDB MAXKEY_DESC= Change max key length from 1000 to 4000 MROONGA_DESC= Mroonga Full Text Search engine -OQGRAPH_DESC= Open Query Graph Computation engine (Requires GCC) +OQGRAPH_DESC= Open Query Graph Computation engine SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine @@ -91,20 +95,22 @@ CONFLICTS_INSTALL= mariadb5*-${PKGNAMESU USE_OPENSSL= yes FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 +OPTIONS_SUB= yes .if defined(CLIENT_ONLY) # MySQL-Client part USES+= readline +GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO .else # MySQL-Server part USE_MYSQL= yes WANT_MYSQL_VER= 101m -OPTIONS_SUB= yes USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ + -DPLUGIN_AUTH_GSSAPI_CLIENT=NO \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 @@ -113,15 +119,14 @@ ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}= -DWITHOUT_${ENGINE}=1 .endfor +GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h OQGRAPH_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ libJudy.so:${PORTSDIR}/devel/judy -# Currently OQGraph does not build using clang. -# See See https://mariadb.atlassian.net/browse/MDEV-8051. -OQGRAPH_USE= gcc=yes TOKUDB_LIB_DEPENDS= libsnappy.so:${PORTSDIR}/archivers/snappy - -NOT_FOR_ARCHS= i386 +TOKUDB_PORTDOCS= README.md +TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi +NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ https://mariadb.atlassian.net/browse/MDEV-9627 Modified: head/databases/mariadb101-server/distinfo ============================================================================== --- head/databases/mariadb101-server/distinfo Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-server/distinfo Sun Mar 27 20:57:51 2016 (r412011) @@ -1,2 +1,2 @@ -SHA256 (mariadb-10.1.11.tar.gz) = cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce -SIZE (mariadb-10.1.11.tar.gz) = 55184229 +SHA256 (mariadb-10.1.13.tar.gz) = 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d +SIZE (mariadb-10.1.13.tar.gz) = 55272572 Modified: head/databases/mariadb101-server/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mariadb101-server/files/patch-CMakeLists.txt Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-server/files/patch-CMakeLists.txt Sun Mar 27 20:57:51 2016 (r412011) @@ -1,8 +1,8 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options ---- CMakeLists.txt.orig 2015-10-15 15:43:35 UTC +--- CMakeLists.txt.orig 2016-03-24 09:12:10 UTC +++ CMakeLists.txt -@@ -452,6 +452,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -460,6 +460,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) @@ -10,7 +10,7 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLI INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty EXCEPTIONS-CLIENT COMPONENT Readme) # MDEV-6526 these files are not installed anymore -@@ -462,6 +463,7 @@ IF(UNIX) +@@ -470,6 +471,7 @@ IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) ENDIF() Modified: head/databases/mariadb101-server/files/patch-cmake_ssl.cmake ============================================================================== --- head/databases/mariadb101-server/files/patch-cmake_ssl.cmake Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-server/files/patch-cmake_ssl.cmake Sun Mar 27 20:57:51 2016 (r412011) @@ -1,7 +1,7 @@ MariaDB prefers static libraries, breaks builds with ports' OpenSSL libs ---- cmake/ssl.cmake.orig 2015-12-23 15:33:29 UTC +--- cmake/ssl.cmake.orig 2016-03-24 09:12:10 UTC +++ cmake/ssl.cmake @@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL) @@ -16,3 +16,16 @@ ports' OpenSSL libs FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD HINTS ${OPENSSL_ROOT_DIR}/lib) +@@ -156,9 +156,9 @@ MACRO (MYSQL_CHECK_SSL) + HINTS ${OPENSSL_ROOT_DIR}/lib) + MARK_AS_ADVANCED(CRYPTO_LIBRARY OPENSSL_LIBRARIES OPENSSL_ROOT_DIR + OPENSSL_INCLUDE_DIR) +- IF (WITH_SSL_PATH) +- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) +- ENDIF() ++# IF (WITH_SSL_PATH) ++# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) ++# ENDIF() + + INCLUDE(CheckSymbolExists) + SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) Modified: head/databases/mariadb101-server/files/patch-extra_CMakeLists.txt ============================================================================== --- head/databases/mariadb101-server/files/patch-extra_CMakeLists.txt Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-server/files/patch-extra_CMakeLists.txt Sun Mar 27 20:57:51 2016 (r412011) @@ -2,7 +2,7 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLI --- extra/CMakeLists.txt.orig 2015-10-15 15:43:36 UTC +++ extra/CMakeLists.txt -@@ -91,6 +91,8 @@ IF(UNIX) +@@ -100,6 +100,8 @@ IF(UNIX) MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) Modified: head/databases/mariadb101-server/files/patch-mysys_my__default.c ============================================================================== --- head/databases/mariadb101-server/files/patch-mysys_my__default.c Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-server/files/patch-mysys_my__default.c Sun Mar 27 20:57:51 2016 (r412011) @@ -1,6 +1,6 @@ Obey hier(7) ---- mysys/my_default.c.orig 2015-10-15 15:43:45 UTC +--- mysys/my_default.c.orig 2016-03-24 09:12:11 UTC +++ mysys/my_default.c @@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA @@ -11,7 +11,7 @@ Obey hier(7) #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -784,7 +784,7 @@ static int search_default_file_with_ext( +@@ -785,7 +785,7 @@ static int search_default_file_with_ext( { MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(0))) @@ -20,7 +20,7 @@ Obey hier(7) /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -802,6 +802,14 @@ static int search_default_file_with_ext( +@@ -803,6 +803,14 @@ static int search_default_file_with_ext( if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) return 1; /* Ignore wrong files */ @@ -35,7 +35,7 @@ Obey hier(7) while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) { line++; -@@ -1066,7 +1074,8 @@ void my_print_default_files(const char * +@@ -1067,7 +1075,8 @@ void my_print_default_files(const char * if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ *end++= '.'; strxmov(end, conf_file, *ext, " ", NullS); @@ -45,7 +45,7 @@ Obey hier(7) } } } -@@ -1222,13 +1231,10 @@ static const char **init_default_directo +@@ -1223,13 +1232,10 @@ static const char **init_default_directo #else Modified: head/databases/mariadb101-server/files/patch-pcre_CMakeLists.txt ============================================================================== --- head/databases/mariadb101-server/files/patch-pcre_CMakeLists.txt Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-server/files/patch-pcre_CMakeLists.txt Sun Mar 27 20:57:51 2016 (r412011) @@ -1,8 +1,8 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options ---- pcre/CMakeLists.txt.orig 2015-10-15 15:43:45 UTC +--- pcre/CMakeLists.txt.orig 2016-03-24 09:12:11 UTC +++ pcre/CMakeLists.txt -@@ -513,6 +513,8 @@ IF(PCRE_SHOW_REPORT) +@@ -508,6 +508,8 @@ IF(PCRE_SHOW_REPORT) MESSAGE(STATUS "") ENDIF(PCRE_SHOW_REPORT) Modified: head/databases/mariadb101-server/files/patch-sql_sys__vars.cc ============================================================================== --- head/databases/mariadb101-server/files/patch-sql_sys__vars.cc Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-server/files/patch-sql_sys__vars.cc Sun Mar 27 20:57:51 2016 (r412011) @@ -1,8 +1,8 @@ Fix clang build error ---- sql/sys_vars.cc.orig 2015-10-15 15:43:47 UTC +--- sql/sys_vars.cc.orig 2016-03-24 09:12:12 UTC +++ sql/sys_vars.cc -@@ -1040,7 +1040,7 @@ static Sys_var_ulong Sys_interactive_tim +@@ -1052,7 +1052,7 @@ static Sys_var_ulong Sys_interactive_tim "connection before closing it", NO_SET_STMT SESSION_VAR(net_interactive_timeout), CMD_LINE(REQUIRED_ARG), @@ -11,7 +11,7 @@ Fix clang build error static Sys_var_ulonglong Sys_join_buffer_size( "join_buffer_size", -@@ -2214,7 +2214,7 @@ static Sys_var_ulong Sys_net_read_timeou +@@ -2239,7 +2239,7 @@ static Sys_var_ulong Sys_net_read_timeou "Number of seconds to wait for more data from a connection before " "aborting the read", SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), @@ -20,7 +20,7 @@ Fix clang build error NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_read_timeout)); -@@ -2229,7 +2229,7 @@ static Sys_var_ulong Sys_net_write_timeo +@@ -2254,7 +2254,7 @@ static Sys_var_ulong Sys_net_write_timeo "Number of seconds to wait for a block to be written to a connection " "before aborting the write", SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), @@ -29,7 +29,7 @@ Fix clang build error NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_write_timeout)); -@@ -3424,7 +3424,7 @@ static Sys_var_ulong Sys_net_wait_timeou +@@ -3449,7 +3449,7 @@ static Sys_var_ulong Sys_net_wait_timeou "The number of seconds the server waits for activity on a " "connection before closing it", NO_SET_STMT SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), Added: head/databases/mariadb101-server/files/patch-storage_oqgraph_graphcore.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb101-server/files/patch-storage_oqgraph_graphcore.cc Sun Mar 27 20:57:51 2016 (r412011) @@ -0,0 +1,14 @@ +Patch to allow build with clang from Don Lewis +https://jira.mariadb.org/projects/MDEV/issues/MDEV-8051 + +--- storage/oqgraph/graphcore.cc.orig 2016-01-28 12:12:55 UTC ++++ storage/oqgraph/graphcore.cc +@@ -485,7 +485,7 @@ namespace open_query + optional<Vertex> + oqgraph_share::find_vertex(VertexID id) const + { +- return ::boost::find_vertex(id, g); ++ return oqgraph3::find_vertex(id, g); + } + + #if 0 Added: head/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h Sun Mar 27 20:57:51 2016 (r412011) @@ -0,0 +1,76 @@ +Patch to allow build with clang from Don Lewis +https://jira.mariadb.org/projects/MDEV/issues/MDEV-8051 + +--- storage/oqgraph/oqgraph_shim.h.orig 2016-01-28 12:12:55 UTC ++++ storage/oqgraph/oqgraph_shim.h +@@ -254,7 +254,7 @@ namespace boost + typedef no_property type; + }; + +-#if BOOST_VERSION >= 104601 ++#if BOOST_VERSION >= 104601 && BOOST_VERSION < 104900 + template <> + struct graph_bundle_type<oqgraph3::graph> + { +@@ -274,6 +274,33 @@ namespace boost + }; + #endif + ++ template<> ++ struct property_map<oqgraph3::graph, edge_weight_t> ++ { ++ typedef void type; ++ typedef oqgraph3::edge_weight_property_map const_type; ++ }; ++ ++ template<> ++ struct property_map<oqgraph3::graph, vertex_index_t> ++ { ++ typedef void type; ++ typedef oqgraph3::vertex_index_property_map const_type; ++ }; ++ ++ template<> ++ struct property_map<oqgraph3::graph, edge_index_t> ++ { ++ typedef void type; ++ typedef oqgraph3::edge_index_property_map const_type; ++ }; ++ ++} ++ ++namespace oqgraph3 ++{ ++ using namespace boost; ++ + inline graph_traits<oqgraph3::graph>::vertex_descriptor + source( + const graph_traits<oqgraph3::graph>::edge_descriptor& e, +@@ -401,27 +428,6 @@ namespace boost + return count; + } + +- template<> +- struct property_map<oqgraph3::graph, edge_weight_t> +- { +- typedef void type; +- typedef oqgraph3::edge_weight_property_map const_type; +- }; +- +- template<> +- struct property_map<oqgraph3::graph, vertex_index_t> +- { +- typedef void type; +- typedef oqgraph3::vertex_index_property_map const_type; +- }; +- +- template<> +- struct property_map<oqgraph3::graph, edge_index_t> +- { +- typedef void type; +- typedef oqgraph3::edge_index_property_map const_type; +- }; +- + inline property_map< + oqgraph3::graph, + edge_weight_t>::const_type::reference Modified: head/databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt ============================================================================== --- head/databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt Sun Mar 27 20:57:51 2016 (r412011) @@ -1,24 +1,12 @@ ---- storage/tokudb/CMakeLists.txt.orig 2015-12-23 15:33:32 UTC +--- storage/tokudb/CMakeLists.txt.orig 2016-03-26 16:20:50 UTC +++ storage/tokudb/CMakeLists.txt -@@ -1,7 +1,8 @@ - SET(TOKUDB_VERSION 5.6.26-74.0) - # PerconaFT only supports x86-64 and cmake-2.8.9+ --IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND -- NOT CMAKE_VERSION VERSION_LESS "2.8.9") -+IF( ( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" -+ OR CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" ) -+ AND NOT CMAKE_VERSION VERSION_LESS "2.8.9") - CHECK_CXX_SOURCE_COMPILES( - " - struct a {int b; int c; }; -@@ -107,8 +109,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA +@@ -103,9 +103,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} stdc++) -SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin") -SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin") -+SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE}") -+SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO}") - +- SET(CPACK_RPM_server_PACKAGE_OBSOLETES "${CPACK_RPM_server_PACKAGE_OBSOLETES} MariaDB-tokudb-engine < 10.0.5" PARENT_SCOPE) + Added: head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt Sun Mar 27 20:57:51 2016 (r412011) @@ -0,0 +1,11 @@ +--- storage/tokudb/PerconaFT/CMakeLists.txt.orig 2016-03-26 18:18:05 UTC ++++ storage/tokudb/PerconaFT/CMakeLists.txt +@@ -77,7 +77,7 @@ add_subdirectory(src) + add_subdirectory(ftcxx) + add_subdirectory(tools) + +-INSTALL_DOCUMENTATION(README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS ++INSTALL_DOCUMENTATION(README.md + COMPONENT Server) + + ## build tags Modified: head/databases/mariadb101-server/files/patch-support-files_CMakeLists.txt ============================================================================== --- head/databases/mariadb101-server/files/patch-support-files_CMakeLists.txt Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-server/files/patch-support-files_CMakeLists.txt Sun Mar 27 20:57:51 2016 (r412011) @@ -1,6 +1,6 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options ---- support-files/CMakeLists.txt.orig 2015-10-15 15:44:15 UTC +--- support-files/CMakeLists.txt.orig 2016-03-24 09:12:15 UTC +++ support-files/CMakeLists.txt @@ -64,7 +64,9 @@ IF(UNIX) CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY) @@ -10,5 +10,5 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLI INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) +ENDIF() - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(sbindir ${prefix}/${INSTALL_SBINDIR}) + SET(bindir ${INSTALL_BINDIRABS}) + SET(sbindir ${INSTALL_SBINDIRABS}) Modified: head/databases/mariadb101-server/pkg-plist ============================================================================== --- head/databases/mariadb101-server/pkg-plist Sun Mar 27 19:11:06 2016 (r412010) +++ head/databases/mariadb101-server/pkg-plist Sun Mar 27 20:57:51 2016 (r412011) @@ -33,6 +33,8 @@ bin/perror bin/replace bin/resolve_stack_dump bin/resolveip +%%TOKUDB%%bin/tokuft_logprint +%%TOKUDB%%bin/tokuftdump bin/wsrep_sst_common bin/wsrep_sst_mysqldump bin/wsrep_sst_rsync @@ -44,14 +46,13 @@ lib/mysql/libmysqld.so lib/mysql/libmysqld.so.18 lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth_0x0100.so -lib/mysql/plugin/auth_gssapi.so -lib/mysql/plugin/auth_gssapi_client.so +%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_socket.so lib/mysql/plugin/auth_test_plugin.so -lib/mysql/plugin/daemon_example.ini +@comment lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/debug_key_management.so -lib/mysql/plugin/dialog.so +@comment lib/mysql/plugin/dialog.so lib/mysql/plugin/dialog_examples.so lib/mysql/plugin/example_key_management.so lib/mysql/plugin/file_key_management.so @@ -72,7 +73,7 @@ lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/locales.so lib/mysql/plugin/metadata_lock_info.so lib/mysql/plugin/mypluglib.so -lib/mysql/plugin/mysql_clear_password.so +@comment lib/mysql/plugin/mysql_clear_password.so lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so @@ -159,8 +160,8 @@ man/man8/mysqld.8.gz %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic -%%DATADIR%%/maria_add_gis_sp.sql -%%DATADIR%%/maria_add_gis_sp_bootstrap.sql +@comment %%DATADIR%%/maria_add_gis_sp.sql +@comment %%DATADIR%%/maria_add_gis_sp_bootstrap.sql %%MROONGA%%%%DATADIR%%/mroonga/install.sql %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%DATADIR%%/my-huge.cnf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603272057.u2RKvpk8075614>