CVS commit: pkgsrc/databases

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Aug 12 10:51:32 UTC 2021

Modified Files:
        pkgsrc/databases/mariadb105-server: Makefile
        pkgsrc/databases/mariadb105-server/files: mariadb.sh
        pkgsrc/databases/mariadb106-server: Makefile
        pkgsrc/databases/mariadb106-server/files: mariadb.sh

Log Message:
mariadb[105,106]-server: Use default auth method (socket) in rc script


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/mariadb105-server/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb105-server/files/mariadb.sh
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mariadb106-server/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb106-server/files/mariadb.sh

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

Modified files:

Index: pkgsrc/databases/mariadb105-server/Makefile
diff -u pkgsrc/databases/mariadb105-server/Makefile:1.14 pkgsrc/databases/mariadb105-server/Makefile:1.15
--- pkgsrc/databases/mariadb105-server/Makefile:1.14    Sun Aug  8 21:22:12 2021
+++ pkgsrc/databases/mariadb105-server/Makefile Thu Aug 12 10:51:31 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2021/08/08 21:22:12 nia Exp $
+# $NetBSD: Makefile,v 1.15 2021/08/12 10:51:31 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
+PKGREVISION=   1
 COMMENT=       MariaDB 10.5, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

Index: pkgsrc/databases/mariadb105-server/files/mariadb.sh
diff -u pkgsrc/databases/mariadb105-server/files/mariadb.sh:1.2 pkgsrc/databases/mariadb105-server/files/mariadb.sh:1.3
--- pkgsrc/databases/mariadb105-server/files/mariadb.sh:1.2     Mon Jul 19 14:41:44 2021
+++ pkgsrc/databases/mariadb105-server/files/mariadb.sh Thu Aug 12 10:51:31 2021
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mariadb.sh,v 1.2 2021/07/19 14:41:44 taca Exp $
+# $NetBSD: mariadb.sh,v 1.3 2021/08/12 10:51:31 nia Exp $
 #
 # PROVIDE: mariadb mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -32,7 +32,6 @@ mariadb_initdb() {
         else
                echo "Initializing MariaDB database system tables."
                sh @PREFIX@/bin/mysql_install_db --force \
-                       --auth-root-authentication-method=normal \
                        --user=@MARIADB_USER@ \
                        --datadir=@MARIADB_DATADIR@
                if [ -d @MARIADB_DATADIR@ ]; then

Index: pkgsrc/databases/mariadb106-server/Makefile
diff -u pkgsrc/databases/mariadb106-server/Makefile:1.3 pkgsrc/databases/mariadb106-server/Makefile:1.4
--- pkgsrc/databases/mariadb106-server/Makefile:1.3     Sun Aug  8 21:22:12 2021
+++ pkgsrc/databases/mariadb106-server/Makefile Thu Aug 12 10:51:31 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2021/08/08 21:22:12 nia Exp $
+# $NetBSD: Makefile,v 1.4 2021/08/12 10:51:31 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
+PKGREVISION=   1
 COMMENT=       MariaDB 10.6, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

Index: pkgsrc/databases/mariadb106-server/files/mariadb.sh
diff -u pkgsrc/databases/mariadb106-server/files/mariadb.sh:1.1 pkgsrc/databases/mariadb106-server/files/mariadb.sh:1.2
--- pkgsrc/databases/mariadb106-server/files/mariadb.sh:1.1     Wed Aug  4 15:47:25 2021
+++ pkgsrc/databases/mariadb106-server/files/mariadb.sh Thu Aug 12 10:51:32 2021
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mariadb.sh,v 1.1 2021/08/04 15:47:25 nia Exp $
+# $NetBSD: mariadb.sh,v 1.2 2021/08/12 10:51:32 nia Exp $
 #
 # PROVIDE: mariadb mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -32,7 +32,6 @@ mariadb_initdb() {
         else
                echo "Initializing MariaDB database system tables."
                sh @PREFIX@/bin/mysql_install_db --force \
-                       --auth-root-authentication-method=normal \
                        --user=@MARIADB_USER@ \
                        --datadir=@MARIADB_DATADIR@
                if [ -d @MARIADB_DATADIR@ ]; then