From f21b93b880b500b75dc881edf4c4098dae0ac80e Mon Sep 17 00:00:00 2001
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Sun, 2 Feb 2020 08:53:55 +0000
Subject: [PATCH] databases/mariadb102-server: Security update to 10.2.31

MFH:		2020Q1
Security:	a6cf65ad-37d2-11ea-a1c7-b499baebfeaf
Security: 	CVE-2020-2574
---
 databases/mariadb102-server/Makefile               |  5 +++--
 databases/mariadb102-server/distinfo               |  6 +++---
 databases/mariadb102-server/files/patch-MDEV-21592 | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 databases/mariadb102-server/files/patch-MDEV-21592

diff --git a/databases/mariadb102-server/Makefile b/databases/mariadb102-server/Makefile
index 1832047fe968..eaa2257975f3 100644
--- a/databases/mariadb102-server/Makefile
+++ b/databases/mariadb102-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.2.30
+PORTVERSION=	10.2.31
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
@@ -149,7 +149,8 @@ MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack
 OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 			libJudy.so:devel/judy
 ROCKSDB_USES=		python
-SNAPPY_CMAKE_BOOL=	WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy
+SNAPPY_CMAKE_ON=	-DWITH_INNODB_SNAPPY=ON  -DWITH_ROCKSDB_snappy=ON
+SNAPPY_CMAKE_OFF=	-DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
 SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
 TOKUDB_IMPLIES=		SNAPPY
 TOKUDB_PORTDOCS=	README.md
diff --git a/databases/mariadb102-server/distinfo b/databases/mariadb102-server/distinfo
index 6bfd527ff840..5d489854c528 100644
--- a/databases/mariadb102-server/distinfo
+++ b/databases/mariadb102-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576941772
-SHA256 (mariadb-10.2.30.tar.gz) = 9bcc7556dfc5d77d78551e2f9a719f45545609f14f8acdf129b99f577e041b38
-SIZE (mariadb-10.2.30.tar.gz) = 73096027
+TIMESTAMP = 1580332681
+SHA256 (mariadb-10.2.31.tar.gz) = 321f744c322ecbc06feddd290d5ee0bf7c68e92cb61fd93c9450eb9c05683151
+SIZE (mariadb-10.2.31.tar.gz) = 73134720
diff --git a/databases/mariadb102-server/files/patch-MDEV-21592 b/databases/mariadb102-server/files/patch-MDEV-21592
new file mode 100644
index 000000000000..f744a84e4ca7
--- /dev/null
+++ b/databases/mariadb102-server/files/patch-MDEV-21592
@@ -0,0 +1,14 @@
+--- plugin/auth_pam/mapper/pam_user_map.c.orig	2020-01-26 20:43:53 UTC
++++ plugin/auth_pam/mapper/pam_user_map.c
+@@ -39,7 +39,11 @@ and usually end up in /var/log/secure file.
+ #include <grp.h>
+ #include <pwd.h>
+ 
++#ifdef __FreeBSD__
++#include <security/pam_appl.h>
++#elif
+ #include <security/pam_ext.h>
++#endif
+ #include <security/pam_modules.h>
+ 
+ #define FILENAME "/etc/security/user_map.conf"