From owner-svn-ports-all@freebsd.org Thu May 17 18:57:20 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E9B18EDD629; Thu, 17 May 2018 18:57:19 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8D27F712DD; Thu, 17 May 2018 18:57:19 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5F7D6566D; Thu, 17 May 2018 18:57:19 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4HIvJ3L002855; Thu, 17 May 2018 18:57:19 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HIvIcR002850; Thu, 17 May 2018 18:57:18 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201805171857.w4HIvIcR002850@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Thu, 17 May 2018 18:57:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470246 - in head/databases: mariadb102-client mariadb102-client/files mariadb102-server mariadb102-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/databases: mariadb102-client mariadb102-client/files mariadb102-server mariadb102-server/files X-SVN-Commit-Revision: 470246 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 18:57:20 -0000 Author: brnrd Date: Thu May 17 18:57:17 2018 New Revision: 470246 URL: https://svnweb.freebsd.org/changeset/ports/470246 Log: databases/mariadb102-server: Security update to 10.2.15 MFH: 2018Q2 Security: 57aec168-453e-11e8-8777-b499baebfeaf Deleted: head/databases/mariadb102-client/files/patch-sql-common_client.c head/databases/mariadb102-server/files/patch-MDEV-15768 Modified: head/databases/mariadb102-client/Makefile head/databases/mariadb102-server/Makefile head/databases/mariadb102-server/distinfo head/databases/mariadb102-server/files/patch-sql-common_client.c head/databases/mariadb102-server/files/patch-sql_mysqld.cc Modified: head/databases/mariadb102-client/Makefile ============================================================================== --- head/databases/mariadb102-client/Makefile Thu May 17 18:31:49 2018 (r470245) +++ head/databases/mariadb102-client/Makefile Thu May 17 18:57:17 2018 (r470246) @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= mariadb -PORTREVISION= 3 PKGNAMESUFFIX= 102-client COMMENT= Multithreaded SQL database (client) Modified: head/databases/mariadb102-server/Makefile ============================================================================== --- head/databases/mariadb102-server/Makefile Thu May 17 18:31:49 2018 (r470245) +++ head/databases/mariadb102-server/Makefile Thu May 17 18:57:17 2018 (r470246) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.2.14 -PORTREVISION?= 2 +PORTVERSION= 10.2.15 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ Modified: head/databases/mariadb102-server/distinfo ============================================================================== --- head/databases/mariadb102-server/distinfo Thu May 17 18:31:49 2018 (r470245) +++ head/databases/mariadb102-server/distinfo Thu May 17 18:57:17 2018 (r470246) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522324208 -SHA256 (mariadb-10.2.14.tar.gz) = 3443ec2d6e8af1eba49d097f6b2f6741c8d94b75abf19b8dd5753608f0703f7e -SIZE (mariadb-10.2.14.tar.gz) = 72607526 +TIMESTAMP = 1526556031 +SHA256 (mariadb-10.2.15.tar.gz) = 33de205158fc22fd8eb4e5770cc5ffa1cb4029f9c398dfd8c554ccb3e636ba11 +SIZE (mariadb-10.2.15.tar.gz) = 73329750 Modified: head/databases/mariadb102-server/files/patch-sql-common_client.c ============================================================================== --- head/databases/mariadb102-server/files/patch-sql-common_client.c Thu May 17 18:31:49 2018 (r470245) +++ head/databases/mariadb102-server/files/patch-sql-common_client.c Thu May 17 18:57:17 2018 (r470246) @@ -11,13 +11,3 @@ #include "client_settings.h" #include #include -@@ -1822,7 +1826,8 @@ - */ - - #ifdef HAVE_X509_check_host -- ret_validation= X509_check_host(server_cert, server_hostname, 0, 0, 0) != 1; -+ ret_validation= X509_check_host(server_cert, server_hostname, -+ strlen(server_hostname), 0, 0) != 1; - #else - subject= X509_get_subject_name(server_cert); - cn_loc= X509_NAME_get_index_by_NID(subject, NID_commonName, -1); Modified: head/databases/mariadb102-server/files/patch-sql_mysqld.cc ============================================================================== --- head/databases/mariadb102-server/files/patch-sql_mysqld.cc Thu May 17 18:31:49 2018 (r470245) +++ head/databases/mariadb102-server/files/patch-sql_mysqld.cc Thu May 17 18:57:17 2018 (r470246) @@ -1,21 +1,5 @@ --- sql/mysqld.cc.orig 2017-05-14 23:13:18 UTC +++ sql/mysqld.cc -@@ -111,6 +111,7 @@ - #endif - - #include -+#include - - #define mysqld_charset &my_charset_latin1 - -@@ -120,6 +121,7 @@ - #define HAVE_CLOSE_SERVER_SOCK 1 - #endif - -+ - extern "C" { // Because of SCO 3.2V4.2 - #include - #ifndef __GNU_LIBRARY__ @@ -4838,8 +4840,9 @@ static void init_ssl() while ((err= ERR_get_error())) sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));