Pullup ticket #6549 - requested by nia

databases/mariadb105: security fix

Revisions pulled up:
- databases/mariadb105-client/Makefile                          1.8
- databases/mariadb105-client/Makefile.common                   1.14
- databases/mariadb105-client/PLIST                             1.3
- databases/mariadb105-client/distinfo                          1.10
- databases/mariadb105-client/patches/patch-plugin_auth__pam_CMakeLists.txt deleted
- databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt 1.3
- databases/mariadb105-server/Makefile                          1.18
- databases/mariadb105-server/PLIST                             1.8

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sat Nov 27 22:52:15 UTC 2021

   Modified Files:
   	pkgsrc/databases/mariadb105-client: Makefile Makefile.common PLIST
   	    distinfo
   	pkgsrc/databases/mariadb105-client/patches:
   	    patch-scripts_CMakeLists.txt
   	pkgsrc/databases/mariadb105-server: Makefile PLIST
   Removed Files:
   	pkgsrc/databases/mariadb105-client/patches:
   	    patch-plugin_auth__pam_CMakeLists.txt

   Log Message:
   mariadb105*: Update to 10.5.13

   Release notes:
   https://mariadb.com/kb/en/mariadb-10513-release-notes/

8 files changed, 27 insertions, 42 deletions

diff --git a/databases/mariadb105-client/Makefile b/databases/mariadb105-client/Makefile
index 29b915c596f..66f3d09bbdc 100644
--- a/databases/mariadb105-client/Makefile
+++ b/databases/mariadb105-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2021/08/12 10:50:19 nia Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2021/12/14 08:07:21 tm Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	MariaDB 10.5, a free MySQL compatible database (client)
 
 CONFLICTS=	mysql-client-[0-9]*
diff --git a/databases/mariadb105-client/Makefile.common b/databases/mariadb105-client/Makefile.common
index 9c1322414a8..bd8d0e38e7a 100644
--- a/databases/mariadb105-client/Makefile.common
+++ b/databases/mariadb105-client/Makefile.common
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile.common,v 1.13 2021/09/01 06:21:46 nia Exp $
+# $NetBSD: Makefile.common,v 1.13.2.1 2021/12/14 08:07:21 tm Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
 
-DISTNAME=	mariadb-10.5.12
+DISTNAME=	mariadb-10.5.13
 CATEGORIES=	databases
-MASTER_SITES=	https://downloads.mariadb.org/f/${DISTNAME}/source/
-MASTER_SITES+=	https://archive.mariadb.org/${DISTNAME}/source/
+MASTER_SITES=	https://archive.mariadb.org/${DISTNAME}/source/
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://mariadb.org/
@@ -47,6 +46,8 @@ CMAKE_ARGS+=		-DINSTALL_LIBDIR="lib"
 CMAKE_ARGS+=		-DINSTALL_MANDIR="${PKGMANDIR}"
 CMAKE_ARGS+=		-DINSTALL_MYSQLSHAREDIR="share/mysql"
 CMAKE_ARGS+=		-DINSTALL_MYSQLTESTDIR=""
+CMAKE_ARGS+=		-DINSTALL_PAMDIR="lib/security"
+CMAKE_ARGS+=		-DINSTALL_PAMDATADIR="share/examples/mariadb_auth_pam"
 CMAKE_ARGS+=		-DINSTALL_PLUGINDIR="lib/mysql/plugin"
 CMAKE_ARGS+=		-DINSTALL_SBINDIR="sbin"
 CMAKE_ARGS+=		-DINSTALL_SCRIPTDIR="bin"
diff --git a/databases/mariadb105-client/PLIST b/databases/mariadb105-client/PLIST
index 954922e84db..c46d6c6d3d9 100644
--- a/databases/mariadb105-client/PLIST
+++ b/databases/mariadb105-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/08/12 10:50:19 nia Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2021/12/14 08:07:21 tm Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -179,6 +179,7 @@ include/mysql/server/private/my_default.h
 include/mysql/server/private/my_handler_errors.h
 include/mysql/server/private/my_libwrap.h
 include/mysql/server/private/my_md5.h
+include/mysql/server/private/my_minidump.h
 include/mysql/server/private/my_nosys.h
 include/mysql/server/private/my_rdtsc.h
 include/mysql/server/private/my_rnd.h
diff --git a/databases/mariadb105-client/distinfo b/databases/mariadb105-client/distinfo
index f48e2069020..1fccd7d638a 100644
--- a/databases/mariadb105-client/distinfo
+++ b/databases/mariadb105-client/distinfo
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.7 2021/08/12 10:50:19 nia Exp $
+$NetBSD: distinfo,v 1.7.2.1 2021/12/14 08:07:21 tm Exp $
 
-SHA1 (mariadb-10.5.12.tar.gz) = 0e2ca328fdd2821c7a4400f7759cd6882a2c5840
-RMD160 (mariadb-10.5.12.tar.gz) = cfac6715b84ce1ed8e073fefad90c47875a0346b
-SHA512 (mariadb-10.5.12.tar.gz) = c732c2033304f273900b3dcf21936e28aebb147316fcabc7efdc43b75bc47c198daacfaaae082b997d4e695139d2aeaa2619bd29935f1b6f0aa25b9b9cde9ae5
-Size (mariadb-10.5.12.tar.gz) = 101914615 bytes
+SHA1 (mariadb-10.5.13.tar.gz) = a57d4ff38ab914878e56fc3f07d97d6c7bc73613
+RMD160 (mariadb-10.5.13.tar.gz) = 0ebadce633eee2c0c4eb8c430c5287045185d0ca
+SHA512 (mariadb-10.5.13.tar.gz) = 5d5ac04a3c8099a982cacb98dd4c162966fc7957e11c28e8b5645e49ffcf0513b9c8956f43d215c37e5eaa34aa8db6c71cfe993c89d62cab123021ee83169e7f
+Size (mariadb-10.5.13.tar.gz) = 102047279 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 893f329ed03e01144df166debb4d902ad0304811
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66
-SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = 00cfaf5826cc97084bc77033985e6686e1ce1628
 SHA1 (patch-plugin_auth__socket_auth__socket.c) = 850e94faff382a7e962f6d4d6ff960ddddc624c4
-SHA1 (patch-scripts_CMakeLists.txt) = bc55b8de1eb44e5516eed9ce4b5b1d0cc1a8f0af
+SHA1 (patch-scripts_CMakeLists.txt) = 54591a4d255a8133e06ab5d52bad262acffcddda
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
 SHA1 (patch-sql_mysqld.cc) = 19d325124cde1b45376c9710cdd104dc460f4bea
 SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3
diff --git a/databases/mariadb105-client/patches/patch-plugin_auth__pam_CMakeLists.txt b/databases/mariadb105-client/patches/patch-plugin_auth__pam_CMakeLists.txt
deleted file mode 100644
index 85c289d42b9..00000000000
--- a/databases/mariadb105-client/patches/patch-plugin_auth__pam_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-plugin_auth__pam_CMakeLists.txt,v 1.1 2021/05/23 15:32:47 nia Exp $
-
-Check for pam_ext.h (not available on NetBSD).
-
---- plugin/auth_pam/CMakeLists.txt.orig	2021-02-18 23:22:29.000000000 +0000
-+++ plugin/auth_pam/CMakeLists.txt
-@@ -43,7 +43,7 @@ IF(HAVE_PAM_APPL_H)
-                      WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)"
-                    COMPONENT Server)
-   ENDIF()
--  IF(TARGET auth_pam OR TARGET auth_pam_v1)
-+  IF(HAVE_PAM_EXT_H AND (TARGET auth_pam OR TARGET auth_pam_v1))
-     ADD_SUBDIRECTORY(testing)
-     ADD_LIBRARY(pam_user_map MODULE mapper/pam_user_map.c)
-     TARGET_LINK_LIBRARIES(pam_user_map pam)
diff --git a/databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt b/databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt
index ebfaf2f9cb7..7a057d31811 100644
--- a/databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt
+++ b/databases/mariadb105-client/patches/patch-scripts_CMakeLists.txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-scripts_CMakeLists.txt,v 1.2 2021/08/12 10:50:20 nia Exp $
+$NetBSD: patch-scripts_CMakeLists.txt,v 1.2.2.1 2021/12/14 08:07:21 tm Exp $
 
 Allow building a server-only configuration.
 
---- scripts/CMakeLists.txt.orig	2021-08-03 08:29:08.000000000 +0000
+--- scripts/CMakeLists.txt.orig	2021-11-05 19:40:05.000000000 +0000
 +++ scripts/CMakeLists.txt
 @@ -208,7 +208,7 @@ SET(pkgdata_locations "$basedir/${INSTAL
  # install mysql_install_db.sh at this point since it needs
@@ -22,9 +22,9 @@ Allow building a server-only configuration.
  SET(mariadb-access_COMPONENT Client)
 +SET(mariadb-convert-table-format_COMPONENT Client)
  SET(mariadb-find-rows_COMPONENT Client)
- SET(mytop_COMPONENT Mytop)
+ SET(mytop_COMPONENT Client)
  
-@@ -314,21 +317,21 @@ ELSE()
+@@ -314,21 +317,24 @@ ELSE()
        mariadbd-safe
        mariadb-dumpslow
      )
@@ -38,13 +38,12 @@ Allow building a server-only configuration.
 +      mariadb-find-rows
 +      mysql_config
 +      mytop
-+      mariadb-hotcopy
-+    )
++      mariadb-hotcopy)
    ENDIF()
--  # Configure this one, for testing, but do not install it.
--  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in
--    ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
--  # On Unix, most of the files end up in the bin directory
+   # Configure this one, for testing, but do not install it.
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in
+     ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
+   # On Unix, most of the files end up in the bin directory
    SET(BIN_SCRIPTS
 -    msql2mysql
 -    mariadb-setpermission
diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
index 741d8d318ee..8fa20916fa4 100644
--- a/databases/mariadb105-server/Makefile
+++ b/databases/mariadb105-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2021/08/12 10:51:31 nia Exp $
+# $NetBSD: Makefile,v 1.15.2.1 2021/12/14 08:07:21 tm Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	MariaDB 10.5, a free MySQL compatible database (server)
 
 CONFLICTS=	mysql-server-[0-9]*
diff --git a/databases/mariadb105-server/PLIST b/databases/mariadb105-server/PLIST
index b1ec57e27ac..c364aef0b53 100644
--- a/databases/mariadb105-server/PLIST
+++ b/databases/mariadb105-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2021/08/08 21:22:12 nia Exp $
+@comment $NetBSD: PLIST,v 1.7.2.1 2021/12/14 08:07:21 tm Exp $
 bin/aria_chk
 bin/aria_dump_log
 bin/aria_ftdump
@@ -342,6 +342,7 @@ lib/mysql/plugin/test_versioning.so
 lib/mysql/plugin/type_mysql_json.so
 lib/mysql/plugin/type_test.so
 lib/mysql/plugin/wsrep_info.so
+lib/security/pam_user_map.so
 sbin/mariadbd
 sbin/mysqld
 share/doc/mysql/COPYING
@@ -350,6 +351,7 @@ share/doc/mysql/INSTALL-BINARY
 share/doc/mysql/README-wsrep
 share/doc/mysql/README.md
 share/doc/mysql/THIRDPARTY
+share/examples/mariadb_auth_pam/user_map.conf
 share/mysql/charsets/Index.xml
 share/mysql/charsets/README
 share/mysql/charsets/armscii8.xml