From owner-svn-ports-all@freebsd.org Sun May 17 15:10:46 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 3F6442DBFD1; Sun, 17 May 2020 15:10:46 +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 49Q5F212nwz4SJ5; Sun, 17 May 2020 15:10:46 +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 1EEB612712; Sun, 17 May 2020 15:10:46 +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 04HFAjRL075399; Sun, 17 May 2020 15:10:45 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04HFAjfs075394; Sun, 17 May 2020 15:10:45 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <202005171510.04HFAjfs075394@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 15:10:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r535554 - in branches/2020Q2/databases: mariadb102-client mariadb102-client/files mariadb102-server mariadb102-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2020Q2/databases: mariadb102-client mariadb102-client/files mariadb102-server mariadb102-server/files X-SVN-Commit-Revision: 535554 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 15:10:46 -0000 Author: brnrd Date: Sun May 17 15:10:44 2020 New Revision: 535554 URL: https://svnweb.freebsd.org/changeset/ports/535554 Log: MFH: r535550 databases/mariadb102-server: Security update to 10.2.32 Security: 21d59ea3-8559-11ea-a5e2-d4c9ef517024 Approved by: ports-secteam (joneum) Deleted: branches/2020Q2/databases/mariadb102-server/files/patch-MDEV-21592 Modified: branches/2020Q2/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt branches/2020Q2/databases/mariadb102-client/pkg-plist branches/2020Q2/databases/mariadb102-server/Makefile branches/2020Q2/databases/mariadb102-server/distinfo branches/2020Q2/databases/mariadb102-server/pkg-plist Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt ============================================================================== --- branches/2020Q2/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt Sun May 17 15:09:27 2020 (r535553) +++ branches/2020Q2/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt Sun May 17 15:10:44 2020 (r535554) @@ -1,6 +1,6 @@ ---- support-files/CMakeLists.txt.orig 2018-06-25 11:13:30 UTC +--- support-files/CMakeLists.txt.orig 2020-05-08 11:45:27 UTC +++ support-files/CMakeLists.txt -@@ -57,6 +59,7 @@ ENDIF() +@@ -59,6 +59,7 @@ ENDIF() IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) @@ -8,23 +8,22 @@ FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure wsrep_notify) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -86,12 +89,14 @@ IF(UNIX) - ENDFOREACH() +@@ -98,12 +99,14 @@ IF(UNIX) + ENDIF() ENDIF() ENDIF() + ENDIF() CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development) INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -- -+ -+IF(NOT WITHOUT_SERVER) + ++ IF(NOT WITHOUT_SERVER) SET(bindir ${INSTALL_BINDIRABS}) SET(sbindir ${INSTALL_SBINDIRABS}) SET(scriptdir ${INSTALL_SCRIPTDIRABS}) -@@ -158,6 +163,7 @@ IF(UNIX) +@@ -175,6 +178,7 @@ IF(UNIX) INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server DESTINATION ${INSTALL_SYSCONFDIR}/init.d RENAME mysql COMPONENT SupportFiles) Modified: branches/2020Q2/databases/mariadb102-client/pkg-plist ============================================================================== --- branches/2020Q2/databases/mariadb102-client/pkg-plist Sun May 17 15:09:27 2020 (r535553) +++ branches/2020Q2/databases/mariadb102-client/pkg-plist Sun May 17 15:10:44 2020 (r535554) @@ -49,6 +49,7 @@ lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so lib/mysql/plugin/sha256_password.so libdata/pkgconfig/libmariadb.pc +libdata/pkgconfig/mariadb.pc %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml Modified: branches/2020Q2/databases/mariadb102-server/Makefile ============================================================================== --- branches/2020Q2/databases/mariadb102-server/Makefile Sun May 17 15:09:27 2020 (r535553) +++ branches/2020Q2/databases/mariadb102-server/Makefile Sun May 17 15:10:44 2020 (r535554) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.2.31 +PORTVERSION= 10.2.32 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ @@ -204,11 +204,13 @@ post-install: ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 \ ${STAGEDIR}${PREFIX}/man/man1/aria* \ ${STAGEDIR}${PREFIX}/man/man1/myisam* - ${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig \ - ${STAGEDIR}${DATADIR}/policy \ + ${RM} -r ${STAGEDIR}${DATADIR}/policy \ ${STAGEDIR}${PREFIX}/include/mysql/server # Fix https://mariadb.atlassian.net/browse/MDEV-9388 @${REINPLACE_CMD} 's/-l-pthread/-pthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config + ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig + ${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig post-install-GSSAPI_NONE-off: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so @@ -234,6 +236,7 @@ post-install: ${STAGEDIR}${LOCALBASE}/storage/groonga/COPYING \ ${STAGEDIR}${LOCALBASE}/share/mysql/mroonga/COPYING ${RM} ${STAGEDIR}${PREFIX}/include/mysql/*.h + ${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig .endif # targets for -server Modified: branches/2020Q2/databases/mariadb102-server/distinfo ============================================================================== --- branches/2020Q2/databases/mariadb102-server/distinfo Sun May 17 15:09:27 2020 (r535553) +++ branches/2020Q2/databases/mariadb102-server/distinfo Sun May 17 15:10:44 2020 (r535554) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580332681 -SHA256 (mariadb-10.2.31.tar.gz) = 321f744c322ecbc06feddd290d5ee0bf7c68e92cb61fd93c9450eb9c05683151 -SIZE (mariadb-10.2.31.tar.gz) = 73134720 +TIMESTAMP = 1589719385 +SHA256 (mariadb-10.2.32.tar.gz) = ea4fb28095e1079297eb3ba7ec5e215c641f2dff37964db778f6e9c37e0189b3 +SIZE (mariadb-10.2.32.tar.gz) = 73646729 Modified: branches/2020Q2/databases/mariadb102-server/pkg-plist ============================================================================== --- branches/2020Q2/databases/mariadb102-server/pkg-plist Sun May 17 15:09:27 2020 (r535553) +++ branches/2020Q2/databases/mariadb102-server/pkg-plist Sun May 17 15:10:44 2020 (r535554) @@ -126,7 +126,6 @@ man/man1/mysqld_safe.1.gz man/man1/mysqld_safe_helper.1.gz man/man1/mysqldumpslow.1.gz man/man1/mysqlhotcopy.1.gz -man/man1/mysqltest.1.gz man/man1/perror.1.gz man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz @@ -193,6 +192,8 @@ man/man8/mysqld.8.gz %%DATADIR%%/wsrep_notify %%MROONGA%%share/groonga-normalizer-mysql/README.md %%MROONGA%%share/groonga/README.md +share/pam_user_map.so +share/user_map.conf @comment bin/mariadb_config @comment bin/mysql @comment bin/mysqladmin