diff options
Diffstat (limited to 'www-apps/bugzilla/files')
| -rw-r--r-- | www-apps/bugzilla/files/bugzilla-5.0.3-leftbrace.patch | 26 | ||||
| -rw-r--r-- | www-apps/bugzilla/files/bugzilla-5.0.6-leftbrace.patch | 17 | ||||
| -rw-r--r-- | www-apps/bugzilla/files/bugzilla-5.0.6-perl.patch | 17 | ||||
| -rw-r--r-- | www-apps/bugzilla/files/bugzilla-5.0.6-template.patch | 17 | ||||
| -rw-r--r-- | www-apps/bugzilla/files/bugzilla-queue.confd | 4 | ||||
| -rw-r--r-- | www-apps/bugzilla/files/bugzilla-queue.initd | 27 | ||||
| -rw-r--r-- | www-apps/bugzilla/files/bugzilla.cron.daily | 5 | ||||
| -rw-r--r-- | www-apps/bugzilla/files/bugzilla.cron.tab | 1 | ||||
| -rw-r--r-- | www-apps/bugzilla/files/postinstall-5.0.6-en.txt | 30 | ||||
| -rw-r--r-- | www-apps/bugzilla/files/postinstall-en.txt | 13 | ||||
| -rw-r--r-- | www-apps/bugzilla/files/postupgrade-5.0.6-en.txt | 10 | ||||
| -rw-r--r-- | www-apps/bugzilla/files/reconfig | 19 |
12 files changed, 104 insertions, 82 deletions
diff --git a/www-apps/bugzilla/files/bugzilla-5.0.3-leftbrace.patch b/www-apps/bugzilla/files/bugzilla-5.0.3-leftbrace.patch deleted file mode 100644 index f5704406d875..000000000000 --- a/www-apps/bugzilla/files/bugzilla-5.0.3-leftbrace.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3c60fba26b1fa51ec302d05dc6e76236d2f54ba4 Mon Sep 17 00:00:00 2001 -From: Simon Green <mail@simon.green> -Date: Sun, 30 Oct 2016 14:55:23 +1000 -Subject: [PATCH] Bug 228444 - Checking for unquoted non regex variable - interpolated into regex - ---- - t/010dependencies.t | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/t/010dependencies.t b/t/010dependencies.t -index 4b7ca223d..1b6c270a8 100644 ---- a/t/010dependencies.t -+++ b/t/010dependencies.t -@@ -69,7 +69,7 @@ foreach my $module (keys %mods) { - $used =~ s#/#::#g; - $used =~ s#\.pm$##; - $used =~ s#\$module#[^:]+#; -- $used =~ s#\${[^}]+}#[^:]+#; -+ $used =~ s#\$\{[^}]+}#[^:]+#; - $used =~ s#[" ]##g; - push(@use, grep(/^\Q$used\E$/, keys %mods)); - } --- -2.20.1 - diff --git a/www-apps/bugzilla/files/bugzilla-5.0.6-leftbrace.patch b/www-apps/bugzilla/files/bugzilla-5.0.6-leftbrace.patch new file mode 100644 index 000000000000..efecc0a07d0f --- /dev/null +++ b/www-apps/bugzilla/files/bugzilla-5.0.6-leftbrace.patch @@ -0,0 +1,17 @@ +Fixes unescaped left brace in regex to pass test 010dependencies.t + +Fix by David Denoncin, based on the 5.0.3 patch + +https://bugzilla.mozilla.org/show_bug.cgi?id=228444 + +--- a/t/010dependencies.t 2020-06-09 21:21:28.049161109 -0000 ++++ b/t/010dependencies.t 2020-06-09 21:21:07.059161235 -0000 +@@ -71,7 +71,7 @@ + $used =~ s#/#::#g; + $used =~ s#\.pm$##; + $used =~ s#\$module#[^:]+#; +- $used =~ s#\${[^}]+}#[^:]+#; ++ $used =~ s#\$\{[^}]+}#[^:]+#; + $used =~ s#[" ]##g; + push(@use, grep(/^\Q$used\E$/, keys %mods)); + } diff --git a/www-apps/bugzilla/files/bugzilla-5.0.6-perl.patch b/www-apps/bugzilla/files/bugzilla-5.0.6-perl.patch new file mode 100644 index 000000000000..540e70bd880b --- /dev/null +++ b/www-apps/bugzilla/files/bugzilla-5.0.6-perl.patch @@ -0,0 +1,17 @@ +Fixes a Perl bug making checksetup.pl fail + +Fix by David Denoncin + +https://github.com/Perl/perl5/issues/17271 +https://bugzilla.mozilla.org/show_bug.cgi?id=1588175 + +--- a/Bugzilla/Util.pm 2020-07-10 07:18:37.329165376 -0000 ++++ b/Bugzilla/Util.pm 2020-07-10 07:18:55.869165262 -0000 +@@ -106,7 +106,6 @@ + # |U+200e|Left-To-Right Mark |0xe2 0x80 0x8e | + # |U+200f|Right-To-Left Mark |0xe2 0x80 0x8f | + # -------------------------------------------------------- +- $var =~ tr/\x{202a}-\x{202e}//d; + } + return $var; + } diff --git a/www-apps/bugzilla/files/bugzilla-5.0.6-template.patch b/www-apps/bugzilla/files/bugzilla-5.0.6-template.patch new file mode 100644 index 000000000000..040eaf734a8a --- /dev/null +++ b/www-apps/bugzilla/files/bugzilla-5.0.6-template.patch @@ -0,0 +1,17 @@ +Fixes a simple typo in a template allowing tests to pass + +Fix by David Denoncin + +https://bugzilla.mozilla.org/show_bug.cgi?id=1644655 + +--- a/template/en/default/pages/release-notes.html.tmpl 2020-06-09 21:34:41.845822737 -0000 ++++ b/template/en/default/pages/release-notes.html.tmpl 2020-06-09 21:05:23.515833860 -0000 +@@ -45,7 +45,7 @@ + + <h3>5.0.6</h3> + <p>This release contains a schema change to the flagtypes table, allowing for many more flagtypes.</p>. +-<p>The flagtypes table should have been using a mediumint for several releases, but due to a bug in the schema migration code this never happened.</p> ++<p>The flagtypes table should have been using a mediumint for several releases, but due to [% terms.abug %] in the schema migration code this never happened.</p> + + <h3>5.0.5</h3> + diff --git a/www-apps/bugzilla/files/bugzilla-queue.confd b/www-apps/bugzilla/files/bugzilla-queue.confd deleted file mode 100644 index 2eec355a0986..000000000000 --- a/www-apps/bugzilla/files/bugzilla-queue.confd +++ /dev/null @@ -1,4 +0,0 @@ -#JOBQUEUE_USER=bugzilla -#JOBQUEUE_GROUP=bugzilla - -JOBQUEUE_PATH=/var/www/bugzilla/jobqueue.pl 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 $? } diff --git a/www-apps/bugzilla/files/bugzilla.cron.daily b/www-apps/bugzilla/files/bugzilla.cron.daily deleted file mode 100644 index e3e86589891d..000000000000 --- a/www-apps/bugzilla/files/bugzilla.cron.daily +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -cd /var/www/bugzilla/ -./collectstats.pl -./whineatnews.pl -echo "*** Bugzilla nighlty flush has done! ***" diff --git a/www-apps/bugzilla/files/bugzilla.cron.tab b/www-apps/bugzilla/files/bugzilla.cron.tab deleted file mode 100644 index 3cf2d4a66240..000000000000 --- a/www-apps/bugzilla/files/bugzilla.cron.tab +++ /dev/null @@ -1 +0,0 @@ -0 0 * * * /var/www/bugzilla/bugzilla.cron.daily diff --git a/www-apps/bugzilla/files/postinstall-5.0.6-en.txt b/www-apps/bugzilla/files/postinstall-5.0.6-en.txt new file mode 100644 index 000000000000..5c60465deb8f --- /dev/null +++ b/www-apps/bugzilla/files/postinstall-5.0.6-en.txt @@ -0,0 +1,30 @@ +0. Bugzilla has been installed into ${MY_INSTALLDIR} + +1. To finish the installation, please read + https://bugzilla.readthedocs.io/en/5.0/installing/index.html + https://wiki.gentoo.org/wiki/Bugzilla + You will need to run ${MY_INSTALLDIR}/checksetup.pl + +2. Please read the Release Notes, especially if you are upgrading: + https://www.bugzilla.org/releases/${PV}/release-notes.html + +3. Please note that Apache2 sets AllowOverride None by default. You may have + to edit it to process the .htaccess file provided by Bugzilla. Please see + https://httpd.apache.org/docs/2.2/mod/core.html#allowoverride and + https://bugzilla.readthedocs.io/en/5.0/installing/apache.html for more info. + +4. If this is a large project and you wish to enable mail queuing, you need to + emerge dev-perl/TheSchwarz and dev-perl/Daemon-Generic. To enable mail + queuing as an openrc-service, create a file named bugzilla-queue in + /etc/conf.d/ with this one line + + JOBQUEUE_PATH=${MY_INSTALLDIR} + + Which defines the variable used by the openrc service file + /etc/init.d/bugzilla-queue + Then run: + + rc-update add bugzilla-queue default + +5. For other optional post installation configuration, please read + https://bugzilla.readthedocs.io/en/5.0/installing/optional-post-install-config.html diff --git a/www-apps/bugzilla/files/postinstall-en.txt b/www-apps/bugzilla/files/postinstall-en.txt deleted file mode 100644 index 9b6a8798a640..000000000000 --- a/www-apps/bugzilla/files/postinstall-en.txt +++ /dev/null @@ -1,13 +0,0 @@ -0. Bugzilla has been installed into ${MY_INSTALLDIR} - -1. To finish the installation, please read - http://www.bugzilla.org/docs/${MY_PB}/en/html/installing-bugzilla.html - You will need to run ${MY_INSTALLDIR}/checksetup.pl - -2. Please read the Release Notes, especially if you are upgrading: - http://www.bugzilla.org/releases/${MY_PB}/release-notes.html - -3. Please note that Apache2 sets AllowOverride None by default. You may have - to edit it to process the .htaccess file provided by Bugzilla. Please see - https://httpd.apache.org/docs/2.2/mod/core.html#allowoverride and - http://www.bugzilla.org/docs/${MY_PB}/en/html/configuration.html#http for more info. diff --git a/www-apps/bugzilla/files/postupgrade-5.0.6-en.txt b/www-apps/bugzilla/files/postupgrade-5.0.6-en.txt new file mode 100644 index 000000000000..9b1fab718b61 --- /dev/null +++ b/www-apps/bugzilla/files/postupgrade-5.0.6-en.txt @@ -0,0 +1,10 @@ +0. Please NOTE: It is impossible to downgrade bugzilla. Prior to upgrading + you should always make a backup of your database, data files and lib files and + read https://www.bugzilla.org/releases/${PV}/release-notes.html + +1. If you have bugzilla emerged with the vhosts flag on, please refer to + https://wiki.gentoo.org/wiki/Webapp-config#Upgrading_an_installed_webapp + or https://wiki.gentoo.org/wiki/Bugzilla#Upgrading to upgrade your bugzilla + instance. + +2. After upgrading you have to run checksetup.pl to complete the upgrade. diff --git a/www-apps/bugzilla/files/reconfig b/www-apps/bugzilla/files/reconfig deleted file mode 100644 index 71b0acea2585..000000000000 --- a/www-apps/bugzilla/files/reconfig +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -FILE="bugzilla.cron.daily bugzilla.cron.tab" - -function die () -{ - echo - echo "***" - echo "*** Fatal error: $*" - echo "***" - exit 1 -} - -if [ $1 = "install" ]; then - cd "${MY_INSTALLDIR}" || die "Cannot find install dir ${MY_INSTALLDIR}" - sed -e "s|/var/www/bugzilla|${MY_INSTALLDIR}|g" -i ${FILE} || die "sed failed" -else - echo "done." -fi |