diff options
4 files changed, 5 insertions, 39 deletions
diff --git a/databases/mysql56-client/files/patch-sql-common_client__authentication.cc b/databases/mysql56-client/files/patch-sql-common_client__authentication.cc deleted file mode 100644 index fdbf5eb98562..000000000000 --- a/databases/mysql56-client/files/patch-sql-common_client__authentication.cc +++ /dev/null @@ -1,17 +0,0 @@ -sql-common/client_authentication.cc:87:56: error: comparison between pointer and integer ('char *' and 'int') - mysql->options.extension->server_public_key_path != '\0') - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~ - -Part of https://github.com/mysql/mysql-server/commit/db1bde79b1b4 - ---- sql-common/client_authentication.cc.orig 2017-09-13 15:49:17 UTC -+++ sql-common/client_authentication.cc -@@ -84,7 +84,7 @@ RSA *rsa_init(MYSQL *mysql) - - if (mysql->options.extension != NULL && - mysql->options.extension->server_public_key_path != NULL && -- mysql->options.extension->server_public_key_path != '\0') -+ mysql->options.extension->server_public_key_path[0] != '\0') - { - pub_key_file= fopen(mysql->options.extension->server_public_key_path, - "r"); diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index 8477e3b91a90..45c8b66042e8 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.44 -PORTREVISION?= 2 +PORTVERSION= 5.6.45 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.6 PKGNAMESUFFIX?= 56-server diff --git a/databases/mysql56-server/distinfo b/databases/mysql56-server/distinfo index 28a3b3502c44..3ea3dc09430e 100644 --- a/databases/mysql56-server/distinfo +++ b/databases/mysql56-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556305204 -SHA256 (mysql-5.6.44.tar.gz) = c031c92c3f226856b09bf929d8a26b0cd8600036cb9db4e0fdf6b6f032ced336 -SIZE (mysql-5.6.44.tar.gz) = 32531507 +TIMESTAMP = 1565035854 +SHA256 (mysql-5.6.45.tar.gz) = 404d798974dd89aca4a19e67194b534eddc7508489982175978966360607aabb +SIZE (mysql-5.6.45.tar.gz) = 32525559 diff --git a/databases/mysql56-server/files/patch-sql-common_client__authentication.cc b/databases/mysql56-server/files/patch-sql-common_client__authentication.cc deleted file mode 100644 index fdbf5eb98562..000000000000 --- a/databases/mysql56-server/files/patch-sql-common_client__authentication.cc +++ /dev/null @@ -1,17 +0,0 @@ -sql-common/client_authentication.cc:87:56: error: comparison between pointer and integer ('char *' and 'int') - mysql->options.extension->server_public_key_path != '\0') - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~ - -Part of https://github.com/mysql/mysql-server/commit/db1bde79b1b4 - ---- sql-common/client_authentication.cc.orig 2017-09-13 15:49:17 UTC -+++ sql-common/client_authentication.cc -@@ -84,7 +84,7 @@ RSA *rsa_init(MYSQL *mysql) - - if (mysql->options.extension != NULL && - mysql->options.extension->server_public_key_path != NULL && -- mysql->options.extension->server_public_key_path != '\0') -+ mysql->options.extension->server_public_key_path[0] != '\0') - { - pub_key_file= fopen(mysql->options.extension->server_public_key_path, - "r"); |