mariadb104: NetBSD doesn't have SO_PEERCRED, so default to "normal" auth

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Thu Apr 29 10:47:22 2021 +0200
Changeset:	b4a657480ef5372d65daf01ead1402fada298ae8

Modified Files:
	mariadb104-client/distinfo
	mariadb104-server/files/mariadb.sh
Added Files:
	mariadb104-client/patches/patch-scripts_mysql__install__db.sh

Log Message:
mariadb104: NetBSD doesn't have SO_PEERCRED, so default to "normal" auth

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b4a657480ef5372d65daf01ead1402fada298ae8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mariadb104-client/distinfo                                |  1 +
 .../patches/patch-scripts_mysql__install__db.sh           | 15 +++++++++++++++
 mariadb104-server/files/mariadb.sh                        |  1 +
 3 files changed, 17 insertions(+)

diffs:
diff --git a/mariadb104-client/distinfo b/mariadb104-client/distinfo
index 0b1456af95..78b5304194 100644
--- a/mariadb104-client/distinfo
+++ b/mariadb104-client/distinfo
@@ -12,6 +12,7 @@ SHA1 (patch-libmariadb_cmake_ConnectorName.cmake) = 57f891c4bd035afb4aa0b03c269c
 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66
 SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317
 SHA1 (patch-scripts_CMakeLists.txt) = 69d7adc8d50a23aeda4b9d9809cf64f6293703e0
+SHA1 (patch-scripts_mysql__install__db.sh) = adf20e80a9881db97f3d2dd8279e52bcedf0bead
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
 SHA1 (patch-sql_mysqld.cc) = 21f9ea79ca90a78f18598d55f209a1835b95858f
 SHA1 (patch-sql_threadpool__generic.cc) = 73df368457a2e88f3cc3221031e565c4208b87ab
diff --git a/mariadb104-client/patches/patch-scripts_mysql__install__db.sh b/mariadb104-client/patches/patch-scripts_mysql__install__db.sh
new file mode 100644
index 0000000000..984143de59
--- /dev/null
+++ b/mariadb104-client/patches/patch-scripts_mysql__install__db.sh
@@ -0,0 +1,15 @@
+$NetBSD$
+
+NetBSD does not have SO_PEERCRED, so there is no auth_socket.
+
+--- scripts/mysql_install_db.sh.orig	2021-02-18 23:22:29.000000000 +0000
++++ scripts/mysql_install_db.sh
+@@ -37,7 +37,7 @@ force=0
+ in_rpm=0
+ ip_only=0
+ cross_bootstrap=0
+-auth_root_authentication_method=socket
++auth_root_authentication_method=normal
+ auth_root_socket_user=""
+ skip_test_db=0
+ 
diff --git a/mariadb104-server/files/mariadb.sh b/mariadb104-server/files/mariadb.sh
index 8ab127672a..d2fb1226aa 100644
--- a/mariadb104-server/files/mariadb.sh
+++ b/mariadb104-server/files/mariadb.sh
@@ -31,6 +31,7 @@ mariadb_initdb() {
         else
 		echo "Initializing MariaDB database system tables."
 		sh @PREFIX@/bin/mysql_install_db --force \
+			--auth-root-authentication-method=normal \
 			--user=mariadb \
 			--datadir=@MARIADB_DATADIR@
 		if [ -d @MARIADB_DATADIR@ ]; then