svn commit: r535553 - in branches/2020Q2/databases: mariadb103-client mariadb103-server mariadb103-server/files

[Bernard Spil]

Author: brnrd
Date: Sun May 17 15:09:27 2020
New Revision: 535553
URL: https://svnweb.freebsd.org/changeset/ports/535553

Log:
  MFH: r535549
  
  databases/mariadb103-server: Security update to 10.3.23
  
  Security:	21d59ea3-8559-11ea-a5e2-d4c9ef517024
  
  Approved by:	ports-secteam (joneum)

Deleted:
  branches/2020Q2/databases/mariadb103-server/files/patch-MDEV-21592
Modified:
  branches/2020Q2/databases/mariadb103-client/pkg-plist
  branches/2020Q2/databases/mariadb103-server/Makefile
  branches/2020Q2/databases/mariadb103-server/distinfo
  branches/2020Q2/databases/mariadb103-server/pkg-plist
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/databases/mariadb103-client/pkg-plist
==============================================================================
--- branches/2020Q2/databases/mariadb103-client/pkg-plist	Sun May 17 15:08:17 2020	(r535552)
+++ branches/2020Q2/databases/mariadb103-client/pkg-plist	Sun May 17 15:09:27 2020	(r535553)
@@ -57,6 +57,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
 @comment man/man1/aria_chk.1.gz
 @comment man/man1/aria_dump_log.1.gz
 @comment man/man1/aria_ftdump.1.gz
@@ -122,4 +123,3 @@ man/man1/replace.1.gz
 @comment man/man1/wsrep_sst_rsync_wan.1.gz
 @comment man/man8/mysqld.8.gz
 @comment share/aclocal/mysql.m4
-share/pkgconfig/mariadb.pc

Modified: branches/2020Q2/databases/mariadb103-server/Makefile
==============================================================================
--- branches/2020Q2/databases/mariadb103-server/Makefile	Sun May 17 15:08:17 2020	(r535552)
+++ branches/2020Q2/databases/mariadb103-server/Makefile	Sun May 17 15:09:27 2020	(r535553)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.3.22
+PORTVERSION=	10.3.23
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
@@ -215,6 +215,9 @@ 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
+	${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
 
 post-install-GSSAPI_NONE-off:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
@@ -223,6 +226,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 <bsd.port.post.mk>

Modified: branches/2020Q2/databases/mariadb103-server/distinfo
==============================================================================
--- branches/2020Q2/databases/mariadb103-server/distinfo	Sun May 17 15:08:17 2020	(r535552)
+++ branches/2020Q2/databases/mariadb103-server/distinfo	Sun May 17 15:09:27 2020	(r535553)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580324903
-SHA256 (mariadb-10.3.22.tar.gz) = 3200055dbdc27746981b3bb4bc182e2cb79dcf28ea88014b641a5b81280ccec7
-SIZE (mariadb-10.3.22.tar.gz) = 72050820
+TIMESTAMP = 1589620713
+SHA256 (mariadb-10.3.23.tar.gz) = fc405022457d8eec5991b870cc1c9a07b83b551d6165c414c4d8f31523aa86ae
+SIZE (mariadb-10.3.23.tar.gz) = 72582611

Modified: branches/2020Q2/databases/mariadb103-server/pkg-plist
==============================================================================
--- branches/2020Q2/databases/mariadb103-server/pkg-plist	Sun May 17 15:08:17 2020	(r535552)
+++ branches/2020Q2/databases/mariadb103-server/pkg-plist	Sun May 17 15:09:27 2020	(r535553)
@@ -308,6 +308,8 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/ukrainian/errmsg.sys
 %%WSREP%%%%DATADIR%%/wsrep.cnf
 %%WSREP%%%%DATADIR%%/wsrep_notify
+share/pam_user_map.so
+share/user_map.conf
 @comment %%DOCSDIR%%/COPYING
 @comment %%DOCSDIR%%/COPYING.thirdparty
 @comment share/groonga-normalizer-mysql/lgpl-2.0.txt