mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-18 08:02:48 +00:00
Code Issues Releases Activity

databases/mariadb101-{server,client}: Update to 10.1.13

Browse Source 
- 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
This commit is contained in:
Bernard Spil 2016-03-27 20:57:51 +00:00
parent 1a4024d154
commit 63fec1d6d4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=412011
30 changed files with 204 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
databases/mariadb101-client/Makefile
View File

@ -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"

8
databases/mariadb101-client/files/patch-CMakeLists.txt
View File

@ -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()

18
databases/mariadb101-client/files/patch-cmake_jemalloc.cmake
View File

@ -1,18 +0,0 @@
# Upstreamed https://github.com/MariaDB/server/pull/140
--- cmake/jemalloc.cmake.orig 2015-12-23 15:33:29 UTC
+++ cmake/jemalloc.cmake
@@ -12,7 +12,12 @@ MACRO(JEMALLOC_TRY_STATIC)
ENDMACRO()
MACRO(JEMALLOC_TRY_DYNAMIC)
- SET(libname jemalloc)
+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND
+ CMAKE_SYSTEM_VERSION STRGREATER "10.0")
+ SET(libname c)
+ ELSE()
+ SET(libname jemalloc)
+ ENDIF()
SET(what system)
CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_DYNAMIC_JEMALLOC)
ENDMACRO()

15
databases/mariadb101-client/files/patch-cmake_ssl.cmake
View File

@ -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})

11
databases/mariadb101-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
View File

@ -1,11 +0,0 @@
--- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300
+++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300
@@ -75,7 +75,7 @@
CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
size_type n, const void *)
{
- if (n > this->max_size())
+ if (n > AlignedAllocator<T>::max_size())
return 0;
if (n == 0)
return 0;

0
databases/mariadb101-client/files/patch-include_my_compare.h → databases/mariadb101-client/files/patch-include_my__compare.h
View File

14
databases/mariadb101-client/files/patch-include_mysql_service__encryption.h
View File

@ -1,14 +0,0 @@
--- include/mysql/service_encryption.h.orig 2015-12-23 15:33:29 UTC
+++ include/mysql/service_encryption.h
@@ -37,9 +37,11 @@ extern "C" {
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
#include <stdlib.h>
#else
+#ifndef __FreeBSD__
#include <alloca.h>
#endif
#endif
+#endif
/* returned from encryption_key_get_latest_version() */
#define ENCRYPTION_KEY_VERSION_INVALID (~(unsigned int)0)

10
databases/mariadb101-client/files/patch-mysys_my_default.c → databases/mariadb101-client/files/patch-mysys_my__default.c
View File

@ -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

14
databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
View File

@ -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

0
databases/mariadb101-client/files/patch-scripts_mysql_config.sh → databases/mariadb101-client/files/patch-scripts_mysql__config.sh
View File

6
databases/mariadb101-client/pkg-plist
View File

@ -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

23
databases/mariadb101-server/Makefile
View File

@ -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-lib cpe execinfo shebangfix
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 engines
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*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
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}=NO \
-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

4
databases/mariadb101-server/distinfo
View File

@ -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

6
databases/mariadb101-server/files/patch-CMakeLists.txt
View File

@ -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_CLIENT options
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()

24
databases/mariadb101-server/files/patch-cmake_jemalloc.cmake
View File

@ -1,24 +0,0 @@
Fix jemalloc detection on FreeBSD 10.x
Upstream https://github.com/MariaDB/server/pull/140
--- cmake/jemalloc.cmake.orig 2015-12-23 15:33:29 UTC
+++ cmake/jemalloc.cmake
@@ -12,9 +12,16 @@ MACRO(JEMALLOC_TRY_STATIC)
ENDMACRO()
MACRO(JEMALLOC_TRY_DYNAMIC)
- SET(libname jemalloc)
SET(what system)
- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_DYNAMIC_JEMALLOC)
+ IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND
+ CMAKE_SYSTEM_VERSION STRGREATER "10.0")
+ # Since FreeBSD 10.0 jemalloc is in base libc
+ SET(libname c)
+ SET(HAVE_DYNAMIC_JEMALLOC ON)
+ ELSE()
+ SET(libname jemalloc)
+ CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_DYNAMIC_JEMALLOC)
+ ENDIF()
ENDMACRO()
MACRO (CHECK_JEMALLOC)

15
databases/mariadb101-server/files/patch-cmake_ssl.cmake
View File

@ -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})

2
databases/mariadb101-server/files/patch-extra_CMakeLists.txt
View File

@ -2,7 +2,7 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
--- 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)

16
databases/mariadb101-server/files/patch-include_mysql_service__encryption.h
View File

@ -1,16 +0,0 @@
Fix build error
--- include/mysql/service_encryption.h.orig 2015-10-15 15:43:37 UTC
+++ include/mysql/service_encryption.h
@@ -35,9 +35,11 @@ extern "C" {
#define inline __inline
#endif
#else
+#ifndef __FreeBSD__
#include <alloca.h>
#endif
#endif
+#endif
/* returned from encryption_key_get_latest_version() */
#define ENCRYPTION_KEY_VERSION_INVALID (~(unsigned int)0)

10
databases/mariadb101-server/files/patch-mysys_my__default.c
View File

@ -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

4
databases/mariadb101-server/files/patch-pcre_CMakeLists.txt
View File

@ -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)

23
databases/mariadb101-server/files/patch-plugin_auth__gssapi_gssapi__server.cc
View File

@ -1,23 +0,0 @@
From 3d794d0ee8e0a5a7dfbd3b7de056c0a3ccb9aa81 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Wed, 6 Jan 2016 09:15:19 +0100
Subject: [PATCH] MDEV9494 Fix build for Heimdal Kerberos
---
plugin/auth_gssapi/gssapi_server.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugin/auth_gssapi/gssapi_server.cc b/plugin/auth_gssapi/gssapi_server.cc
index d325b2a..ed042a0 100644
--- plugin/auth_gssapi/gssapi_server.cc.orig 2016-01-28 12:12:51 UTC
+++ plugin/auth_gssapi/gssapi_server.cc
@@ -58,7 +58,7 @@ static char* get_default_principal_name()
}
/* Check for entry in keytab */
- if (krb5_kt_read_service_key(context, NULL, principal, 0, 0, &key))
+ if (krb5_kt_read_service_key(context, NULL, principal, 0, (krb5_enctype)0, &key))
{
sql_print_warning("GSSAPI plugin : default principal '%s' not found in keytab", unparsed_name);
goto cleanup;

10
databases/mariadb101-server/files/patch-sql_sys__vars.cc
View File

@ -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),

14
databases/mariadb101-server/files/patch-storage_oqgraph_graphcore.cc Normal file
View File

@ -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

76
databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h Normal file
View File

@ -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

20
databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt
View File

@ -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)

11
databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt Normal file
View File

@ -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

29
databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_buildheader_CMakeLists.txt
View File

@ -1,29 +0,0 @@
https://github.com/MariaDB/server/pull/157
MDEV-9657 - Use /bin/sh #157
Sp1l commented Feb 27, 2016
Remove Linuxism.
Works fine with a POSIX-compat shell
--- storage/tokudb/PerconaFT/buildheader/CMakeLists.txt.orig 2016-01-28 12:12:55 UTC
+++ storage/tokudb/PerconaFT/buildheader/CMakeLists.txt
@@ -1,6 +1,6 @@
set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/bash
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/sh
out=$1; shift
exec \"$@\" >$out")
@@ -8,7 +8,7 @@ add_executable(make_tdb make_tdb.cc)
set_property(TARGET make_tdb APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/db.h"
- COMMAND bash runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb>
+ COMMAND sh runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb>
DEPENDS make_tdb)
add_custom_target(install_tdb_h DEPENDS
"${CMAKE_CURRENT_BINARY_DIR}/db.h")

19
databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake
View File

@ -1,19 +0,0 @@
Fix failing backtrace detection
--- storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake.orig 2015-10-15 15:43:51 UTC
+++ storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake
@@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL)
endif ()
check_function_exists(backtrace HAVE_BACKTRACE_WITHOUT_EXECINFO)
if (NOT HAVE_BACKTRACE_WITHOUT_EXECINFO)
- set(CMAKE_REQUIRED_LIBRARIES execinfo)
- check_function_exists(backtrace HAVE_BACKTRACE_WITH_EXECINFO)
- if (HAVE_BACKTRACE_WITH_EXECINFO)
- list(APPEND EXTRA_SYSTEM_LIBS execinfo)
- else ()
- message(FATAL_ERROR "Cannot find backtrace(), even with -lexecinfo.")
- endif ()
+ list(APPEND EXTRA_SYSTEM_LIBS execinfo)
endif ()
if(HAVE_CLOCK_REALTIME)

6
databases/mariadb101-server/files/patch-support-files_CMakeLists.txt
View File

@ -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_CLIENT options
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})

15
databases/mariadb101-server/pkg-plist
View File

@ -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