Remove expired ports:

2020-04-11 databases/mariadb55-server: Upstream end-of-life 2020-04-11, switch to a newer version
2020-04-11 databases/mariadb55-client: Upstream end-of-life 2020-04-11, switch to a newer version

23 files changed, 0 insertions, 751 deletions

diff --git a/databases/mariadb55-server/files/extra-patch-include_my__compare.h b/databases/mariadb55-server/files/extra-patch-include_my__compare.h
deleted file mode 100644
index 0d9945b156c2..000000000000
--- a/databases/mariadb55-server/files/extra-patch-include_my__compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2017-04-30 11:09:29 UTC
-+++ include/my_compare.h
-@@ -40,7 +40,7 @@ extern "C" {
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              32          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mariadb55-server/files/mysql-server.in b/databases/mariadb55-server/files/mysql-server.in
deleted file mode 100644
index 57c7106a0c0c..000000000000
--- a/databases/mariadb55-server/files/mysql-server.in
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_(instance_)?enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
-# mysql_(instance_)?dbdir (str):	Default to "/var/db/mysql"
-#			Base database directory.
-# mysql_(instance_)?args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-# mysql_(instance_)?pidfile (str): Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_(instance_)?user (str): User to run mysqld as
-#			Default to "mysql" created by the port
-# mysql_(instance_)?optfile (str): Server-specific option file.
-#			Default to "${mysql_dbdir}/my.cnf".
-# mysql_instances (str): Set to "" by default.
-#			If defined, list of instances to enable
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_user="mysql"}
-%%LEGACY_LIMITS%%: ${mysql_limits_args="-e -U $mysql_user"}
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-
-command="/usr/sbin/daemon"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-
-if [ -n "$2" ]; then
-	instance="$2"
-	load_rc_config ${name}_${instance}
-	case "$mysql_instances" in
-	"$2 "*|*" $2 "*|*" $2"|"$2")
-		eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
-		eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
-%%LEGACY_LIMITS%%		eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
-		eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
-%%LEGACY_LIMITS%%		eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
-		eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}"
-		eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}"
-	;;
-	*)
-		err 1 "$2 not found in mysql_instances" ;;
-	esac
-else
-	if [ -n "${mysql_instances}" -a -n "$1" ]; then
-		for instance in ${mysql_instances}; do
-			eval _enable="\${mysql_${instance}_enable}"
-			case "${_enable:-${mysql_enable}}" in
-			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
-				continue
-			;;
-			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-			;;
-			*)
-				if [ -z "$_enable" ]; then
-					_var=mysql_enable
-				else
-					_var=mysql_${instance}_enable
-				fi
-				warn "Bad value" \
-					"'${_enable:-${mysql_enable}}'" \
-					"for ${_var}. " \
-					"Instance ${instance} skipped."
-				continue
-			;;
-			esac
-			echo "===> mysql instance: ${instance}"
-			if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
-				success="${instance} ${success}"
-			else
-				failed="${instance} (${retcode}) ${failed}"
-			fi
-		done
-		exit 0
-	else
-		mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
-	fi
-fi
-
-pidfile=$mysql_pidfile
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args
-        [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
-	local dir
-	for dir in /etc /etc/mysql; do
-		if [ -f "${dir}/my.cnf" ]; then
-			echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}"
-			return 1
-		fi
-	done
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
-}
-
-mysql_poststart()
-{
-	local timeout=15
-	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
-		timeout=$(( timeout - 1 ))
-		sleep 1
-	done
-	return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mariadb55-server/files/patch-CMakeLists.txt b/databases/mariadb55-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 0e087b5ed4db..000000000000
--- a/databases/mariadb55-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
---- CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ CMakeLists.txt
-@@ -397,22 +397,22 @@ ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(support-files)
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(tests)
-+#  ADD_SUBDIRECTORY(tests)
-   ADD_SUBDIRECTORY(sql)
-   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-   IF(WITH_EMBEDDED_SERVER) 
-    ADD_SUBDIRECTORY(libmysqld)
--   ADD_SUBDIRECTORY(libmysqld/examples)
-+#   ADD_SUBDIRECTORY(libmysqld/examples)
-   ENDIF(WITH_EMBEDDED_SERVER)
- 
-   ADD_SUBDIRECTORY(mysql-test)
-   ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
--  ADD_SUBDIRECTORY(sql-bench)
-+#  ADD_SUBDIRECTORY(sql-bench)
- 
-   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-     ADD_SUBDIRECTORY(internal)
-   ENDIF()
--  ADD_SUBDIRECTORY(packaging/rpm-oel)
-+#  ADD_SUBDIRECTORY(packaging/rpm-oel)
- ENDIF()
- 
- IF(UNIX)
-@@ -460,14 +460,14 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
-   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
- 
--INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme)
-+#INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme)
- 
- # MDEV-6526 these files are not installed anymore
- #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
- #                      ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
- 
- IF(UNIX)
--  INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
-+#  INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
- ENDIF()
- 
- INCLUDE(CPack)
diff --git a/databases/mariadb55-server/files/patch-client_CMakeLists.txt b/databases/mariadb55-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index ecd046771b61..000000000000
--- a/databases/mariadb55-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,70 +0,0 @@
---- client/CMakeLists.txt.orig	2019-04-26 12:37:01 UTC
-+++ client/CMakeLists.txt
-@@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES(
- )
- 
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
-                            ${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
-@@ -34,6 +35,7 @@ IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
-   SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
- ENDIF(UNIX)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
-@@ -41,6 +43,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
- SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
- 
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
- 
-@@ -50,17 +53,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
- 
-@@ -70,17 +77,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
- MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
-+ENDIF()
- 
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
-   MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk)
- ENDIF(WIN32)
- 
-+IF(FALSE)
- # async_example is just a code example, do not install it.
- 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 (mysql_upgrade mysql_plugin
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/mariadb55-server/files/patch-cmake_jemalloc.cmake b/databases/mariadb55-server/files/patch-cmake_jemalloc.cmake
deleted file mode 100644
index f075ff3b7990..000000000000
--- a/databases/mariadb55-server/files/patch-cmake_jemalloc.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
---- cmake/jemalloc.cmake.orig	2017-04-30 11:09:29 UTC
-+++ cmake/jemalloc.cmake
-@@ -22,11 +22,11 @@ MACRO (CHECK_JEMALLOC)
-       SET(libname jemalloc)
-     ENDIF()
- 
--    CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
-+    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
-     SET(CMAKE_REQUIRED_LIBRARIES)
- 
-     IF (HAVE_JEMALLOC)
--      SET(LIBJEMALLOC ${libname})
-+      SET(LIBJEMALLOC c)
-     ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
-       MESSAGE(FATAL_ERROR "${libname} is not found")
-     ENDIF()
diff --git a/databases/mariadb55-server/files/patch-extra_CMakeLists.txt b/databases/mariadb55-server/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 85a60ef5a7eb..000000000000
--- a/databases/mariadb55-server/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- extra/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ extra/CMakeLists.txt
-@@ -80,9 +80,11 @@ 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()
-   MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server)
-   TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys)
- ENDIF()
diff --git a/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
deleted file mode 100644
index 67c12b4e8112..000000000000
--- a/databases/mariadb55-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- extra/yassl/taocrypt/src/integer.cpp.orig	2017-04-30 11:09:29 UTC
-+++ extra/yassl/taocrypt/src/integer.cpp
-@@ -74,7 +74,7 @@ template <class T>
- 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;
diff --git a/databases/mariadb55-server/files/patch-include_CMakeLists.txt b/databases/mariadb55-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 97167a195d79..000000000000
--- a/databases/mariadb55-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
---- include/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ include/CMakeLists.txt
-@@ -55,20 +55,24 @@ SET(HEADERS 
-   handler_ername.h
- )
- 
-+IF(FALSE)
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- 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")
-+ENDIF()
- 
- 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"
diff --git a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index bab811fa15bf..000000000000
--- a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
---- libmysql/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ libmysql/CMakeLists.txt
-@@ -425,7 +425,7 @@ SET(LIBS clientlib dbug strings vio mysy
- 
- # Merge several convenience libraries into one big mysqlclient
- # and link them together into shared library.
--MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
-+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
- 
- # Visual Studio users need debug  static library for debug projects
- IF(MSVC)
-@@ -433,6 +433,7 @@ IF(MSVC)
-  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
- ENDIF()
- 
-+IF(FALSE)
- IF(UNIX)
-   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
-     SET(DOT_VERSION ".${VERSION}")
-@@ -447,11 +448,13 @@ IF(UNIX)
-   ENDMACRO()
-   INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
- ENDIF()
-+ENDIF()
- 
- IF(NOT DISABLE_SHARED)
-   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
-     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA}
--    COMPONENT SharedLibraries)
-+	COMPONENT SharedLibraries NOINSTALL)
-+IF(FALSE)
-   IF(UNIX)
-     # libtool compatability
-     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -495,3 +498,4 @@ IF(NOT DISABLE_SHARED)
-     ENDFOREACH()
-   ENDIF()
- ENDIF()
-+ENDIF()
diff --git a/databases/mariadb55-server/files/patch-libservices_CMakeLists.txt b/databases/mariadb55-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index 415787052dfa..000000000000
--- a/databases/mariadb55-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- libservices/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ libservices/CMakeLists.txt
-@@ -26,4 +26,6 @@ SET(MYSQLSERVICES_SOURCES
-   logger_service.c)
- 
- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/mariadb55-server/files/patch-man_CMakeLists.txt b/databases/mariadb55-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index f49da31f09d6..000000000000
--- a/databases/mariadb55-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- man/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
-+++ man/CMakeLists.txt
-@@ -34,7 +34,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys
- 
- INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
- INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
-+IF(FALSE)
- INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
- INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
- INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
--
-+ENDIF()
diff --git a/databases/mariadb55-server/files/patch-mysys_default.c b/databases/mariadb55-server/files/patch-mysys_default.c
deleted file mode 100644
index e36841601a62..000000000000
--- a/databases/mariadb55-server/files/patch-mysys_default.c
+++ /dev/null
@@ -1,58 +0,0 @@
---- mysys/default.c.orig	2017-04-30 11:09:31 UTC
-+++ mysys/default.c
-@@ -89,7 +89,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;
- 
-@@ -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 %%PREFIX%%%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);
-         }
-       }
-     }
-@@ -1227,10 +1236,8 @@ static const char **init_default_directo
-   errors += add_directory(alloc, "/etc/", dirs);
-   errors += add_directory(alloc, "/etc/mysql/", dirs);
- 
--#if defined(DEFAULT_SYSCONFDIR)
--  if (DEFAULT_SYSCONFDIR[0])
--    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
--#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs);
-+  errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
- 
- #endif
- 
diff --git a/databases/mariadb55-server/files/patch-regex_CMakeLists.txt b/databases/mariadb55-server/files/patch-regex_CMakeLists.txt
deleted file mode 100644
index ab79c3bf56c0..000000000000
--- a/databases/mariadb55-server/files/patch-regex_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- regex/CMakeLists.txt.orig	2017-04-30 11:09:31 UTC
-+++ regex/CMakeLists.txt
-@@ -18,4 +18,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
- SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c)
- ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
- 
-+IF(FALSE)
- INSTALL(FILES "my_regex.h" DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
-+ENDIF()
diff --git a/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt b/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 47351d60a1d0..000000000000
--- a/databases/mariadb55-server/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
---- scripts/CMakeLists.txt.orig	2017-04-30 11:09:31 UTC
-+++ scripts/CMakeLists.txt
-@@ -270,6 +270,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()
-@@ -326,16 +328,11 @@ ELSE()
-     ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
-   # On Unix, most of the files end up in the bin directory
-   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
diff --git a/databases/mariadb55-server/files/patch-scripts_mysql__config.sh b/databases/mariadb55-server/files/patch-scripts_mysql__config.sh
deleted file mode 100644
index 8788844b5670..000000000000
--- a/databases/mariadb55-server/files/patch-scripts_mysql__config.sh
+++ /dev/null
@@ -1,14 +0,0 @@
---- scripts/mysql_config.sh.orig	2017-04-30 11:09: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
diff --git a/databases/mariadb55-server/files/patch-scripts_mysqld__safe.sh b/databases/mariadb55-server/files/patch-scripts_mysqld__safe.sh
deleted file mode 100644
index efd0873733bb..000000000000
--- a/databases/mariadb55-server/files/patch-scripts_mysqld__safe.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/mysqld_safe.sh.orig	2017-04-30 11:09:31 UTC
-+++ scripts/mysqld_safe.sh
-@@ -468,10 +468,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"
- 
-@@ -480,7 +480,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
diff --git a/databases/mariadb55-server/files/patch-sql_CMakeLists.txt b/databases/mariadb55-server/files/patch-sql_CMakeLists.txt
deleted file mode 100644
index 1e0e1c182d6c..000000000000
--- a/databases/mariadb55-server/files/patch-sql_CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
---- sql/CMakeLists.txt.orig	2017-04-30 11:09:31 UTC
-+++ sql/CMakeLists.txt
-@@ -276,6 +276,7 @@ ADD_CUSTOM_TARGET(distclean
-   VERBATIM
-   )
- 
-+IF(FALSE)
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
- 
- # Copy db.opt into data/test/
-@@ -319,6 +320,7 @@ ELSE()
-   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
- ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
- ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
-+ENDIF()
- 
- IF(WIN32)
-   SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
-@@ -361,8 +363,10 @@ IF(WIN32)
-   TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
- ENDIF(WIN32)
- 
-+IF(FALSE)
- INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
-   PATTERN examples EXCLUDE
-   PATTERN share EXCLUDE
-   PATTERN CMakeFiles EXCLUDE)
-+ENDIF()
diff --git a/databases/mariadb55-server/files/patch-sql_item__subselect.cc b/databases/mariadb55-server/files/patch-sql_item__subselect.cc
deleted file mode 100644
index f0b3fc672ac5..000000000000
--- a/databases/mariadb55-server/files/patch-sql_item__subselect.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/item_subselect.cc.orig	2017-04-30 11:09:31 UTC
-+++ sql/item_subselect.cc
-@@ -1329,7 +1329,7 @@ Item_exists_subselect::Item_exists_subse
-   Item_subselect()
- {
-   DBUG_ENTER("Item_exists_subselect::Item_exists_subselect");
--  bool val_bool();
-+//  bool val_bool();
-   init(select_lex, new select_exists_subselect(this));
-   max_columns= UINT_MAX;
-   null_value= FALSE; //can't be NULL
diff --git a/databases/mariadb55-server/files/patch-sql_sql__trigger.cc b/databases/mariadb55-server/files/patch-sql_sql__trigger.cc
deleted file mode 100644
index 744f03981d6c..000000000000
--- a/databases/mariadb55-server/files/patch-sql_sql__trigger.cc
+++ /dev/null
@@ -1,50 +0,0 @@
---- sql/sql_trigger.cc.orig	2017-04-30 11:09:31 UTC
-+++ sql/sql_trigger.cc
-@@ -192,32 +192,32 @@ static File_option triggers_file_paramet
- {
-   {
-     { C_STRING_WITH_LEN("triggers") },
--    my_offsetof(class Table_triggers_list, definitions_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("sql_modes") },
--    my_offsetof(class Table_triggers_list, definition_modes_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
-     FILE_OPTIONS_ULLLIST
-   },
-   {
-     { C_STRING_WITH_LEN("definers") },
--    my_offsetof(class Table_triggers_list, definers_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("client_cs_names") },
--    my_offsetof(class Table_triggers_list, client_cs_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("connection_cl_names") },
--    my_offsetof(class Table_triggers_list, connection_cl_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("db_cl_names") },
--    my_offsetof(class Table_triggers_list, db_cl_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   { { 0, 0 }, 0, FILE_OPTIONS_STRING }
-@@ -226,7 +226,7 @@ static File_option triggers_file_paramet
- File_option sql_modes_parameters=
- {
-   { C_STRING_WITH_LEN("sql_modes") },
--  my_offsetof(class Table_triggers_list, definition_modes_list),
-+  static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
-   FILE_OPTIONS_ULLLIST
- };
- 
diff --git a/databases/mariadb55-server/files/patch-sql_sql__view.cc b/databases/mariadb55-server/files/patch-sql_sql__view.cc
deleted file mode 100644
index bdc13517e564..000000000000
--- a/databases/mariadb55-server/files/patch-sql_sql__view.cc
+++ /dev/null
@@ -1,63 +0,0 @@
---- sql/sql_view.cc.orig	2017-04-30 11:09:31 UTC
-+++ sql/sql_view.cc
-@@ -760,46 +760,46 @@ static const int required_view_parameter
- */
- static File_option view_parameters[]=
- {{{ C_STRING_WITH_LEN("query")},
--  my_offsetof(TABLE_LIST, select_stmt),
-+  static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
-   FILE_OPTIONS_ESTRING},
-  {{ C_STRING_WITH_LEN("md5")},
--  my_offsetof(TABLE_LIST, md5),
-+  static_cast<int>(my_offsetof(TABLE_LIST, md5)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("updatable")},
--  my_offsetof(TABLE_LIST, updatable_view),
-+  static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("algorithm")},
--  my_offsetof(TABLE_LIST, algorithm),
-+  static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
-   FILE_OPTIONS_VIEW_ALGO},
-  {{ C_STRING_WITH_LEN("definer_user")},
--  my_offsetof(TABLE_LIST, definer.user),
-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("definer_host")},
--  my_offsetof(TABLE_LIST, definer.host),
-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("suid")},
--  my_offsetof(TABLE_LIST, view_suid),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("with_check_option")},
--  my_offsetof(TABLE_LIST, with_check),
-+  static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("timestamp")},
--  my_offsetof(TABLE_LIST, timestamp),
-+  static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
-   FILE_OPTIONS_TIMESTAMP},
-  {{ C_STRING_WITH_LEN("create-version")},
--  my_offsetof(TABLE_LIST, file_version),
-+  static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("source")},
--  my_offsetof(TABLE_LIST, source),
-+  static_cast<int>(my_offsetof(TABLE_LIST, source)),
-   FILE_OPTIONS_ESTRING},
-  {{(char*) STRING_WITH_LEN("client_cs_name")},
--  my_offsetof(TABLE_LIST, view_client_cs_name),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
-   FILE_OPTIONS_STRING},
-  {{(char*) STRING_WITH_LEN("connection_cl_name")},
--  my_offsetof(TABLE_LIST, view_connection_cl_name),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
-   FILE_OPTIONS_STRING},
-  {{(char*) STRING_WITH_LEN("view_body_utf8")},
--  my_offsetof(TABLE_LIST, view_body_utf8),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
-   FILE_OPTIONS_ESTRING},
-  {{ C_STRING_WITH_LEN("mariadb-version")},
-   my_offsetof(TABLE_LIST, mariadb_version),
diff --git a/databases/mariadb55-server/files/patch-sql_sys__vars.cc b/databases/mariadb55-server/files/patch-sql_sys__vars.cc
deleted file mode 100644
index 95f0896fac20..000000000000
--- a/databases/mariadb55-server/files/patch-sql_sys__vars.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql/sys_vars.cc.orig	2017-04-30 11:09:31 UTC
-+++ sql/sys_vars.cc
-@@ -826,7 +826,7 @@ static Sys_var_ulong Sys_interactive_tim
-        "connection before closing it",
-        SESSION_VAR(net_interactive_timeout),
-        CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_ulonglong Sys_join_buffer_size(
-        "join_buffer_size",
-@@ -1356,7 +1356,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),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_read_timeout));
- 
-@@ -1371,7 +1371,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),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_write_timeout));
- 
-@@ -2480,7 +2480,7 @@ static Sys_var_ulong Sys_net_wait_timeou
-        "The number of seconds the server waits for activity on a "
-        "connection before closing it",
-        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+       VALID_RANGE(1, INT_MAX32/1000),
-        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- /** propagates changes to the relevant flag of @@optimizer_switch */
diff --git a/databases/mariadb55-server/files/patch-support-files_CMakeLists.txt b/databases/mariadb55-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index 280b2414d544..000000000000
--- a/databases/mariadb55-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
---- support-files/CMakeLists.txt.orig	2017-04-11 20:03:17 UTC
-+++ support-files/CMakeLists.txt
-@@ -67,10 +67,12 @@ IF(UNIX)
-   ENDFOREACH()
-   IF(INSTALL_SUPPORTFILESDIR)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
--    ADD_SUBDIRECTORY(SELinux)
-+#    ADD_SUBDIRECTORY(SELinux)
-   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)
-   
diff --git a/databases/mariadb55-server/files/pkg-message.in b/databases/mariadb55-server/files/pkg-message.in
deleted file mode 100644
index 06766698c10a..000000000000
--- a/databases/mariadb55-server/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
-my.cnf. Please move existing my.cnf files from those paths to
-%%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
-EOM
-}
-{ type: upgrade
-  message: <<EOM
-Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
-the first time you start the MySQL server after an upgrade from an
-earlier version.
-EOM
-}
-]