[gentoo-commits] repo/gentoo:master commit in: www-apps/bugzilla/, www-apps/bugzilla/files/

[Joonas Niilola]

commit:     98ede44b632ad8b147993a6d8bed2c3b91633ce2
Author:     David Denoncin <ddenoncin <AT> gmail <DOT> com>
AuthorDate: Mon Oct 26 12:56:35 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 06:13:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98ede44b

www-apps/bugzilla: update init script

Applied patch from Brian Evans "to use openrc-run more portable and
modern format so that different supervisors can be used as the user
desires for bugzilla-queue".

Closes: https://bugs.gentoo.org/749924

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: David Denoncin <ddenoncin <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18040
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...zilla-5.0.6.ebuild => bugzilla-5.0.6-r1.ebuild} |  0
 www-apps/bugzilla/files/bugzilla-queue.initd       | 27 +++++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/www-apps/bugzilla/bugzilla-5.0.6.ebuild b/www-apps/bugzilla/bugzilla-5.0.6-r1.ebuild
similarity index 100%
rename from www-apps/bugzilla/bugzilla-5.0.6.ebuild
rename to www-apps/bugzilla/bugzilla-5.0.6-r1.ebuild

diff --git a/www-apps/bugzilla/files/bugzilla-queue.initd b/www-apps/bugzilla/files/bugzilla-queue.initd
index 800793862f1..3c73041365d 100644
--- a/www-apps/bugzilla/files/bugzilla-queue.initd
+++ b/www-apps/bugzilla/files/bugzilla-queue.initd
@@ -1,10 +1,17 @@
 #!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-PIDFILE="/var/run/bugzilla/${SVCNAME}.pid"
+command=${JOBQUEUE_PATH}
 JOBQUEUE_USER=${JOBQUEUE_USER:-root}
 JOBQUEUE_GROUP=${JOBQUEUE_GROUP:-root}
+command_user="${JOBQUEUE_USER}:${JOBQUEUE_GROUP}"
+pidfile="/var/run/bugzilla/${RC_SVCNAME}.pid"
+command_args="-p ${pidfile} -n ${RC_SVCNAME} start"
+if [ "${supervisor}" = "supervise-daemon" ]; then
+	command_args="-f ${command_args}"
+	pidfile="/var/run/bugzilla/${RC_SVCNAME}.supervise.pid"
+fi
 
 checkconfig() {
 	[[ -z "${JOBQUEUE_USER}" || -z "$(getent passwd ${JOBQUEUE_USER})" ]] && { eerror "JOBQUEUE_USER not set or doesn't exist"; return 1; }
@@ -13,26 +20,18 @@ checkconfig() {
 	return 0
 }
 
-start() {
-	ebegin "Starting ${SVCNAME}"
+start_pre() {
 	checkconfig || return 1
 
-	piddir="${PIDFILE%/*}"
+	piddir="${pidfile%/*}"
 	if [ ! -d "${piddir}" ]; then
-		checkpath -q -d -o $JOBQUEUE_USER:$JOBQUEUE_GROUP -m 0770 "${piddir}" || {
+		checkpath -q -d -o "${command_user}" -m 0770 "${piddir}" || {
 			eend 1
 			return 1
 		}
 	fi
-
-	start-stop-daemon --start --pidfile $PIDFILE --user $JOBQUEUE_USER --group $JOBQUEUE_GROUP \
-		--exec $JOBQUEUE_PATH -- -p $PIDFILE -n $SVCNAME start 1>/dev/null
-	eend $?
 }
 
-stop() {
-	ebegin "Stopping ${SVCNAME}"
+stop_pre() {
 	checkconfig || return 1
-	start-stop-daemon --pidfile $PIDFILE --stop --exec $JOBQUEUE_PATH -- -p $PIDFILE -n $SVCNAME stop
-	eend $?
 }