Changes 5.5.49:

Security Notes
--------------
MySQL client programs now support an --ssl-mode option that enables you to specify the security state of the connection to the server. The default value is DISABLED (establish an unencrypted connection). --ssl-mode=REQUIRED) can be specified to require a secure connection, or fail if a secure connection cannot be obtained.

These clients support --ssl-mode: mysql, mysqladmin, mysqlcheck, mysqldump, mysqlimport, mysqlshow, mysqlpump, mysqlslap, mysqltest, mysql_upgrade.

For more information, see Command Options for Secure Connections.

Bugs Fixed

5 files changed, 15 insertions, 12 deletions

diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index cd473bba0f2..2506e1a6785 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2016/03/05 11:27:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2016/04/18 10:01:15 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (client)
 
 CONFLICTS=	mysql3-client-[0-9]*
diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 5298384920a..58ebf9b8024 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.50 2016/02/27 13:41:53 adam Exp $
+# $NetBSD: Makefile.common,v 1.51 2016/04/18 10:01:15 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.48
+DISTNAME=	mysql-5.5.49
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index e65876b454e..aac8c496e8f 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.48 2016/02/27 13:41:53 adam Exp $
+$NetBSD: distinfo,v 1.49 2016/04/18 10:01:15 adam Exp $
 
-SHA1 (mysql-5.5.48.tar.gz) = ddda6ef8b53b417e715b317ccce40b3234d4789b
-RMD160 (mysql-5.5.48.tar.gz) = 3d9a0c217139ca2a6f4872e645de1e212fafecc7
-SHA512 (mysql-5.5.48.tar.gz) = ac13cdfd89dea70f9ffb443affd5b9abf9984c5ea126b58d7833568e985478a667b73b1c9a4c8c80d80ce8da53168ee720191829ed035cff3f9482f58b5510e4
-Size (mysql-5.5.48.tar.gz) = 21201193 bytes
+SHA1 (mysql-5.5.49.tar.gz) = 74c8ff9e939f81c54fdb932d185548d1f18520d2
+RMD160 (mysql-5.5.49.tar.gz) = f67ad178f6d99b31f5c0d10f4847dab2de1dc0b4
+SHA512 (mysql-5.5.49.tar.gz) = 2c4db3003718cf0c8b02986e7daff00653cf1cba57cdc6b157189050f1d4c41c04c4c43f81e4121a9730b1d28e27af81651bc9dc379fa2e049f49bab7dee1fab
+Size (mysql-5.5.49.tar.gz) = 21202609 bytes
 SHA1 (sphinx-2.2.10-release.tar.gz) = 0f2372dd41df2848ea06c6076a86af6f0f66a071
 RMD160 (sphinx-2.2.10-release.tar.gz) = 2712e8ce85609e78c53bd2d9fba877f1e630d5f2
 SHA512 (sphinx-2.2.10-release.tar.gz) = 07683f64df730368563e11a7d2939b521837c9a04944ab7d6d09732ab06e451b674169eca4f85db2aae41d883bd16fb4d17b9265912fea9691d07d407d7212d8
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 4d4cbede2c4..49af6f9cca1 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2016/03/05 11:28:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2016/04/18 10:01:16 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*
diff --git a/databases/mysql55-server/PLIST b/databases/mysql55-server/PLIST
index cac39e90f8a..19a3eb476c9 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2016/02/27 13:41:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.41 2016/04/18 10:01:16 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -1225,6 +1225,8 @@ share/mysql/test/r/ssl_and_innodb.result
 share/mysql/test/r/ssl_cipher.result
 share/mysql/test/r/ssl_compress.result
 share/mysql/test/r/ssl_connect.result
+share/mysql/test/r/ssl_mode.result
+share/mysql/test/r/ssl_mode_no_ssl.result
 share/mysql/test/r/status.result
 share/mysql/test/r/status2.result
 share/mysql/test/r/status_bug17954.result
@@ -6239,6 +6241,9 @@ share/mysql/test/t/ssl_cipher-master.opt
 share/mysql/test/t/ssl_cipher.test
 share/mysql/test/t/ssl_compress.test
 share/mysql/test/t/ssl_connect.test
+share/mysql/test/t/ssl_mode.test
+share/mysql/test/t/ssl_mode_no_ssl-master.opt
+share/mysql/test/t/ssl_mode_no_ssl.test
 share/mysql/test/t/status-master.opt
 share/mysql/test/t/status.test
 share/mysql/test/t/status2.test