CVS commit: pkgsrc/databases/mariadb105-server

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Mon Jul 19 14:41:44 UTC 2021

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

Log Message:
databases/mariadb105-server: fix startup script

Fix startup problem of mariadb.

* Remove creating ${VARBASE}/run/mariadb with OWN_DIRS_PERMS since
  ${VARBASE}/run will be cleared on system start up.
* Create ${VARBASE}/run/mariadb in startup script with sutable owner.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/mariadb105-server/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mariadb105-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.8 pkgsrc/databases/mariadb105-server/Makefile:1.9
--- pkgsrc/databases/mariadb105-server/Makefile:1.8     Mon Jul 12 22:40:00 2021
+++ pkgsrc/databases/mariadb105-server/Makefile Mon Jul 19 14:41:44 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2021/07/12 22:40:00 nia Exp $
+# $NetBSD: Makefile,v 1.9 2021/07/19 14:41:44 taca Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   5
+PKGREVISION=   6
 COMMENT=       MariaDB 10.5, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*
@@ -35,7 +35,6 @@ FILES_SUBST+=         MARIADB_USER=${MARIADB_US
 BUILD_DEFS+=           MARIADB_DATADIR
 
 OWN_DIRS_PERMS+=       ${MARIADB_DATADIR} ${MARIADB_USER} ${MARIADB_GROUP} 0700
-OWN_DIRS_PERMS+=       ${VARBASE}/run/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700
 OWN_DIRS_PERMS+=       ${VARBASE}/log/mariadb ${MARIADB_USER} ${MARIADB_GROUP} 0700
 
 USE_TOOLS=             bash:run perl:run

Index: pkgsrc/databases/mariadb105-server/files/mariadb.sh
diff -u pkgsrc/databases/mariadb105-server/files/mariadb.sh:1.1 pkgsrc/databases/mariadb105-server/files/mariadb.sh:1.2
--- pkgsrc/databases/mariadb105-server/files/mariadb.sh:1.1     Sun May 23 15:32:48 2021
+++ pkgsrc/databases/mariadb105-server/files/mariadb.sh Mon Jul 19 14:41:44 2021
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mariadb.sh,v 1.1 2021/05/23 15:32:48 nia Exp $
+# $NetBSD: mariadb.sh,v 1.2 2021/07/19 14:41:44 taca Exp $
 #
 # PROVIDE: mariadb mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -46,6 +46,11 @@ mariadb_prestart() {
        if ! [ -f @MARIADB_DATADIR@/mysql/user.frm ]; then
                mariadb_initdb
        fi
+       rundir=$(dirname "${pidfile}")
+       if ! [ -d "${rundir}" ]; then
+               mkdir -p "${rundir}"
+               chown @MARIADB_USER@:@MARIADB_GROUP@ "${rundir}"
+       fi
        ulimit -n 4096
 }