From owner-svn-ports-all@freebsd.org Sun May 17 14:54:25 2020 Return-Path: Delivered-To: svn-ports-all@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 6D47D2DBBCC; Sun, 17 May 2020 14:54:25 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49Q4t92Hgwz4RZZ; Sun, 17 May 2020 14:54:25 +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 49C7C1238B; Sun, 17 May 2020 14:54:25 +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 04HEsPv7064144; Sun, 17 May 2020 14:54:25 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04HEsOhR064140; Sun, 17 May 2020 14:54:24 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <202005171454.04HEsOhR064140@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 17 May 2020 14:54:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r535551 - in branches/2020Q2/databases: mariadb104-client mariadb104-server mariadb104-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2020Q2/databases: mariadb104-client mariadb104-server mariadb104-server/files X-SVN-Commit-Revision: 535551 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 May 2020 14:54:25 -0000 Author: brnrd Date: Sun May 17 14:54:24 2020 New Revision: 535551 URL: https://svnweb.freebsd.org/changeset/ports/535551 Log: MFH: r535369 databases/mariadb104-server: Security update to 10.4.13 Security: 21d59ea3-8559-11ea-a5e2-d4c9ef517024 Approved by: ports-secteam (joneum) Deleted: branches/2020Q2/databases/mariadb104-server/files/patch-MDEV-21592 Modified: branches/2020Q2/databases/mariadb104-client/pkg-plist branches/2020Q2/databases/mariadb104-server/Makefile branches/2020Q2/databases/mariadb104-server/distinfo branches/2020Q2/databases/mariadb104-server/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/databases/mariadb104-client/pkg-plist ============================================================================== --- branches/2020Q2/databases/mariadb104-client/pkg-plist Sun May 17 14:30:39 2020 (r535550) +++ branches/2020Q2/databases/mariadb104-client/pkg-plist Sun May 17 14:54:24 2020 (r535551) @@ -172,4 +172,4 @@ man/man1/replace.1.gz @comment man/man1/wsrep_sst_xtrabackup.1.gz @comment man/man8/mysqld.8.gz @comment share/aclocal/mysql.m4 -share/pkgconfig/mariadb.pc +libdata/pkgconfig/mariadb.pc Modified: branches/2020Q2/databases/mariadb104-server/Makefile ============================================================================== --- branches/2020Q2/databases/mariadb104-server/Makefile Sun May 17 14:30:39 2020 (r535550) +++ branches/2020Q2/databases/mariadb104-server/Makefile Sun May 17 14:54:24 2020 (r535551) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.4.12 +PORTVERSION= 10.4.13 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ @@ -219,6 +219,8 @@ post-configure-INNOBASE-on: post-install: ${RM} -r ${STAGEDIR}${DATADIR} ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server + ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc post-install-GSSAPI_NONE-off: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so @@ -227,6 +229,7 @@ post-install-GSSAPI_NONE-off: post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private + ${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig .endif # ${PKGNAMESUFFIX:M*-client} .include Modified: branches/2020Q2/databases/mariadb104-server/distinfo ============================================================================== --- branches/2020Q2/databases/mariadb104-server/distinfo Sun May 17 14:30:39 2020 (r535550) +++ branches/2020Q2/databases/mariadb104-server/distinfo Sun May 17 14:54:24 2020 (r535551) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580199426 -SHA256 (mariadb-10.4.12.tar.gz) = fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208 -SIZE (mariadb-10.4.12.tar.gz) = 79120835 +TIMESTAMP = 1589288654 +SHA256 (mariadb-10.4.13.tar.gz) = 45bbbb12d1de8febd9edf630e940c23cf14efd60570c743b268069516a5d91df +SIZE (mariadb-10.4.13.tar.gz) = 80608459 Modified: branches/2020Q2/databases/mariadb104-server/pkg-plist ============================================================================== --- branches/2020Q2/databases/mariadb104-server/pkg-plist Sun May 17 14:30:39 2020 (r535550) +++ branches/2020Q2/databases/mariadb104-server/pkg-plist Sun May 17 14:54:24 2020 (r535551) @@ -318,6 +318,8 @@ man/man8/mysqld.8.gz @comment share/mysql/mroonga/COPYING %%MROONGA%%share/groonga-normalizer-mysql/README.md %%MROONGA%%share/groonga/README.md +share/pam_user_map.so +share/user_map.conf @comment bin/mariadb @comment bin/mariadb-access @comment bin/mariadb-admin