Disassociate from controlling terminal (using Perl, already a

dependency) and run the logger as ${mysqld_user}, not root.
Bump PKGREVISIONs.

8 files changed, 20 insertions, 17 deletions

diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 704c7e753aa..eeac01fa39a 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2017/04/13 13:44:49 mef Exp $
+# $NetBSD: Makefile,v 1.30 2017/06/24 15:18:42 schmonz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
+PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=		mysql3-server-[0-9]*
diff --git a/databases/mysql51-server/files/mysqld.sh b/databases/mysql51-server/files/mysqld.sh
index 18cff1683c2..7325516e045 100644
--- a/databases/mysql51-server/files/mysqld.sh
+++ b/databases/mysql51-server/files/mysqld.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.3 2014/12/05 17:22:15 schmonz Exp $
+# $NetBSD: mysqld.sh,v 1.4 2017/06/24 15:18:42 schmonz Exp $
 #
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -81,10 +81,10 @@ mysqld_start()
 	@ECHO@ "Starting ${name}."
 	ulimit -n 4096
 	cd @PREFIX@
-	${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
+	@PERL5@ -e 'use POSIX qw(setsid); setsid(); { exec (@ARGV) }' ${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
 		   --pid-file=${mysqld_pidfile} ${mysqld_flags} \
 		   ${thread_flags} \
-		   2>&1 | logger -t nbmysqld_safe \
+		   2>&1 | @PERL5@ -e 'use POSIX qw(setsid); setsid(); { exec (@ARGV) }' @SU@ -m ${mysqld_user} -c 'logger -t nbmysqld_safe' \
 		   &
 }
 
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 49af6f9cca1..29541128c57 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2016/04/18 10:01:16 adam Exp $
+# $NetBSD: Makefile,v 1.32 2017/06/24 15:18:42 schmonz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
+PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*
diff --git a/databases/mysql55-server/files/mysqld.sh b/databases/mysql55-server/files/mysqld.sh
index 53c1771f7c8..d4b7414da4e 100644
--- a/databases/mysql55-server/files/mysqld.sh
+++ b/databases/mysql55-server/files/mysqld.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.3 2014/12/05 17:22:16 schmonz Exp $
+# $NetBSD: mysqld.sh,v 1.4 2017/06/24 15:18:42 schmonz Exp $
 #
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -75,10 +75,10 @@ mysqld_start()
 	@ECHO@ "Starting ${name}."
 	ulimit -n 4096
 	cd @PREFIX@
-	${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
+	@PERL5@ -e 'use POSIX qw(setsid); setsid(); { exec (@ARGV) }' ${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
 		   --pid-file=${mysqld_pidfile} ${mysqld_flags} \
 		   ${thread_flags} \
-		   2>&1 | logger -t nbmysqld_safe \
+		   2>&1 | @PERL5@ -e 'use POSIX qw(setsid); setsid(); { exec (@ARGV) }' @SU@ -m ${mysqld_user} -c 'logger -t nbmysqld_safe' \
 		   &
 }
 
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 883938859fe..23c1defe361 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2016/09/08 09:38:08 abs Exp $
+# $NetBSD: Makefile,v 1.32 2017/06/24 15:18:42 schmonz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
+PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*
diff --git a/databases/mysql56-server/files/mysqld.sh b/databases/mysql56-server/files/mysqld.sh
index 73684a10eb5..e07846141bd 100644
--- a/databases/mysql56-server/files/mysqld.sh
+++ b/databases/mysql56-server/files/mysqld.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.3 2014/12/05 17:22:16 schmonz Exp $
+# $NetBSD: mysqld.sh,v 1.4 2017/06/24 15:18:42 schmonz Exp $
 #
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -74,10 +74,10 @@ mysqld_start()
 	@ECHO@ "Starting ${name}."
 	ulimit -n 4096
 	cd @PREFIX@
-	${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
+	@PERL5@ -e 'use POSIX qw(setsid); setsid(); { exec (@ARGV) }' ${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
 		   --pid-file=${mysqld_pidfile} ${mysqld_flags} \
 		   ${thread_flags} \
-		   2>&1 | logger -t nbmysqld_safe \
+		   2>&1 | @PERL5@ -e 'use POSIX qw(setsid); setsid(); { exec (@ARGV) }' @SU@ -m ${mysqld_user} -c 'logger -t nbmysqld_safe' \
 		   &
 }
 
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index c452a59948a..e505c558a23 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2017/04/30 01:21:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2017/06/24 15:18:42 schmonz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*
diff --git a/databases/mysql57-server/files/mysqld.sh b/databases/mysql57-server/files/mysqld.sh
index 1f532d3f7a8..7a9e44e1406 100644
--- a/databases/mysql57-server/files/mysqld.sh
+++ b/databases/mysql57-server/files/mysqld.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.1 2016/09/16 06:49:12 adam Exp $
+# $NetBSD: mysqld.sh,v 1.2 2017/06/24 15:18:42 schmonz Exp $
 #
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -74,10 +74,10 @@ mysqld_start()
 	@ECHO@ "Starting ${name}."
 	ulimit -n 4096
 	cd @PREFIX@
-	${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
+	@PERL5@ -e 'use POSIX qw(setsid); setsid(); { exec (@ARGV) }' ${command} --user=${mysqld_user} --datadir=${mysqld_datadir} \
 		   --pid-file=${mysqld_pidfile} ${mysqld_flags} \
 		   ${thread_flags} \
-		   2>&1 | logger -t nbmysqld_safe \
+		   2>&1 | @PERL5@ -e 'use POSIX qw(setsid); setsid(); { exec (@ARGV) }' @SU@ -m ${mysqld_user} -c 'logger -t nbmysqld_safe' \
 		   &
 }