Changes 5.5.42:

* Support for the SSL 2.0 and SSL 3.0 protocols has been disabled because they provide weak encryption.
* yaSSL was upgraded to version 2.3.7.
* The valid date range of the SSL certificates in mysql-test/std_data has been extended to the year 2029.
* Bugs Fixed

5 files changed, 17 insertions, 14 deletions

diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common
index 0984284d2e2..cbcf0e9cf49 100644
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.41 2014/11/29 10:01:29 adam Exp $
+# $NetBSD: Makefile.common,v 1.42 2015/02/07 10:13:59 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile
 
-DISTNAME=	mysql-5.5.41
+DISTNAME=	mysql-5.5.42
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}
 
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 3eb9047b1db..b5d60a4312c 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.40 2015/01/03 16:07:38 fhajny Exp $
+$NetBSD: distinfo,v 1.41 2015/02/07 10:13:59 adam Exp $
 
-SHA1 (mysql-5.5.41.tar.gz) = f12317efdd5b2c539ed14c7a7c69135822916419
-RMD160 (mysql-5.5.41.tar.gz) = cb56874a0146bb1e48d520c452de1779ff6f3578
-Size (mysql-5.5.41.tar.gz) = 21768300 bytes
-SHA1 (sphinx-2.2.5-release.tar.gz) = 27e1a37fdeff12b866b33d3bb5602894af10bb5e
-RMD160 (sphinx-2.2.5-release.tar.gz) = d37cf615dae556307dbad2bbe00144f59afe7530
-Size (sphinx-2.2.5-release.tar.gz) = 2953899 bytes
+SHA1 (mysql-5.5.42.tar.gz) = 29f9c31f3857283c58e5887ea6479faa26a509dd
+RMD160 (mysql-5.5.42.tar.gz) = 6dc47c5a885439a99585a0a8225a8e234a19e12e
+Size (mysql-5.5.42.tar.gz) = 21795431 bytes
+SHA1 (sphinx-2.2.7-release.tar.gz) = dedae28c0deafda90109745230dacbe0dc441e1a
+RMD160 (sphinx-2.2.7-release.tar.gz) = d9f0150f6779b43457e30c77be50aa9bc658b03a
+Size (sphinx-2.2.7-release.tar.gz) = 2969037 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 2040dc4904270327c9d64178a3d889ebde2ec5d5
 SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
diff --git a/databases/mysql55-client/options.mk b/databases/mysql55-client/options.mk
index ecb2ca2e1de..e80d5c4266e 100644
--- a/databases/mysql55-client/options.mk
+++ b/databases/mysql55-client/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2015/01/03 16:07:38 fhajny Exp $
+# $NetBSD: options.mk,v 1.7 2015/02/07 10:13:59 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql5
 
@@ -25,8 +25,9 @@ CMAKE_ARGS+=		-DENABLE_DTRACE=ON
 # http://sphinxsearch.com/docs/current.html#sphinxse-overview
 PLIST_VARS+=	sphinx
 .if !empty(PKG_OPTIONS:Msphinx) || make(distinfo) || make(makesum) || make(mdi)
-SPHINX_VER=	2.2.5
+SPHINX_VER=	2.2.7
 DISTFILES=	${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
+SITES.sphinx-2.2.7-release.tar.gz=	http://sphinxsearch.com/files/
 .if !empty(PKGPATH:Mserver)
 MESSAGE_SRC=	${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
 .endif
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 714551ba99d..326cc6a3334 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/12/05 17:22:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.26 2015/02/07 10:13:59 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 b5cf7a0647f..8dfa3f00b2d 100644
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2014/11/29 10:01:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.34 2015/02/07 10:13:59 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -3918,6 +3918,7 @@ share/mysql/test/suite/rpl/r/rpl_delete_no_where.result
 share/mysql/test/suite/rpl/r/rpl_do_grant.result
 share/mysql/test/suite/rpl/r/rpl_drop.result
 share/mysql/test/suite/rpl/r/rpl_drop_db.result
+share/mysql/test/suite/rpl/r/rpl_drop_db_fail.result
 share/mysql/test/suite/rpl/r/rpl_drop_temp.result
 share/mysql/test/suite/rpl/r/rpl_drop_view.result
 share/mysql/test/suite/rpl/r/rpl_dual_pos_advance.result
@@ -4239,6 +4240,7 @@ share/mysql/test/suite/rpl/t/rpl_delete_no_where.test
 share/mysql/test/suite/rpl/t/rpl_do_grant.test
 share/mysql/test/suite/rpl/t/rpl_drop.test
 share/mysql/test/suite/rpl/t/rpl_drop_db.test
+share/mysql/test/suite/rpl/t/rpl_drop_db_fail.test
 share/mysql/test/suite/rpl/t/rpl_drop_temp-slave.opt
 share/mysql/test/suite/rpl/t/rpl_drop_temp.test
 share/mysql/test/suite/rpl/t/rpl_drop_view.test
@@ -5767,6 +5769,7 @@ share/mysql/test/t/drop.test
 share/mysql/test/t/drop_debug.test
 share/mysql/test/t/empty_table.test
 share/mysql/test/t/endspace.test
+share/mysql/test/t/error_simulation-master.opt
 share/mysql/test/t/error_simulation.test
 share/mysql/test/t/errors.test
 share/mysql/test/t/events_1.test