From owner-svn-ports-branches@freebsd.org Sun Feb 2 16:30:51 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 857FC23307D; Sun, 2 Feb 2020 16:30:51 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 489bzv30xJz4ML9; Sun, 2 Feb 2020 16:30:51 +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 627501AAB1; Sun, 2 Feb 2020 16:30:51 +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 012GUpLK085660; Sun, 2 Feb 2020 16:30:51 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 012GUovt085270; Sun, 2 Feb 2020 16:30:50 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <202002021630.012GUovt085270@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 2 Feb 2020 16:30:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r524975 - in branches/2020Q1/databases/mariadb102-server: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2020Q1/databases/mariadb102-server: . files X-SVN-Commit-Revision: 524975 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Feb 2020 16:30:51 -0000 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 + #include + ++#ifdef __FreeBSD__ ++#include ++#elif + #include ++#endif + #include + + #define FILENAME "/etc/security/user_map.conf"