gentoo resync : 25.11.2020

3 files changed, 16 insertions, 16 deletions

diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index 9e36827b6f56..3a1be1452041 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -1,9 +1,9 @@
 AUX bugzilla-5.0.6-leftbrace.patch 575 BLAKE2B f65d620eced64b48243bad5116ea6addc49b84a70def7bb7e46bd73ee23ff38b00c9d83b6e88871f0f6e549c00156f4f4b38c351a2bb05e16a4a58c466a61f07 SHA512 e4cee7f75fa80401acb3f000eb73aabb81a862a24152568965f8c0216a0298932b943000713adb713818c349934880942c31b6ff641c255753312a4ce4061d55
 AUX bugzilla-5.0.6-perl.patch 557 BLAKE2B 10dd18e87cb0ea7155bd9bd75c41ace70d2c8227c2296e92cebbeee8beec623944a29a3a0821a16caceae466e274bac1a7e61ed71ac7b22c01d65279684ef61d SHA512 73ea0cd2a3339fc3dd9499398c3b93c49cb79d05933b25d07ed5905f4ebea45cc1962c5fb889413522e380e7659140acd0cb487f29404b8404133daf1adae21a
 AUX bugzilla-5.0.6-template.patch 795 BLAKE2B 89a83ad619aab60b1e6ec4199906687f8297c846986e913a92319476d56e08df605c86fdcd2e5af9970471f7c2363ad43acf4c78a77c92515117d063d32617df SHA512 a16d6fd055e551dd7fbd15e8a72472b5d18efc7fa685a60a8ceaae462edcce7a74190f1e824c78fd5aca368c22076eb88e49724cfcb2a208d6553348fdc6066b
-AUX bugzilla-queue.initd 1253 BLAKE2B 68464ac8184bb224ddeca047c1476c887a32d56ad75cf1978f20bb3b7381c510dc63b33efb2788e21e0ca449e76dc2384505e5db7c5a908aca0cadf319bfee97 SHA512 9e7277c06a07a15f2470b7ea42529c309c32783f192b0703d6b7ea6e1078a116cd2b220413a059bad2c7f5d362876a1207a2f9345c5dee9e28c8175055297e64
+AUX bugzilla-queue.initd 1179 BLAKE2B 7130a87aaa238cf5fb53a2aab89f6d1ac28d621d434c15c56ae2545f1d68a553d9ef161496d65634660a7592a46c9c31c5e4bbc8d8653bc3cc925386725be1c3 SHA512 b66474d37f77e01f623d2273b82d9d591bc91e103c06d7d083dea329a954e4d571ec0108f55fc3a85521b8c9f31788841302a8f1482f2d02cf82bb4d866dc167
 AUX postinstall-5.0.6-en.txt 1292 BLAKE2B deaa9f4c11ffff9f34e0beedbf83b47a568aca86892c63c7a2127fce891168b1cbe8d1ac7aacddbd7fdce48cc8fb6f9530a230a93fde9c726143be3548aa4cbb SHA512 7b7928f6f4b9ec1bf4c565311bebdeb8ec9190d7a3c94a7cb243ca1c0a80c43e6ec1307f7f97d46f480a4aa4f82dded9df4f9894be3f54c1753e937746c1b448
 AUX postupgrade-5.0.6-en.txt 544 BLAKE2B 43b2aa5673de0994ebf33b7e2167e7e91a77cfb7f5b0dea5c04590bd5f97027cb733eaf1ec8b1f209fd2aec690719e383de460b4dbf42f5e18fa5f880010cfd4 SHA512 7f9a0aeda0c665c8027fd71b0a317863dfd1c0a705371de34bf77c31ae0da562a39b101379313a227d1883e5df74c99f16f8b91b69e050c749fc30c9499a0a33
 DIST bugzilla-5.0.6.tar.gz 3970724 BLAKE2B 9fab818a4d93bcd8092ddd2707f5a479b5535ba7621cccb84ce6b8785812e0e46f6d8883b76d3358a60ea5f0b6068008b9b2bfcc745b760f6fec5372216cc1af SHA512 8ca47ea1be2b433a6ce68e1a595d72f3d0f0fede44d1194dc6bc9a116dbde3ab7285212c71995e200d31544876e4c3c57b63da1f877a0cb22747ab87a5d598de
-EBUILD bugzilla-5.0.6.ebuild 3582 BLAKE2B 80eba0a146d5c9e0372661411b0c113005e79ed8f3d69ffc269b4514e607bdfcb67b5d7dd8e4ce92adfb402f1789d0e1d990d30ae80a516dd4705ed1ccdd2f09 SHA512 13531487c1369ee41fd17ac5a1030ac31fbc6d89c0e13dcaacab1b94a8c514cf97590a1a0db4e7bf8b1322a7516b90290ec895e0f7ab1eb12b3ce8ee68add1d7
+EBUILD bugzilla-5.0.6-r1.ebuild 3642 BLAKE2B 260adde9d497721da8f83a69d577499d5b1baf476bdd37b3fd7f6ccbd5b631a2e902a5bb95d0dc1988a06b9d0a3cb1476a0ca98790e9b3dadf835b9cb8be0987 SHA512 de5901eda569d898836d2d644d7aec9fd31680b64c3b07e46c8581ea3730093d380d81eed6871fbedacb5885cbf229709f1ab9aff011bf0d9e4132afbbd0da79
 MISC metadata.xml 477 BLAKE2B 5b332f06a8d6164869f2f699a0550e5039ca099459d24c6fd56939c7d103d43ebbb39eba91caf8ee4f20bba7ac655a77a56dcd7db271cf107bc955daa66213ed SHA512 50a29d5231624acf829e0c6a9aa1cbe269c5d7d1318e0bff28ca73f8fc6a734fc00d0c0a7316bc292ae97b045075f683411c39018f9343536da0f42480602dd3
diff --git a/www-apps/bugzilla/bugzilla-5.0.6.ebuild b/www-apps/bugzilla/bugzilla-5.0.6-r1.ebuild
index 2d6ab69e6189..76a3fa9ba508 100644
--- a/www-apps/bugzilla/bugzilla-5.0.6.ebuild
+++ b/www-apps/bugzilla/bugzilla-5.0.6-r1.ebuild
@@ -110,6 +110,7 @@ pkg_postinst() {
 	optfeature "Mail Queueing" "dev-perl/TheSchwarz dev-perl/Daemon-Generic"
 	optfeature "Sniff MIME type of attachments" "dev-perl/File-MimeInfo dev-perl/IO-stringy"
 	optfeature "Memcached support" "dev-perl/Cache-Memcached"
+	optfeature "SSL Support for SMTP" "dev-perl/IO-Socket-SSL"
 
 	ewarn "If Apache is the chosen webserver, please consider turning the apache2 use flag on"
 	ewarn "Not doing so may result in unexpected runtime errors"
diff --git a/www-apps/bugzilla/files/bugzilla-queue.initd b/www-apps/bugzilla/files/bugzilla-queue.initd
index 800793862f13..3c73041365d3 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 $?
 }