From e290f6dc35c28cbfd589c389a7539f31a1d53b7b Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Wed, 5 Jul 2017 16:32:37 +0000 Subject: [PATCH] databases/mysqlwsrep56-server: Upgrade from 5.6.35_1 to 5.6.36 * Change maintainer from info@galeracluster.com to devel@galeracluster.com for consistency with databases/galera * Fetch the source code from GitHub * Remove patches that have been included upstream (files/patch-client_mysql.cc, files/patch-cmake_readline.cmake) --- databases/mysqlwsrep56-server/Makefile | 73 +++++++++++++------ databases/mysqlwsrep56-server/distinfo | 6 +- .../files/patch-client_mysql.cc | 25 ------- .../files/patch-cmake_readline.cmake | 17 ----- 4 files changed, 55 insertions(+), 66 deletions(-) delete mode 100644 databases/mysqlwsrep56-server/files/patch-client_mysql.cc delete mode 100644 databases/mysqlwsrep56-server/files/patch-cmake_readline.cmake diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile index 6fc7cdf36cd7..ffbd220f3599 100644 --- a/databases/mysqlwsrep56-server/Makefile +++ b/databases/mysqlwsrep56-server/Makefile @@ -2,31 +2,41 @@ # $FreeBSD$ PORTNAME= mysqlwsrep -PORTVERSION= 5.6.35 -PORTREVISION= 1 +PORTVERSION?= 5.6.36 +DISTVERSIONSUFFIX?= -25.20 CATEGORIES= databases ipv6 -MASTER_SITES= http://releases.galeracluster.com/source/ PKGNAMESUFFIX= 56-server -DISTNAME= mysql-wsrep-5.6.35-25.19 -MAINTAINER= info@galeracluster.com +MAINTAINER= devel@galeracluster.com COMMENT= MySQL database enhanced with Galera replication (server package) LICENSE= GPLv2 -BUILD_DEPENDS= bison:devel/bison RUN_DEPENDS= socat:net/socat lsof:sysutils/lsof netcat:net/netcat rsync:net/rsync +BROKEN_powerpc64= Does not build + DATADIR= ${PREFIX}/share/mysql -NOT_FOR_ARCHS= aarch64 armv6 powerpc64 +NOT_FOR_ARCHS= aarch64 armv6 powerpc64 NOT_FOR_ARCHS_REASON= error: Unsupported platform -USES= cmake:outsource,noninja libedit shebangfix perl5 +USES= bison \ + cmake:outsource,noninja \ + compiler:c++11-lib \ + compiler:c11 \ + libedit \ + perl5 \ + shebangfix \ + ssl + USE_PERL5= run USE_LDCONFIG= yes -MY_DBDIR= /var/db/mysql +USE_GITHUB= yes +GH_ACCOUNT= codership +GH_PROJECT?= mysql-wsrep +GH_TAGNAME?= wsrep_${DISTVERSION}${DISTVERSIONSUFFIX} CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ @@ -34,7 +44,7 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ - -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ + -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ @@ -50,11 +60,12 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ SHEBANG_FILES= scripts/*.pl* scripts/*.sh scripts/wsrep_sst_* .ifdef USE_MYSQL -.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. +.error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine it and try again. .endif -CONFLICTS_INSTALL= mysql5[0-9]-server-* \ - mariadb*-server-* \ +CONFLICTS_INSTALL= mariadb*-server-* \ + mysql5[0-57-9]-server-* \ + mysql8*-server-* \ percona*-server-* USE_RC_SUBR= mysql-server @@ -62,20 +73,40 @@ USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql -MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ - mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ - mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ - mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ - mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ - mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 +MMAN1= my_print_defaults.1 \ + myisam_ftdump.1 \ + myisamchk.1 \ + myisamlog.1 \ + myisampack.1 \ + mysql.server.1 \ + mysql_convert_table_format.1 \ + mysql_fix_extensions.1 \ + mysql_install_db.1 \ + mysql_plugin.1 \ + mysql_secure_installation.1 \ + mysql_setpermission.1 \ + mysql_tzinfo_to_sql.1 \ + mysql_upgrade.1 \ + mysql_zap.1 \ + mysqlbug.1 \ + mysqld_multi.1 \ + mysqld_safe.1 \ + mysqldumpslow.1 \ + mysqlhotcopy.1 \ + mysqlman.1 \ + mysqltest.1 \ + perror.1 \ + replace.1 \ + resolve_stack_dump.1 \ + resolveip.1 post-patch: - @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt + ${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == "armv6" -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake .endif .include diff --git a/databases/mysqlwsrep56-server/distinfo b/databases/mysqlwsrep56-server/distinfo index 5230fcd8f2d2..7a9b6bfd36c7 100644 --- a/databases/mysqlwsrep56-server/distinfo +++ b/databases/mysqlwsrep56-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1486024045 -SHA256 (mysql-wsrep-5.6.35-25.19.tar.gz) = f7bf200c5d5379cf616d901fcf701c8bad11658e06b1d8e25cb50d7164ee229c -SIZE (mysql-wsrep-5.6.35-25.19.tar.gz) = 33180905 +TIMESTAMP = 1499257665 +SHA256 (codership-mysql-wsrep-5.6.36-25.20-wsrep_5.6.36-25.20_GH0.tar.gz) = b40e01d95d8ccc5c23b9f1bf6c43c93776a7f542d57c14da661191b5a656754b +SIZE (codership-mysql-wsrep-5.6.36-25.20-wsrep_5.6.36-25.20_GH0.tar.gz) = 32374284 diff --git a/databases/mysqlwsrep56-server/files/patch-client_mysql.cc b/databases/mysqlwsrep56-server/files/patch-client_mysql.cc deleted file mode 100644 index 5a03f22b249f..000000000000 --- a/databases/mysqlwsrep56-server/files/patch-client_mysql.cc +++ /dev/null @@ -1,25 +0,0 @@ ---- client/mysql.cc.orig 2016-09-30 11:41:40 UTC -+++ client/mysql.cc -@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n - #ifdef HAVE_LOCALE_H - setlocale(LC_ALL,""); /* so as libedit use isprint */ - #endif -- rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; -- rl_completion_entry_function= &no_completion; -+ rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion; -+ rl_completion_entry_function= (rl_compentry_func_t*)&no_completion; -+ /* - rl_add_defun("magic-space", (Function*)&fake_magic_space, -1); -+ */ - #else - rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion; - rl_completion_entry_function= &no_completion; -@@ -2759,7 +2761,7 @@ static char **new_mysql_completion(const - int end MY_ATTRIBUTE((unused))) - { - if (!status.batch && !quick) --#if defined(USE_NEW_READLINE_INTERFACE) -+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE) - return rl_completion_matches(text, new_command_generator); - #else - return completion_matches((char *)text, (CPFunction *)new_command_generator); diff --git a/databases/mysqlwsrep56-server/files/patch-cmake_readline.cmake b/databases/mysqlwsrep56-server/files/patch-cmake_readline.cmake deleted file mode 100644 index 4c251b15fc56..000000000000 --- a/databases/mysqlwsrep56-server/files/patch-cmake_readline.cmake +++ /dev/null @@ -1,17 +0,0 @@ ---- cmake/readline.cmake.orig 2016-09-30 11:41:40 UTC -+++ cmake/readline.cmake -@@ -173,11 +173,11 @@ MACRO (FIND_SYSTEM_EDITLINE) - #include - int main(int argc, char **argv) - { -- typedef int MYFunction(const char*, int); -+ typedef char *MYFunction(const char*, int); - MYFunction* myf= rl_completion_entry_function; -- int res= (myf)(NULL, 0); -+ char *res= (myf)(NULL, 0); - completion_matches(0,0); -- return res; -+ return (res != NULL); - }" - EDITLINE_HAVE_COMPLETION) -