kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

databases/mariadb100-server: Update to 10.0.29

Browse source 
- Update to 10.0.29
 - Update mariadb100-client
 - Update patches
 - Regen patches with makepatch
 - Pet portlint
 - Add MROONGA liblz4 dependency
 - Fix MROONGA liblz4 linking
 - rm erroneously installed files

PR:             197232, 204014, 215901
MFH:            2017Q1
Security:       22373c43-d728-11e6-a9a5-b499baebfeaf
This commit is contained in:
Bernard Spil 2017-01-14 21:57:31 +00:00
parent b733b58726
commit 6cead7efb7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=431497
23 changed files with 101 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
databases/mariadb100-client/Makefile
View file

@ -21,6 +21,7 @@ CLIENT_ONLY= yes
post-install:
${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper
${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
.include "${MASTERDIR}/Makefile"

10
databases/mariadb100-client/files/patch-CMakeLists.txt
View file

@ -1,5 +1,5 @@
--- CMakeLists.txt.orig 2015-08-05 20:11:27.000000000 +0200
+++ CMakeLists.txt 2015-08-07 12:05:52.895578945 +0200
--- CMakeLists.txt.orig 2017-01-12 01:45:16 UTC
+++ CMakeLists.txt
@@ -405,9 +405,9 @@ ADD_SUBDIRECTORY(client)
ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(libservices)
@ -11,7 +11,7 @@
IF(NOT WITHOUT_SERVER)
ADD_SUBDIRECTORY(tests)
ADD_SUBDIRECTORY(sql)
@@ -425,6 +426,7 @@ IF(NOT WITHOUT_SERVER)
@@ -425,6 +425,7 @@ IF(NOT WITHOUT_SERVER)
ADD_SUBDIRECTORY(internal)
ENDIF()
ENDIF()
@ -19,7 +19,7 @@
IF(UNIX)
ADD_SUBDIRECTORY(man)
@@ -480,6 +482,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
@@ -480,6 +481,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
@ -27,7 +27,7 @@
INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT
COMPONENT Readme)
@@ -490,6 +493,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
@@ -490,6 +492,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
IF(UNIX)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
ENDIF()

12
databases/mariadb100-client/files/patch-client_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200
+++ client/CMakeLists.txt 2014-09-05 22:40:26.210338712 +0200
@@ -38,11 +38,12 @@
--- client/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC
+++ client/CMakeLists.txt
@@ -38,11 +38,12 @@ IF(UNIX)
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
ENDIF(UNIX)
@ -14,8 +14,8 @@
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
@@ -53,21 +54,25 @@
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
@@ -54,21 +55,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
+IF(FALSE)
@ -41,7 +41,7 @@
MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
@@ -79,10 +84,12 @@
@@ -80,10 +85,12 @@ IF(WIN32)
ENDIF(WIN32)
# async_example is just a code example, do not install it.

10
databases/mariadb100-client/files/patch-extra_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- extra/CMakeLists.txt.orig 2015-01-25 16:21:40.000000000 +0100
+++ extra/CMakeLists.txt 2015-01-29 20:20:56.846047266 +0100
@@ -54,6 +54,7 @@
--- extra/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC
+++ extra/CMakeLists.txt
@@ -54,6 +54,7 @@ ADD_CUSTOM_TARGET(GenError
DEPENDS
${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
@ -8,7 +8,7 @@
MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
TARGET_LINK_LIBRARIES(my_print_defaults mysys)
@@ -74,9 +75,12 @@
@@ -74,9 +75,12 @@ ENDIF()
MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
TARGET_LINK_LIBRARIES(replace mysys)
@ -21,7 +21,7 @@
MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
@@ -97,7 +101,9 @@
@@ -100,7 +104,9 @@ ENDIF()
../storage/innobase/page/page0zip.cc
)

9
databases/mariadb100-client/files/patch-include_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- include/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200
+++ include/CMakeLists.txt 2012-12-23 00:48:29.000000000 +0200
@@ -58,13 +58,18 @@
--- include/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC
+++ include/CMakeLists.txt
@@ -66,16 +66,21 @@ INSTALL(FILES ${HEADERS} DESTINATION ${I
FOREACH(f ${HEADERS_GEN_CONFIGURE})
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
ENDFOREACH(f)
@ -20,3 +20,6 @@
PATTERN mysql EXCLUDE
REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
+ENDIF()
INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
FILES_MATCHING PATTERN "*.h"

6
databases/mariadb100-client/files/patch-include_my_compare.h → databases/mariadb100-client/files/patch-include_my__compare.h
View file

@ -1,6 +1,6 @@
--- include/my_compare.h.orig 2012-12-17 03:52:37.000000000 +0200
+++ include/my_compare.h 2012-12-17 03:53:40.000000000 +0200
@@ -40,7 +40,7 @@
--- include/my_compare.h.orig 2017-01-12 01:45:16 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.
*/

4
databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- libmysql/CMakeLists.txt.orig 2014-09-24 22:29:47 UTC
--- libmysql/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC
+++ libmysql/CMakeLists.txt
@@ -437,6 +437,8 @@ IF(NOT DISABLE_SHARED)
@@ -479,6 +479,8 @@ IF(NOT DISABLE_SHARED)
# libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")

6
databases/mariadb100-client/files/patch-libservices_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- libservices/CMakeLists.txt.orig 2014-08-09 00:13:47.000000000 +0200
+++ libservices/CMakeLists.txt 2014-09-05 22:29:05.110415834 +0200
@@ -29,4 +29,6 @@
--- libservices/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC
+++ libservices/CMakeLists.txt
@@ -29,4 +29,6 @@ SET(MYSQLSERVICES_SOURCES
logger_service.c)
ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})

6
databases/mariadb100-client/files/patch-man_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- man/CMakeLists.txt.orig 2012-12-22 21:30:12.000000000 +0200
+++ man/CMakeLists.txt 2012-12-22 21:30:54.000000000 +0200
@@ -30,9 +30,13 @@
--- man/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC
+++ man/CMakeLists.txt
@@ -32,9 +32,13 @@ SET(MAN1_DEVEL mysql_config.1)
SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
mysqltest_embedded.1 mysql_client_test_embedded.1)

25
databases/mariadb100-client/files/patch-mysys_my_default.c → databases/mariadb100-client/files/patch-mysys_my__default.c
View file

@ -1,15 +1,6 @@
--- mysys/my_default.c.orig 2014-08-09 00:13:39.000000000 +0200
+++ mysys/my_default.c 2014-09-05 19:56:48.006019959 +0200
@@ -90,7 +90,7 @@
/* Which directories are searched for options (and in which order) */
-#define MAX_DEFAULT_DIRS 6
+#define MAX_DEFAULT_DIRS 7
#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
static const char **default_directories = NULL;
@@ -785,7 +785,7 @@
--- mysys/my_default.c.orig 2017-01-12 01:45:18 UTC
+++ mysys/my_default.c
@@ -786,7 +786,7 @@ static int search_default_file_with_ext(
{
MY_STAT stat_info;
if (!my_stat(name,&stat_info,MYF(0)))
@ -18,22 +9,22 @@
/*
Ignore world-writable regular files.
This is mainly done to protect us to not read a file created by
@@ -803,6 +803,14 @@
@@ -804,6 +804,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 */
+ if (strstr(name, "/etc") == name)
+ {
+ fprintf(stderr,
+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
+ name,name);
+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
+ name,name);
+ goto err;
+ }
+
while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
{
line++;
@@ -1067,7 +1075,8 @@
@@ -1068,7 +1076,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 +34,7 @@
}
}
}
@@ -1223,13 +1232,10 @@
@@ -1229,13 +1238,10 @@ static const char **init_default_directo
#else

6
databases/mariadb100-client/files/patch-pcre_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- pcre/CMakeLists.txt.orig 2014-08-09 00:13:36.000000000 +0200
+++ pcre/CMakeLists.txt 2014-09-05 20:08:49.090972949 +0200
@@ -513,6 +513,8 @@
--- pcre/CMakeLists.txt.orig 2017-01-12 01:45:18 UTC
+++ pcre/CMakeLists.txt
@@ -509,6 +509,8 @@ IF(PCRE_SHOW_REPORT)
MESSAGE(STATUS "")
ENDIF(PCRE_SHOW_REPORT)

20
databases/mariadb100-client/files/patch-scripts_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- scripts/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200
+++ scripts/CMakeLists.txt 2014-09-05 22:33:01.060378167 +0200
@@ -72,6 +72,7 @@
--- scripts/CMakeLists.txt.orig 2017-01-12 01:45:19 UTC
+++ scripts/CMakeLists.txt
@@ -73,6 +73,7 @@ IF(UNIX)
)
ENDIF()
@ -8,7 +8,7 @@
INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
@@ -81,6 +82,7 @@
@@ -82,6 +83,7 @@ INSTALL(FILES
${FIX_PRIVILEGES_SQL}
DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
)
@ -16,7 +16,7 @@
# TCMalloc hacks
IF(MALLOC_LIB)
@@ -140,6 +142,7 @@
@@ -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})
@@ -180,6 +183,7 @@
@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
DESTINATION ${INSTALL_BINDIR}
COMPONENT Server
)
@ -32,7 +32,7 @@
ENDIF(UNIX)
@@ -204,6 +208,7 @@
@@ -192,6 +196,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)
@@ -219,6 +224,7 @@
@@ -207,6 +212,7 @@ INSTALL_SCRIPT(
COMPONENT Server
)
ENDIF()
@ -48,7 +48,7 @@
SET(prefix "${CMAKE_INSTALL_PREFIX}")
IF(INSTALL_SYSCONFDIR)
@@ -281,6 +287,8 @@
@@ -269,6 +275,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
STRING(REGEX REPLACE "^lib" "" lib "${lib}")
SET(${var} "${${var}}-l${lib} " )
ENDIF()
@ -57,7 +57,7 @@
ELSE()
SET(${var} "${${var}}-l${lib} " )
ENDIF()
@@ -339,18 +347,8 @@
@@ -327,18 +335,8 @@ ELSE()
SET(BIN_SCRIPTS
msql2mysql
mysql_config

6
databases/mariadb100-client/files/patch-scripts_mysql_config.sh → databases/mariadb100-client/files/patch-scripts_mysql__config.sh
View file

@ -1,6 +1,6 @@
--- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300
+++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300
@@ -108,8 +108,11 @@
--- scripts/mysql_config.sh.orig 2017-01-14 21:33:31 UTC
+++ scripts/mysql_config.sh
@@ -109,8 +109,11 @@ fi
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "

6
databases/mariadb100-client/files/patch-sql_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- sql/CMakeLists.txt.orig 2014-09-05 22:49:59.808332000 +0200
+++ sql/CMakeLists.txt 2014-09-05 22:50:18.768326206 +0200
@@ -226,9 +226,9 @@
--- sql/CMakeLists.txt.orig 2017-01-12 01:45:19 UTC
+++ sql/CMakeLists.txt
@@ -247,9 +247,9 @@ RUN_BISON(
)
# Gen_lex_hash

14
databases/mariadb100-client/files/patch-support-files_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- support-files/CMakeLists.txt.orig 2014-06-13 13:36:52.080474738 +0300
+++ support-files/CMakeLists.txt 2014-06-13 13:50:59.537282325 +0300
@@ -41,15 +41,18 @@
--- support-files/CMakeLists.txt.orig 2017-01-12 01:45:23 UTC
+++ support-files/CMakeLists.txt
@@ -41,15 +41,18 @@ ELSE()
SET(inst_location ${INSTALL_SUPPORTFILESDIR})
ENDIF()
@ -19,9 +19,9 @@
FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
@@ -67,8 +70,10 @@
@@ -69,8 +72,10 @@ IF(UNIX)
INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
ADD_SUBDIRECTORY(SELinux)
ENDIF()
+ ENDIF()
@ -30,7 +30,7 @@
CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
@@ -92,6 +97,7 @@
@@ -94,6 +99,7 @@ IF(UNIX)
DESTINATION ${inst_location} COMPONENT SupportFiles
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
@ -38,7 +38,7 @@
IF (INSTALL_SYSCONFDIR)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
@@ -101,6 +107,7 @@
@@ -103,6 +109,7 @@ IF(UNIX)
RENAME mysql COMPONENT SupportFiles
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

16
databases/mariadb100-server/Makefile
View file

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME?= mariadb
PORTVERSION= 10.0.27
PORTREVISION= 3
PORTVERSION= 10.0.29
CATEGORIES= databases ipv6
MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
http://mirrors.supportex.net/${SITESDIR}/ \
@ -18,6 +17,7 @@ MAINTAINER= brnrd@FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
LICENSE= GPLv2
#LICENSE_FILE= ${WRKSRC}/COPYING
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
@ -117,6 +117,7 @@ ${ENGINE}_CMAKE_OFF= -DWITHOUT_${ENGINE}=1
MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h
MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1
MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4
OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libJudy.so:devel/judy
# Currently OQGraph does not build using clang.
@ -132,9 +133,10 @@ post-install:
# These are "client" components, so there should be a switch that
# prevents them from being installed but it's unknown right now
. for f in bin/msql2mysql bin/mysql_config bin/mysql_find_rows \
bin/mysqlaccess COPYING.AGPLv3 COPYING.GPLv2
bin/mysqlaccess COPYING.AGPLv3 COPYING.GPLv2 share/aclocal/mysql.m4
${RM} ${STAGEDIR}${PREFIX}/${f}
. endfor
${RM} -r ${STAGEDIR}${DATADIR}/SELinux
.endif
.include <bsd.port.pre.mk>
@ -146,8 +148,8 @@ CMAKE_ARGS+= -DWITH_JEMALLOC="no"
.endif
.if ${PORT_OPTIONS:MTOKUDB}
NOT_FOR_ARCHS= i386
NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \
NOT_FOR_ARCHS= i386
NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \
https://github.com/percona/PerconaFT/blob/master/README.md
.endif
@ -169,4 +171,8 @@ post-patch:
${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb
.endif
post-configure-MROONGA-on:
${REINPLACE_CMD} 's|-llz4|-L${LOCALBASE}/lib -llz4|' \
${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt
.include <bsd.port.post.mk>

6
databases/mariadb100-server/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1472465827
SHA256 (mariadb-10.0.27.tar.gz) = bdf3a0c25aa2bc7a22a47e994eb7c8aa782624810eb3156038cc62bc9085c0cd
SIZE (mariadb-10.0.27.tar.gz) = 63258508
TIMESTAMP = 1484413888
SHA256 (mariadb-10.0.29.tar.gz) = f5f8da646f7df4b1fb21adb8d2b15e6dfbe1964ceb8cea53207d580a464350f4
SIZE (mariadb-10.0.29.tar.gz) = 63385696

9
databases/mariadb100-server/files/patch-extra_CMakeLists.txt
View file

@ -1,14 +1,13 @@
--- extra/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC
--- extra/CMakeLists.txt.orig 2017-01-12 01:45:16 UTC
+++ extra/CMakeLists.txt
@@ -78,9 +78,11 @@ IF(UNIX)
@@ -78,8 +78,10 @@ IF(UNIX)
MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
ENDIF()
+ENDIF()
# Add path to the InnoDB headers
MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server)
TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys)

23
databases/mariadb100-server/files/patch-mysys_my__default.c
View file

@ -1,15 +1,6 @@
--- mysys/my_default.c.orig 2015-06-17 14:54:12 UTC
--- mysys/my_default.c.orig 2017-01-12 01:45:18 UTC
+++ mysys/my_default.c
@@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA
/* Which directories are searched for options (and in which order) */
-#define MAX_DEFAULT_DIRS 6
+#define MAX_DEFAULT_DIRS 7
#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
static const char **default_directories = NULL;
@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
@@ -786,7 +786,7 @@ static int search_default_file_with_ext(
{
MY_STAT stat_info;
if (!my_stat(name,&stat_info,MYF(0)))
@ -18,22 +9,22 @@
/*
Ignore world-writable regular files.
This is mainly done to protect us to not read a file created by
@@ -803,6 +803,14 @@ static int search_default_file_with_ext(
@@ -804,6 +804,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 */
+ if (strstr(name, "/etc") == name)
+ {
+ fprintf(stderr,
+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
+ name,name);
+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
+ name,name);
+ goto err;
+ }
+
while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
{
line++;
@@ -1067,7 +1075,8 @@ void my_print_default_files(const char *
@@ -1068,7 +1076,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 +34,7 @@
}
}
}
@@ -1223,13 +1232,10 @@ static const char **init_default_directo
@@ -1229,13 +1238,10 @@ static const char **init_default_directo
#else

8
databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh
View file

@ -1,6 +1,6 @@
--- scripts/mysqld_safe.sh.orig 2015-06-17 14:54:12 UTC
--- scripts/mysqld_safe.sh.orig 2017-01-14 17:25:20 UTC
+++ scripts/mysqld_safe.sh
@@ -445,10 +445,10 @@ fi
@@ -469,10 +469,10 @@ fi
if test -z "$MYSQL_HOME"
then
@ -13,12 +13,12 @@
$DATADIR/my.cnf
IGNORING $DATADIR/my.cnf"
@@ -457,7 +457,7 @@ IGNORING $DATADIR/my.cnf"
@@ -481,7 +481,7 @@ IGNORING $DATADIR/my.cnf"
then
log_error "WARNING: Found $DATADIR/my.cnf
The data directory is a deprecated location for my.cnf, please move it to
-$MY_BASEDIR_VERSION/my.cnf"
+$MY_BASEDIR_VERSION/etc/my.cnf"
unsafe_my_cnf=1
MYSQL_HOME=$DATADIR
else
MYSQL_HOME=$MY_BASEDIR_VERSION

6
databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt
View file

@ -1,6 +1,6 @@
--- storage/tokudb/PerconaFT/ft/CMakeLists.txt.orig 2016-02-17 21:59:56.000000000 +0100
+++ storage/tokudb/PerconaFT/ft/CMakeLists.txt 2016-02-21 20:51:12.317052693 +0100
@@ -84,8 +84,8 @@ set_target_properties(ft_static PROPERTI
--- storage/tokudb/PerconaFT/ft/CMakeLists.txt.orig 2017-01-12 01:45:22 UTC
+++ storage/tokudb/PerconaFT/ft/CMakeLists.txt
@@ -85,8 +85,8 @@ set_target_properties(ft_static PROPERTI
maybe_add_gcov_to_libraries(ft ft_static)
## depend on other generated targets

15
databases/mariadb100-server/files/patch-support-files_CMakeLists.txt
View file

@ -1,15 +0,0 @@
--- support-files/CMakeLists.txt.orig 2015-06-17 14:54:14 UTC
+++ support-files/CMakeLists.txt
@@ -67,10 +67,11 @@ IF(UNIX)
ENDFOREACH()
IF(INSTALL_SUPPORTFILESDIR)
INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
- INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
ENDIF()
+IF(FALSE)
INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
+ENDIF()
CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)

1
databases/mariadb100-server/pkg-plist
View file

@ -24,6 +24,7 @@ bin/mysql_zap
bin/mysqlbug
bin/mysqld_multi
bin/mysqld_safe
bin/mysqld_safe_helper
bin/mysqldumpslow
bin/mysqlhotcopy
bin/mysqltest