svn commit: r369067 - in head/databases: mysql55-client mysql55-client/files mysql55-server mysql55-server/files
Alex Dupre
ale at FreeBSD.org
Tue Sep 23 15:03:24 UTC 2014
Author: ale
Date: Tue Sep 23 15:03:22 2014
New Revision: 369067
URL: http://svnweb.freebsd.org/changeset/ports/369067
QAT: https://qat.redports.org/buildarchive/r369067/
Log:
Update to 5.5.40 release and unbreak on armv6 [1].
PR: 193841 [1]
Submitted by: mikael.urankar at gmail.com
Added:
head/databases/mysql55-client/files/patch-sql_common_client_plugin.c (contents, props changed)
head/databases/mysql55-server/files/patch-sql_common_client_plugin.c (contents, props changed)
Modified:
head/databases/mysql55-client/pkg-plist
head/databases/mysql55-server/Makefile
head/databases/mysql55-server/distinfo
head/databases/mysql55-server/pkg-plist
Added: head/databases/mysql55-client/files/patch-sql_common_client_plugin.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql55-client/files/patch-sql_common_client_plugin.c Tue Sep 23 15:03:22 2014 (r369067)
@@ -0,0 +1,47 @@
+--- sql-common/client_plugin.c.orig 2014-09-22 09:23:23 UTC
++++ sql-common/client_plugin.c
+@@ -233,11 +233,13 @@
+ {
+ MYSQL mysql;
+ struct st_mysql_client_plugin **builtin;
++ va_list unused;
+
+ if (initialized)
+ return 0;
+
+ bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */
++ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
+
+ pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
+ init_alloc_root(&mem_root, 128, 128);
+@@ -249,7 +251,7 @@
+ pthread_mutex_lock(&LOCK_load_client_plugin);
+
+ for (builtin= mysql_client_builtins; *builtin; builtin++)
+- add_plugin(&mysql, *builtin, 0, 0, 0);
++ add_plugin(&mysql, *builtin, 0, 0, unused);
+
+ pthread_mutex_unlock(&LOCK_load_client_plugin);
+
+@@ -293,9 +295,12 @@
+ mysql_client_register_plugin(MYSQL *mysql,
+ struct st_mysql_client_plugin *plugin)
+ {
++ va_list unused;
+ if (is_not_initialized(mysql, plugin->name))
+ return NULL;
+
++ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
++
+ pthread_mutex_lock(&LOCK_load_client_plugin);
+
+ /* make sure the plugin wasn't loaded meanwhile */
+@@ -307,7 +312,7 @@
+ plugin= NULL;
+ }
+ else
+- plugin= add_plugin(mysql, plugin, 0, 0, 0);
++ plugin= add_plugin(mysql, plugin, 0, 0, unused);
+
+ pthread_mutex_unlock(&LOCK_load_client_plugin);
+ return plugin;
Modified: head/databases/mysql55-client/pkg-plist
==============================================================================
--- head/databases/mysql55-client/pkg-plist Tue Sep 23 14:40:04 2014 (r369066)
+++ head/databases/mysql55-client/pkg-plist Tue Sep 23 15:03:22 2014 (r369067)
@@ -83,7 +83,3 @@ man/man1/mysqlimport.1.gz
man/man1/mysqlshow.1.gz
man/man1/mysqlslap.1.gz
share/aclocal/mysql.m4
- at dirrm include/mysql/mysql/psi
- at dirrm include/mysql/mysql
- at dirrm include/mysql
- at dirrmtry lib/mysql
Modified: head/databases/mysql55-server/Makefile
==============================================================================
--- head/databases/mysql55-server/Makefile Tue Sep 23 14:40:04 2014 (r369066)
+++ head/databases/mysql55-server/Makefile Tue Sep 23 15:03:22 2014 (r369067)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= mysql
-PORTVERSION= 5.5.39
+PORTVERSION= 5.5.40
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= ${MASTER_SITE_MYSQL}
@@ -83,10 +83,4 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
post-patch:
@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "arm"
-BROKEN= Does not compile on arm
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/databases/mysql55-server/distinfo
==============================================================================
--- head/databases/mysql55-server/distinfo Tue Sep 23 14:40:04 2014 (r369066)
+++ head/databases/mysql55-server/distinfo Tue Sep 23 15:03:22 2014 (r369067)
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.5.39.tar.gz) = 1893a00b034da6ff4159b81348388dc65eca6c3ae12962bd446e9b3d105b4862
-SIZE (mysql-5.5.39.tar.gz) = 21713567
+SHA256 (mysql-5.5.40.tar.gz) = 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960
+SIZE (mysql-5.5.40.tar.gz) = 21727672
Added: head/databases/mysql55-server/files/patch-sql_common_client_plugin.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql55-server/files/patch-sql_common_client_plugin.c Tue Sep 23 15:03:22 2014 (r369067)
@@ -0,0 +1,47 @@
+--- sql-common/client_plugin.c.orig 2014-09-22 09:23:23 UTC
++++ sql-common/client_plugin.c
+@@ -233,11 +233,13 @@
+ {
+ MYSQL mysql;
+ struct st_mysql_client_plugin **builtin;
++ va_list unused;
+
+ if (initialized)
+ return 0;
+
+ bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */
++ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
+
+ pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
+ init_alloc_root(&mem_root, 128, 128);
+@@ -249,7 +251,7 @@
+ pthread_mutex_lock(&LOCK_load_client_plugin);
+
+ for (builtin= mysql_client_builtins; *builtin; builtin++)
+- add_plugin(&mysql, *builtin, 0, 0, 0);
++ add_plugin(&mysql, *builtin, 0, 0, unused);
+
+ pthread_mutex_unlock(&LOCK_load_client_plugin);
+
+@@ -293,9 +295,12 @@
+ mysql_client_register_plugin(MYSQL *mysql,
+ struct st_mysql_client_plugin *plugin)
+ {
++ va_list unused;
+ if (is_not_initialized(mysql, plugin->name))
+ return NULL;
+
++ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
++
+ pthread_mutex_lock(&LOCK_load_client_plugin);
+
+ /* make sure the plugin wasn't loaded meanwhile */
+@@ -307,7 +312,7 @@
+ plugin= NULL;
+ }
+ else
+- plugin= add_plugin(mysql, plugin, 0, 0, 0);
++ plugin= add_plugin(mysql, plugin, 0, 0, unused);
+
+ pthread_mutex_unlock(&LOCK_load_client_plugin);
+ return plugin;
Modified: head/databases/mysql55-server/pkg-plist
==============================================================================
--- head/databases/mysql55-server/pkg-plist Tue Sep 23 14:40:04 2014 (r369066)
+++ head/databases/mysql55-server/pkg-plist Tue Sep 23 15:03:22 2014 (r369067)
@@ -1,4 +1,3 @@
- at stopdaemon mysql-server
bin/innochecksum
bin/my_print_defaults
bin/myisam_ftdump
@@ -136,30 +135,3 @@ man/man8/mysqld.8.gz
%%DATADIR%%/spanish/errmsg.sys
%%DATADIR%%/swedish/errmsg.sys
%%DATADIR%%/ukrainian/errmsg.sys
- at dirrm lib/mysql/plugin
- at dirrmtry lib/mysql
- at dirrm %%DATADIR%%/charsets
- at dirrm %%DATADIR%%/czech
- at dirrm %%DATADIR%%/danish
- at dirrm %%DATADIR%%/dutch
- at dirrm %%DATADIR%%/english
- at dirrm %%DATADIR%%/estonian
- at dirrm %%DATADIR%%/french
- at dirrm %%DATADIR%%/german
- at dirrm %%DATADIR%%/greek
- at dirrm %%DATADIR%%/hungarian
- at dirrm %%DATADIR%%/italian
- at dirrm %%DATADIR%%/japanese
- at dirrm %%DATADIR%%/korean
- at dirrm %%DATADIR%%/norwegian
- at dirrm %%DATADIR%%/norwegian-ny
- at dirrm %%DATADIR%%/polish
- at dirrm %%DATADIR%%/portuguese
- at dirrm %%DATADIR%%/romanian
- at dirrm %%DATADIR%%/russian
- at dirrm %%DATADIR%%/serbian
- at dirrm %%DATADIR%%/slovak
- at dirrm %%DATADIR%%/spanish
- at dirrm %%DATADIR%%/swedish
- at dirrm %%DATADIR%%/ukrainian
- at dirrm %%DATADIR%%
More information about the svn-ports-head
mailing list