pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/databases
Module Name: pkgsrc
Committed By: nia
Date: Fri May 9 14:56:57 UTC 2025
Modified Files:
pkgsrc/databases/mariadb1011-server: Makefile
pkgsrc/databases/mariadb1011-server/files: mariadb.sh
pkgsrc/databases/mariadb105-server: Makefile
pkgsrc/databases/mariadb105-server/files: mariadb.sh
pkgsrc/databases/mariadb106-server: Makefile
pkgsrc/databases/mariadb106-server/files: mariadb.sh
pkgsrc/databases/mariadb114-server: Makefile
pkgsrc/databases/mariadb114-server/files: mariadb.sh
Log Message:
mariadb: RC script fixes. From RVP on netbsd-users@.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/mariadb1011-server/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/mariadb1011-server/files/mariadb.sh
cvs rdiff -u -r1.55 -r1.56 pkgsrc/databases/mariadb105-server/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/mariadb105-server/files/mariadb.sh
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/mariadb106-server/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mariadb106-server/files/mariadb.sh
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/mariadb114-server/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb114-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/mariadb1011-server/Makefile
diff -u pkgsrc/databases/mariadb1011-server/Makefile:1.25 pkgsrc/databases/mariadb1011-server/Makefile:1.26
--- pkgsrc/databases/mariadb1011-server/Makefile:1.25 Sat Apr 19 07:57:34 2025
+++ pkgsrc/databases/mariadb1011-server/Makefile Fri May 9 14:56:56 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2025/04/19 07:57:34 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2025/05/09 14:56:56 nia Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= MariaDB 10.11, a free MySQL compatible database (server)
CONFLICTS= mysql-server-[0-9]*
Index: pkgsrc/databases/mariadb1011-server/files/mariadb.sh
diff -u pkgsrc/databases/mariadb1011-server/files/mariadb.sh:1.2 pkgsrc/databases/mariadb1011-server/files/mariadb.sh:1.3
--- pkgsrc/databases/mariadb1011-server/files/mariadb.sh:1.2 Thu Sep 12 18:59:24 2024
+++ pkgsrc/databases/mariadb1011-server/files/mariadb.sh Fri May 9 14:56:56 2025
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: mariadb.sh,v 1.2 2024/09/12 18:59:24 adam Exp $
+# $NetBSD: mariadb.sh,v 1.3 2025/05/09 14:56:56 nia Exp $
#
# PROVIDE: mariadb mysqld
# REQUIRE: DAEMON LOGIN mountall
@@ -30,7 +30,7 @@ command_args="--pid-file=@VARBASE@/run/m
command_args="${command_args} --user=@MARIADB_USER@"
command_args="${command_args} --datadir=$mariadb_datadir"
command_args="${command_args} --log-error=@VARBASE@/log/mariadb/error.log"
-command_args="${command_args} ${mariadb_flags} &"
+command_args="${command_args} ${mariadb_flags} >/dev/null 2>&1 &"
extra_commands="initdb"
initdb_cmd="mariadb_initdb"
start_precmd="mariadb_prestart"
@@ -38,10 +38,11 @@ pidfile="@VARBASE@/run/mariadb/mariadb.p
mariadb_initdb() {
if [ -f $mariadb_datadir/mysql/user.frm ]; then
+ test -t 1 || return 0 # avoid SIGPIPE
echo "The MariaDB database has already been initialized."
echo "Skipping database initialization."
else
- echo "Initializing MariaDB database system tables."
+ test -t 1 && echo "Initializing MariaDB database system tables."
sh @PREFIX@/bin/mysql_install_db --force \
--user=@MARIADB_USER@ \
--datadir=$mariadb_datadir
Index: pkgsrc/databases/mariadb105-server/Makefile
diff -u pkgsrc/databases/mariadb105-server/Makefile:1.55 pkgsrc/databases/mariadb105-server/Makefile:1.56
--- pkgsrc/databases/mariadb105-server/Makefile:1.55 Sat Apr 19 07:57:34 2025
+++ pkgsrc/databases/mariadb105-server/Makefile Fri May 9 14:56:56 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2025/04/19 07:57:34 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2025/05/09 14:56:56 nia Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 2
+PKGREVISION= 3
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.4 pkgsrc/databases/mariadb105-server/files/mariadb.sh:1.5
--- pkgsrc/databases/mariadb105-server/files/mariadb.sh:1.4 Sun Feb 6 17:52:24 2022
+++ pkgsrc/databases/mariadb105-server/files/mariadb.sh Fri May 9 14:56:56 2025
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mariadb.sh,v 1.4 2022/02/06 17:52:24 abs Exp $
+# $NetBSD: mariadb.sh,v 1.5 2025/05/09 14:56:56 nia Exp $
#
# PROVIDE: mariadb mysqld
# REQUIRE: DAEMON LOGIN mountall
@@ -27,7 +27,7 @@ command_args="--pid-file=@VARBASE@/run/m
command_args="${command_args} --user=@MARIADB_USER@"
command_args="${command_args} --datadir=$mariadb_datadir"
command_args="${command_args} --log-error=@VARBASE@/log/mariadb/error.log"
-command_args="${command_args} ${mariadb_flags} &"
+command_args="${command_args} ${mariadb_flags} >/dev/null 2>&1 &"
extra_commands="initdb"
initdb_cmd="mariadb_initdb"
start_precmd="mariadb_prestart"
@@ -35,10 +35,11 @@ pidfile="@VARBASE@/run/mariadb/mariadb.p
mariadb_initdb() {
if [ -f $mariadb_datadir/mysql/user.frm ]; then
+ test -t 1 || return 0 # avoid SIGPIPE
echo "The MariaDB database has already been initialized."
echo "Skipping database initialization."
else
- echo "Initializing MariaDB database system tables."
+ test -t 1 && echo "Initializing MariaDB database system tables."
sh @PREFIX@/bin/mysql_install_db --force \
--user=@MARIADB_USER@ \
--datadir=$mariadb_datadir
Index: pkgsrc/databases/mariadb106-server/Makefile
diff -u pkgsrc/databases/mariadb106-server/Makefile:1.45 pkgsrc/databases/mariadb106-server/Makefile:1.46
--- pkgsrc/databases/mariadb106-server/Makefile:1.45 Sat Apr 19 07:57:35 2025
+++ pkgsrc/databases/mariadb106-server/Makefile Fri May 9 14:56:57 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2025/04/19 07:57:35 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2025/05/09 14:56:57 nia Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 2
+PKGREVISION= 3
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.3 pkgsrc/databases/mariadb106-server/files/mariadb.sh:1.4
--- pkgsrc/databases/mariadb106-server/files/mariadb.sh:1.3 Sun Feb 6 17:52:25 2022
+++ pkgsrc/databases/mariadb106-server/files/mariadb.sh Fri May 9 14:56:57 2025
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mariadb.sh,v 1.3 2022/02/06 17:52:25 abs Exp $
+# $NetBSD: mariadb.sh,v 1.4 2025/05/09 14:56:57 nia Exp $
#
# PROVIDE: mariadb mysqld
# REQUIRE: DAEMON LOGIN mountall
@@ -27,7 +27,7 @@ command_args="--pid-file=@VARBASE@/run/m
command_args="${command_args} --user=@MARIADB_USER@"
command_args="${command_args} --datadir=$mariadb_datadir"
command_args="${command_args} --log-error=@VARBASE@/log/mariadb/error.log"
-command_args="${command_args} ${mariadb_flags} &"
+command_args="${command_args} ${mariadb_flags} >/dev/null 2>&1 &"
extra_commands="initdb"
initdb_cmd="mariadb_initdb"
start_precmd="mariadb_prestart"
@@ -35,10 +35,11 @@ pidfile="@VARBASE@/run/mariadb/mariadb.p
mariadb_initdb() {
if [ -f $mariadb_datadir/mysql/user.frm ]; then
+ test -t 1 || return 0 # avoid SIGPIPE
echo "The MariaDB database has already been initialized."
echo "Skipping database initialization."
else
- echo "Initializing MariaDB database system tables."
+ test -t 1 && echo "Initializing MariaDB database system tables."
sh @PREFIX@/bin/mysql_install_db --force \
--user=@MARIADB_USER@ \
--datadir=$mariadb_datadir
Index: pkgsrc/databases/mariadb114-server/Makefile
diff -u pkgsrc/databases/mariadb114-server/Makefile:1.11 pkgsrc/databases/mariadb114-server/Makefile:1.12
--- pkgsrc/databases/mariadb114-server/Makefile:1.11 Sat Apr 19 07:57:35 2025
+++ pkgsrc/databases/mariadb114-server/Makefile Fri May 9 14:56:57 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2025/04/19 07:57:35 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2025/05/09 14:56:57 nia Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= MariaDB 11.4, a free MySQL compatible database (server)
CONFLICTS= mysql-server-[0-9]*
Index: pkgsrc/databases/mariadb114-server/files/mariadb.sh
diff -u pkgsrc/databases/mariadb114-server/files/mariadb.sh:1.1 pkgsrc/databases/mariadb114-server/files/mariadb.sh:1.2
--- pkgsrc/databases/mariadb114-server/files/mariadb.sh:1.1 Wed Aug 21 21:08:35 2024
+++ pkgsrc/databases/mariadb114-server/files/mariadb.sh Fri May 9 14:56:57 2025
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mariadb.sh,v 1.1 2024/08/21 21:08:35 nia Exp $
+# $NetBSD: mariadb.sh,v 1.2 2025/05/09 14:56:57 nia Exp $
#
# PROVIDE: mariadb mysqld
# REQUIRE: DAEMON LOGIN mountall
@@ -27,7 +27,7 @@ command_args="--pid-file=@VARBASE@/run/m
command_args="${command_args} --user=@MARIADB_USER@"
command_args="${command_args} --datadir=$mariadb_datadir"
command_args="${command_args} --log-error=@VARBASE@/log/mariadb/error.log"
-command_args="${command_args} ${mariadb_flags} &"
+command_args="${command_args} ${mariadb_flags} >/dev/null 2>&1 &"
extra_commands="initdb"
initdb_cmd="mariadb_initdb"
start_precmd="mariadb_prestart"
@@ -35,10 +35,11 @@ pidfile="@VARBASE@/run/mariadb/mariadb.p
mariadb_initdb() {
if [ -f $mariadb_datadir/mysql/user.frm ]; then
+ test -t 1 || return 0 # avoid SIGPIPE
echo "The MariaDB database has already been initialized."
echo "Skipping database initialization."
else
- echo "Initializing MariaDB database system tables."
+ test -t 1 && echo "Initializing MariaDB database system tables."
sh @PREFIX@/bin/mariadb-install-db --force \
--user=@MARIADB_USER@ \
--datadir=$mariadb_datadir
Home |
Main Index |
Thread Index |
Old Index