sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

databases/mariadb102-server: Security update to 10.2.15

Browse source 
MFH:		2018Q2
Security:	57aec168-453e-11e8-8777-b499baebfeaf
This commit is contained in:
Bernard Spil 2018-05-17 18:57:17 +00:00
parent 13d67b4b26
commit b007452891
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=470246
7 changed files with 5 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
databases/mariadb102-client/Makefile
View file

@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= mariadb
PORTREVISION= 3
PKGNAMESUFFIX= 102-client
COMMENT= Multithreaded SQL database (client)

23
databases/mariadb102-client/files/patch-sql-common_client.c
View file

@ -1,23 +0,0 @@
--- sql-common/client.c.orig 2018-01-03 14:48:29.000000000 +0100
+++ sql-common/client.c 2018-01-24 00:45:11.194419000 +0100
@@ -104,6 +104,10 @@
#define CONNECT_TIMEOUT 0
#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) || defined(HAVE_YASSL)
+#define ASN1_STRING_get0_data(X) ASN1_STRING_data(X)
+#endif
+
#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);

4
databases/mariadb102-server/Makefile
View file

@ -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}/ \

6
databases/mariadb102-server/distinfo
View file

@ -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

63
databases/mariadb102-server/files/patch-MDEV-15768
View file

@ -1,63 +0,0 @@
--- storage/connect/tabjson.cpp.orig 2018-03-26 16:41:19 UTC
+++ storage/connect/tabjson.cpp
@@ -195,7 +195,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ
tdp->Fn = GetStringTableOption(g, topt, "Filename", NULL);
if (!(tdp->Database = SetPath(g, db)))
- return NULL;
+ return 0;
tdp->Objname = GetStringTableOption(g, topt, "Object", NULL);
tdp->Base = GetIntegerTableOption(g, topt, "Base", 0) ? 1 : 0;
@@ -243,14 +243,14 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ
tjsp = new(g) TDBJSON(tdp, new(g) MAPFAM(tdp));
if (tjsp->MakeDocument(g))
- return NULL;
+ return 0;
jsp = (tjsp->GetDoc()) ? tjsp->GetDoc()->GetValue(0) : NULL;
} else {
if (!(tdp->Lrecl = GetIntegerTableOption(g, topt, "Lrecl", 0)))
if (!mgo) {
sprintf(g->Message, "LRECL must be specified for pretty=%d", tdp->Pretty);
- return NULL;
+ return 0;
} else
tdp->Lrecl = 8192; // Should be enough
@@ -269,14 +269,14 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ
tjnp = new(g) TDBJSN(tdp, new(g) CMGFAM(tdp));
#else
sprintf(g->Message, "Mongo %s Driver not available", "C");
- return NULL;
+ return 0;
#endif
} else if (tdp->Driver && toupper(*tdp->Driver) == 'J') {
#if defined(JAVA_SUPPORT)
tjnp = new(g) TDBJSN(tdp, new(g) JMGFAM(tdp));
#else
sprintf(g->Message, "Mongo %s Driver not available", "Java");
- return NULL;
+ return 0;
#endif
} else { // Driver not specified
#if defined(CMGO_SUPPORT)
@@ -285,7 +285,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ
tjnp = new(g) TDBJSN(tdp, new(g) JMGFAM(tdp));
#else
sprintf(g->Message, MSG(NO_FEAT_SUPPORT), "MONGO");
- return NULL;
+ return 0;
#endif
} // endif Driver
@@ -304,7 +304,7 @@ int JSONDISC::GetColumns(PGLOBAL g, PCSZ
tjnp->SetG(G);
if (tjnp->OpenDB(g))
- return NULL;
+ return 0;
switch (tjnp->ReadDB(g)) {
case RC_EF:

10
databases/mariadb102-server/files/patch-sql-common_client.c
View file

@ -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);

16
databases/mariadb102-server/files/patch-sql_mysqld.cc
View file

@ -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));