svn commit: r524975 - in branches/2020Q1/databases/mariadb102-server: . files

[Bernard Spil]

Author: brnrd
Date: Sun Feb  2 16:30:50 2020
New Revision: 524975
URL: https://svnweb.freebsd.org/changeset/ports/524975

Log:
  MFH: r524833
  
  databases/mariadb102-server: Security update to 10.2.31
  
  Security:	a6cf65ad-37d2-11ea-a1c7-b499baebfeaf
  Security: 	CVE-2020-2574
  
  Approved by:	ports-secteam (miwi)

Added:
  branches/2020Q1/databases/mariadb102-server/files/patch-MDEV-21592
     - copied unchanged from r524833, head/databases/mariadb102-server/files/patch-MDEV-21592
Modified:
  branches/2020Q1/databases/mariadb102-server/Makefile
  branches/2020Q1/databases/mariadb102-server/distinfo
Directory Properties:
  branches/2020Q1/   (props changed)

Modified: branches/2020Q1/databases/mariadb102-server/Makefile
==============================================================================
--- branches/2020Q1/databases/mariadb102-server/Makefile	Sun Feb  2 16:07:19 2020	(r524974)
+++ branches/2020Q1/databases/mariadb102-server/Makefile	Sun Feb  2 16:30:50 2020	(r524975)
@@ -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

Modified: branches/2020Q1/databases/mariadb102-server/distinfo
==============================================================================
--- branches/2020Q1/databases/mariadb102-server/distinfo	Sun Feb  2 16:07:19 2020	(r524974)
+++ branches/2020Q1/databases/mariadb102-server/distinfo	Sun Feb  2 16:30:50 2020	(r524975)
@@ -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

Copied: branches/2020Q1/databases/mariadb102-server/files/patch-MDEV-21592 (from r524833, head/databases/mariadb102-server/files/patch-MDEV-21592)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q1/databases/mariadb102-server/files/patch-MDEV-21592	Sun Feb  2 16:30:50 2020	(r524975, copy of r524833, head/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"