Index: head/databases/mariadb100-client/Makefile =================================================================== --- head/databases/mariadb100-client/Makefile (revision 431496) +++ head/databases/mariadb100-client/Makefile (revision 431497) @@ -1,26 +1,27 @@ # $FreeBSD$ PORTNAME= mariadb PKGNAMESUFFIX= 100-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 MASTERDIR= ${.CURDIR}/../mariadb100-server FILESDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist CMAKE_ARGS+= -DWITHOUT_SERVER=1 USE_LDCONFIG= ${PREFIX}/lib/mysql 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" Index: head/databases/mariadb100-client/files/patch-include_my_compare.h =================================================================== --- head/databases/mariadb100-client/files/patch-include_my_compare.h (revision 431496) +++ head/databases/mariadb100-client/files/patch-include_my_compare.h (nonexistent) @@ -1,11 +0,0 @@ ---- 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 @@ - 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) Property changes on: head/databases/mariadb100-client/files/patch-include_my_compare.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb100-client/files/patch-mysys_my_default.c =================================================================== --- head/databases/mariadb100-client/files/patch-mysys_my_default.c (revision 431496) +++ head/databases/mariadb100-client/files/patch-mysys_my_default.c (nonexistent) @@ -1,61 +0,0 @@ ---- 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 @@ - { - MY_STAT stat_info; - if (!my_stat(name,&stat_info,MYF(0))) -- return 1; -+ return 0; - /* - Ignore world-writable regular files. - This is mainly done to protect us to not read a file created by -@@ -803,6 +803,14 @@ - 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); -+ goto err; -+ } -+ - while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) - { - line++; -@@ -1067,7 +1075,8 @@ - if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ - *end++= '.'; - strxmov(end, conf_file, *ext, " ", NullS); -- fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); - } - } - } -@@ -1223,13 +1232,10 @@ - - #else - --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#else - errors += add_directory(alloc, "/etc/", dirs); - errors += add_directory(alloc, "/etc/mysql/", dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); - - #endif - Property changes on: head/databases/mariadb100-client/files/patch-mysys_my_default.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb100-client/files/patch-scripts_mysql_config.sh =================================================================== --- head/databases/mariadb100-client/files/patch-scripts_mysql_config.sh (revision 431496) +++ head/databases/mariadb100-client/files/patch-scripts_mysql_config.sh (nonexistent) @@ -1,14 +0,0 @@ ---- 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 @@ - # 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@ " -+libs="$libs -L%%LOCALBASE%%/lib " - libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " -+libs_r="$libs_r -L%%LOCALBASE%%/lib " - embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " -+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " - - if [ -r "$pkglibdir/libmygcc.a" ]; then - # When linking against the static library with a different version of GCC Property changes on: head/databases/mariadb100-client/files/patch-scripts_mysql_config.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb100-client/files/patch-CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-client/files/patch-CMakeLists.txt (revision 431497) @@ -1,37 +1,37 @@ ---- 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) ADD_SUBDIRECTORY(scripts) -ADD_SUBDIRECTORY(sql/share) ADD_SUBDIRECTORY(support-files) +IF(FALSE) 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() +ENDIF() 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} ) +IF(FALSE) 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() +ENDIF() INCLUDE(CPack) Index: head/databases/mariadb100-client/files/patch-client_CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-client_CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-client/files/patch-client_CMakeLists.txt (revision 431497) @@ -1,57 +1,57 @@ ---- 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) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix) SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) - +ENDIF() 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) MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) -TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) +tARGET_LINK_LIBRARIES(mysqladmin mysqlclient) 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. +IF(FALSE) ADD_EXECUTABLE(async_example async_example.c) TARGET_LINK_LIBRARIES(async_example mysqlclient) +ENDIF() -SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example +SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap PROPERTIES HAS_CXX TRUE) ADD_DEFINITIONS(-DHAVE_DLOPEN) Index: head/databases/mariadb100-client/files/patch-extra_CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-extra_CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-client/files/patch-extra_CMakeLists.txt (revision 431497) @@ -1,33 +1,33 @@ ---- 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) +IF(FALSE) 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) +ENDIF() IF(UNIX) +IF(FALSE) MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) +ENDIF() 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 ) +IF(FALSE) MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) ADD_DEPENDENCIES(innochecksum GenError) +ENDIF() Index: head/databases/mariadb100-client/files/patch-include_CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-include_CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-client/files/patch-include_CMakeLists.txt (revision 431497) @@ -1,22 +1,25 @@ ---- 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) -INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") +INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development + FILES_MATCHING PATTERN "*.h" + PATTERN "psi_abi*" EXCLUDE +) STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") +IF(FALSE) INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development FILES_MATCHING PATTERN "*.h" PATTERN CMakeFiles EXCLUDE PATTERN mysql EXCLUDE REGEX "\\./(${EXCL_RE}$)" EXCLUDE) +ENDIF() + + INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" Index: head/databases/mariadb100-client/files/patch-include_my__compare.h =================================================================== --- head/databases/mariadb100-client/files/patch-include_my__compare.h (nonexistent) +++ head/databases/mariadb100-client/files/patch-include_my__compare.h (revision 431497) @@ -0,0 +1,11 @@ +--- 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. + */ + +-#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) Property changes on: head/databases/mariadb100-client/files/patch-include_my__compare.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt (revision 431497) @@ -1,11 +1,11 @@ ---- 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}") + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "DragonFly") + SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0") ELSE() Index: head/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt (revision 431497) @@ -1,9 +1,9 @@ ---- 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}) +IF(FALSE) INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) +ENDIF() Index: head/databases/mariadb100-client/files/patch-man_CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-man_CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-client/files/patch-man_CMakeLists.txt (revision 431497) @@ -1,16 +1,16 @@ ---- 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) +IF(FALSE) INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) +ENDIF() INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) +IF(FALSE) INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) +ENDIF() Index: head/databases/mariadb100-client/files/patch-mysys_my__default.c =================================================================== --- head/databases/mariadb100-client/files/patch-mysys_my__default.c (nonexistent) +++ head/databases/mariadb100-client/files/patch-mysys_my__default.c (revision 431497) @@ -0,0 +1,52 @@ +--- 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))) +- return 1; ++ return 0; + /* + Ignore world-writable regular files. + This is mainly done to protect us to not read a file created by +@@ -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); ++ goto err; ++ } ++ + while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) + { + line++; +@@ -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); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1229,13 +1238,10 @@ static const char **init_default_directo + + #else + +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#else + errors += add_directory(alloc, "/etc/", dirs); + errors += add_directory(alloc, "/etc/mysql/", dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); + + #endif + Property changes on: head/databases/mariadb100-client/files/patch-mysys_my__default.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt (revision 431497) @@ -1,11 +1,11 @@ ---- 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) +IF(FALSE) INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) +ENDIF() # end CMakeLists.txt Index: head/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt (revision 431497) @@ -1,78 +1,78 @@ ---- 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() +IF(FALSE) 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 ) +ENDIF() # TCMalloc hacks IF(MALLOC_LIB) -@@ -140,6 +142,7 @@ +@@ -134,6 +136,7 @@ ENDIF() SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") +IF(FALSE) # 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 ) +ENDIF() ENDIF(UNIX) -@@ -204,6 +208,7 @@ +@@ -192,6 +196,7 @@ ELSE() SET(localstatedir ${MYSQL_DATADIR}) ENDIF() +IF() 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() +ENDIF() 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() + ELSEIF(lib STREQUAL "-pthread") + SET(${var} "${${var}}-pthread " ) ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -339,18 +347,8 @@ +@@ -327,18 +335,8 @@ ELSE() SET(BIN_SCRIPTS msql2mysql mysql_config - mysql_fix_extensions - mysql_setpermission - mysql_secure_installation - mysql_zap mysqlaccess - mysql_convert_table_format mysql_find_rows - mytop - mysqlhotcopy - mysqldumpslow - mysqld_multi - mysqld_safe ) FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) Index: head/databases/mariadb100-client/files/patch-scripts_mysql__config.sh =================================================================== --- head/databases/mariadb100-client/files/patch-scripts_mysql__config.sh (nonexistent) +++ head/databases/mariadb100-client/files/patch-scripts_mysql__config.sh (revision 431497) @@ -0,0 +1,14 @@ +--- 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@ " ++libs="$libs -L%%LOCALBASE%%/lib " + libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " ++libs_r="$libs_r -L%%LOCALBASE%%/lib " + embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " ++embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " + + if [ -r "$pkglibdir/libmygcc.a" ]; then + # When linking against the static library with a different version of GCC Property changes on: head/databases/mariadb100-client/files/patch-scripts_mysql__config.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mariadb100-client/files/patch-sql_CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-sql_CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-client/files/patch-sql_CMakeLists.txt (revision 431497) @@ -1,14 +1,14 @@ ---- 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 -IF(NOT CMAKE_CROSSCOMPILING) + ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) -ENDIF() + ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h Index: head/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt (revision 431497) @@ -1,48 +1,48 @@ ---- 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() +IF(FALSE) FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} DESTINATION ${inst_location} COMPONENT IniFiles) ENDFOREACH() +ENDIF() IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) + IF(FALSE) 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() INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) + IF(FALSE) 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) + 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) + ENDIF() INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} COMPONENT Common) Index: head/databases/mariadb100-server/Makefile =================================================================== --- head/databases/mariadb100-server/Makefile (revision 431496) +++ head/databases/mariadb100-server/Makefile (revision 431497) @@ -1,172 +1,178 @@ # $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}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ PKGNAMESUFFIX?= 100-server 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 BROKEN_aarch64= Fails to link: missing sbrk BROKEN_powerpc64= Does not build SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb100-client USES= bison:build cmake compiler:c++11-lib cpe execinfo \ ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source OPTIONS_DEFINE= FASTMTX NO_OPTIONS_SORT= yes FASTMTX_DESC= Replace mutexes with spinlocks CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mariadb" \ -DINSTALL_DOCREADMEDIR="share/doc/mariadb" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR= \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ -DWITH_LIBEDIT=0 \ -DWITH_SSL=${OPENSSLBASE} \ -DWITH_LIBWRAP=1 \ -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" DATADIR= ${PREFIX}/share/mysql .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again. .endif CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mariadb10[1-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ .if !defined(CLIENT_ONLY) # MySQL-Server options USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin OPTIONS_DEFINE+= MAXKEY OPTIONS_DEFAULT+= MAXKEY OPTIONS_GROUP= ENGINES OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB 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) SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine OPTIONS_SUB= yes .endif FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 # See PR209419, MariaDB 10.0 fails to build with base SSL libs WITH_OPENSSL_PORT= yes .if defined(CLIENT_ONLY) # MySQL-Client part USES+= readline .else # MySQL-Server part USES+= mysql:100m USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 .for ENGINE in ${OPTIONS_GROUP_ENGINES} ${ENGINE}_CMAKE_OFF= -DWITHOUT_${ENGINE}=1 .endfor 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. # See See https://mariadb.atlassian.net/browse/MDEV-8051. OQGRAPH_USE= gcc OQGRAPH_BROKEN= OQGraph does not build TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_PORTDOCS= PATENTS README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi post-install: # Remove programs to avoid conflict with mariadb100-client # 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 .if ${OPSYS} == FreeBSD CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else 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 .if ${ARCH} == 'i386' # Server segfaults on i386 when built with clang >= 3.4 USE_GCC= yes .endif post-extract-OQGRAPH-off: @${RM} -r ${WRKSRC}/storage/oqgraph post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake ${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 Index: head/databases/mariadb100-server/distinfo =================================================================== --- head/databases/mariadb100-server/distinfo (revision 431496) +++ head/databases/mariadb100-server/distinfo (revision 431497) @@ -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 Index: head/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt (nonexistent) @@ -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) - Property changes on: head/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb100-server/files/patch-extra_CMakeLists.txt =================================================================== --- head/databases/mariadb100-server/files/patch-extra_CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-server/files/patch-extra_CMakeLists.txt (revision 431497) @@ -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) Index: head/databases/mariadb100-server/files/patch-mysys_my__default.c =================================================================== --- head/databases/mariadb100-server/files/patch-mysys_my__default.c (revision 431496) +++ head/databases/mariadb100-server/files/patch-mysys_my__default.c (revision 431497) @@ -1,61 +1,52 @@ ---- 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))) - return 1; + return 0; /* 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); - fputs(name, stdout); + if (strstr(name, "/etc") != name) + fputs(name, stdout); } } } -@@ -1223,13 +1232,10 @@ static const char **init_default_directo +@@ -1229,13 +1238,10 @@ static const char **init_default_directo #else -#if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR[0]) - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); -#else errors += add_directory(alloc, "/etc/", dirs); errors += add_directory(alloc, "/etc/mysql/", dirs); -#endif /* DEFAULT_SYSCONFDIR */ + errors += add_directory(alloc, "/usr/local/etc/", dirs); + errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); #endif Index: head/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh =================================================================== --- head/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh (revision 431496) +++ head/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh (revision 431497) @@ -1,24 +1,24 @@ ---- 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 - if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" + if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf" then log_error "WARNING: Found two instances of my.cnf - -$MY_BASEDIR_VERSION/my.cnf and +$MY_BASEDIR_VERSION/etc/my.cnf and $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 Index: head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt =================================================================== --- head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt (revision 431496) +++ head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_ft_CMakeLists.txt (revision 431497) @@ -1,13 +1,13 @@ ---- 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 -add_dependencies(ft install_tdb_h generate_log_code build_lzma build_snappy) -add_dependencies(ft_static install_tdb_h generate_log_code build_lzma build_snappy) +add_dependencies(ft install_tdb_h generate_log_code) +add_dependencies(ft_static install_tdb_h generate_log_code) ## link with lzma (which should be static) and link dependers with zlib target_link_libraries(ft LINK_PRIVATE util_static lzma snappy ${LIBTOKUPORTABILITY}) Index: head/databases/mariadb100-server/pkg-plist =================================================================== --- head/databases/mariadb100-server/pkg-plist (revision 431496) +++ head/databases/mariadb100-server/pkg-plist (revision 431497) @@ -1,236 +1,237 @@ bin/aria_chk bin/aria_dump_log bin/aria_ftdump bin/aria_pack bin/aria_read_log bin/innochecksum bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_client_test bin/mysql_client_test_embedded bin/mysql_convert_table_format bin/mysql_embedded bin/mysql_fix_extensions bin/mysql_install_db bin/mysql_plugin bin/mysql_secure_installation bin/mysql_setpermission bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysql_zap bin/mysqlbug bin/mysqld_multi bin/mysqld_safe +bin/mysqld_safe_helper bin/mysqldumpslow bin/mysqlhotcopy bin/mysqltest bin/mysqltest_embedded @comment bin/mytop bin/perror bin/replace bin/resolve_stack_dump bin/resolveip %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump include/mysql/private/atomic/gcc_builtins.h include/mysql/private/atomic/generic-msvc.h include/mysql/private/atomic/nolock.h include/mysql/private/atomic/rwlock.h include/mysql/private/atomic/solaris.h include/mysql/private/atomic/x86-gcc.h include/mysql/private/base64.h include/mysql/private/config.h include/mysql/private/embedded_priv.h include/mysql/private/ft_global.h include/mysql/private/hash.h include/mysql/private/heap.h include/mysql/private/lf.h include/mysql/private/maria.h include/mysql/private/my_aes.h include/mysql/private/my_alarm.h include/mysql/private/my_atomic.h include/mysql/private/my_base.h include/mysql/private/my_bit.h include/mysql/private/my_bitmap.h include/mysql/private/my_check_opt.h include/mysql/private/my_compare.h include/mysql/private/my_context.h include/mysql/private/my_cpu.h include/mysql/private/my_default.h include/mysql/private/my_handler_errors.h include/mysql/private/my_libwrap.h include/mysql/private/my_md5.h include/mysql/private/my_nosys.h include/mysql/private/my_rdtsc.h include/mysql/private/my_rnd.h include/mysql/private/my_stacktrace.h include/mysql/private/my_time.h include/mysql/private/my_tree.h include/mysql/private/my_uctype.h include/mysql/private/my_user.h include/mysql/private/myisam.h include/mysql/private/myisamchk.h include/mysql/private/myisammrg.h include/mysql/private/myisampack.h include/mysql/private/mysql_async.h 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_nodtrace.h include/mysql/private/queues.h include/mysql/private/rijndael.h include/mysql/private/service_versions.h include/mysql/private/sha1.h include/mysql/private/sha2.h include/mysql/private/t_ctype.h include/mysql/private/thr_alarm.h include/mysql/private/thr_lock.h include/mysql/private/thread_pool_priv.h include/mysql/private/violite.h include/mysql/private/waiting_threads.h include/mysql/private/welcome_copyright_notice.h include/mysql/private/wqueue.h lib/mysql/libmysqld.a 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_pam.so lib/mysql/plugin/auth_socket.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/dialog_examples.so lib/mysql/plugin/feedback.so lib/mysql/plugin/ha_archive.so lib/mysql/plugin/ha_blackhole.so lib/mysql/plugin/ha_connect.so lib/mysql/plugin/ha_federated.so lib/mysql/plugin/ha_federatedx.so %%INNOBASE%%lib/mysql/plugin/ha_innodb.so %%MROONGA%%lib/mysql/plugin/ha_mroonga.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so lib/mysql/plugin/ha_sequence.so %%SPHINX%%lib/mysql/plugin/ha_sphinx.so %%SPIDER%%lib/mysql/plugin/ha_spider.so %%TOKUDB%%lib/mysql/plugin/ha_tokudb.so lib/mysql/plugin/ha_test_sql_discovery.so lib/mysql/plugin/handlersocket.so 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 lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/query_cache_info.so lib/mysql/plugin/query_response_time.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/server_audit.so lib/mysql/plugin/sql_errlog.so libexec/mysqld man/man1/aria_chk.1.gz man/man1/aria_dump_log.1.gz man/man1/aria_ftdump.1.gz man/man1/aria_pack.1.gz man/man1/aria_read_log.1.gz man/man1/innochecksum.1.gz man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamchk.1.gz man/man1/myisamlog.1.gz man/man1/myisampack.1.gz man/man1/mysql.server.1.gz man/man1/mysql_convert_table_format.1.gz man/man1/mysql_fix_extensions.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql_setpermission.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz man/man1/mysql_zap.1.gz man/man1/mysqlbug.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqldumpslow.1.gz man/man1/mysqlhotcopy.1.gz man/man1/mysqltest.1.gz man/man1/perror.1.gz man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml %%DATADIR%%/charsets/ascii.xml %%DATADIR%%/charsets/cp1250.xml %%DATADIR%%/charsets/cp1251.xml %%DATADIR%%/charsets/cp1256.xml %%DATADIR%%/charsets/cp1257.xml %%DATADIR%%/charsets/cp850.xml %%DATADIR%%/charsets/cp852.xml %%DATADIR%%/charsets/cp866.xml %%DATADIR%%/charsets/dec8.xml %%DATADIR%%/charsets/geostd8.xml %%DATADIR%%/charsets/greek.xml %%DATADIR%%/charsets/hebrew.xml %%DATADIR%%/charsets/hp8.xml %%DATADIR%%/charsets/keybcs2.xml %%DATADIR%%/charsets/koi8r.xml %%DATADIR%%/charsets/koi8u.xml %%DATADIR%%/charsets/latin1.xml %%DATADIR%%/charsets/latin2.xml %%DATADIR%%/charsets/latin5.xml %%DATADIR%%/charsets/latin7.xml %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys %%DATADIR%%/errmsg-utf8.txt %%DATADIR%%/estonian/errmsg.sys %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/french/errmsg.sys %%DATADIR%%/german/errmsg.sys %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%DATADIR%%/install_spider.sql %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic %%MROONGA%%%%DATADIR%%/mroonga/install.sql %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%DATADIR%%/my-huge.cnf %%DATADIR%%/my-innodb-heavy-4G.cnf %%DATADIR%%/my-large.cnf %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_performance_tables.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/mysqld_multi.server %%DATADIR%%/norwegian-ny/errmsg.sys %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/polish/errmsg.sys %%DATADIR%%/portuguese/errmsg.sys %%DATADIR%%/romanian/errmsg.sys %%DATADIR%%/russian/errmsg.sys %%DATADIR%%/serbian/errmsg.sys %%DATADIR%%/slovak/errmsg.sys %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys