svn commit: r470246 - in head/databases: mariadb102-client mariadb102-client/files mariadb102-server mariadb102-server/files

[Bernard Spil]

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 <ssl_compat.h>
  #include <sql_common.h>
-@@ -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 <my_systemd.h>
-+#include <my_crypt.h>
- 
- #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 <sys/stat.h>
- #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));