summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2021-08-12 10:51:31 +0000
committernia <nia@pkgsrc.org>2021-08-12 10:51:31 +0000
commitd8f196d4f36b29d96119a05fc8ab85973c269c53 (patch)
treeee3979fb1461514994bf44a5f827548f7afac61e /databases
parenta0dd2e0bdb31a5ff956dd6d063a75c1d8ab834aa (diff)
downloadpkgsrc-d8f196d4f36b29d96119a05fc8ab85973c269c53.tar.gz
mariadb[105,106]-server: Use default auth method (socket) in rc script
Diffstat (limited to 'databases')
-rw-r--r--databases/mariadb105-server/Makefile3
-rw-r--r--databases/mariadb105-server/files/mariadb.sh3
-rw-r--r--databases/mariadb106-server/Makefile3
-rw-r--r--databases/mariadb106-server/files/mariadb.sh3
4 files changed, 6 insertions, 6 deletions
diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
index 4634ff4ffbe..741d8d318ee 100644
--- a/databases/mariadb105-server/Makefile
+++ b/databases/mariadb105-server/Makefile
@@ -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]*
diff --git a/databases/mariadb105-server/files/mariadb.sh b/databases/mariadb105-server/files/mariadb.sh
index 29c0564338d..d53b6037afd 100644
--- a/databases/mariadb105-server/files/mariadb.sh
+++ b/databases/mariadb105-server/files/mariadb.sh
@@ -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
diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
index 040c65080d8..f6ae24abf24 100644
--- a/databases/mariadb106-server/Makefile
+++ b/databases/mariadb106-server/Makefile
@@ -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]*
diff --git a/databases/mariadb106-server/files/mariadb.sh b/databases/mariadb106-server/files/mariadb.sh
index b19b91291b6..38f0b8dd0a3 100644
--- a/databases/mariadb106-server/files/mariadb.sh
+++ b/databases/mariadb106-server/files/mariadb.sh
@@ -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