From fabbd967b8a1e1b5367a44afd75f31b2a919d907 Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Wed, 25 Oct 2017 02:01:43 -0200 Subject: [PATCH] mysql: update to 5.6.38. (#8520) --- srcpkgs/mysql/patches/gcc7-compare-string.patch | 11 ----------- srcpkgs/mysql/template | 6 +++--- 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/mysql/patches/gcc7-compare-string.patch diff --git a/srcpkgs/mysql/patches/gcc7-compare-string.patch b/srcpkgs/mysql/patches/gcc7-compare-string.patch deleted file mode 100644 index ac2687f94b4..00000000000 --- a/srcpkgs/mysql/patches/gcc7-compare-string.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sql/sql_acl.cc 2016-03-03 16:35:33.000000000 +0100 -+++ sql/sql_acl.cc 2017-05-09 11:28:16.879062433 +0200 -@@ -3029,7 +3029,7 @@ - * An empty password is considered to be of mysql_native type. - */ - -- if (combo->plugin.str == NULL || combo->plugin.str == '\0') -+ if (combo->plugin.str == NULL) - { - if (combo->uses_identified_by_password_clause) - { diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template index 175e8a1aa25..8ca031248aa 100644 --- a/srcpkgs/mysql/template +++ b/srcpkgs/mysql/template @@ -1,7 +1,7 @@ # Template file for 'mysql' pkgname=mysql -version=5.6.30 -revision=4 +version=5.6.38 +revision=1 build_style=cmake configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 @@ -29,7 +29,7 @@ maintainer="Juan RP " homepage="https://www.mysql.com/products/community/" license="GPL-2" distfiles="http://dev.mysql.com/get/Downloads/MySQL-${version%.*}/mysql-${version}.tar.gz" -checksum=48464df00aad9b9dfc26c903529ddad944a7562aa28e66e98e4f3f0c35179deb +checksum=18f249752f6c64af6e39c5b99c89ee1c86d6eb7fac853707603453cf584c54f3 disable_parallel_build=yes