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

2020-10-31 Thread Joonas Niilola
commit: 98ede44b632ad8b147993a6d8bed2c3b91633ce2
Author: David Denoncin  gmail  com>
AuthorDate: Mon Oct 26 12:56:35 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Nov  1 06:13:55 2020 +
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  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18040
Signed-off-by: Joonas Niilola  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 $?
 }



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

2020-08-14 Thread Sam James
commit: e7e5ee5f8f488c35a163dda0075df0ceb0e02a7b
Author: David Denoncin  gmail  com>
AuthorDate: Mon Aug 10 21:15:42 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 15 05:59:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e5ee5f

www-apps/bugzilla: drop vulnerable old

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: David Denoncin  gmail.com>
Bug: https://bugs.gentoo.org/712706
Closes: https://github.com/gentoo/gentoo/pull/17073
Signed-off-by: Sam James  gentoo.org>

 www-apps/bugzilla/Manifest |   2 -
 www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild| 130 
 www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild | 134 -
 .../bugzilla/files/bugzilla-5.0.3-leftbrace.patch  |  26 
 www-apps/bugzilla/files/bugzilla-queue.confd   |   4 -
 www-apps/bugzilla/files/bugzilla.cron.daily|   5 -
 www-apps/bugzilla/files/bugzilla.cron.tab  |   1 -
 www-apps/bugzilla/files/postinstall-en.txt |  14 ---
 www-apps/bugzilla/files/reconfig   |  19 ---
 www-apps/bugzilla/metadata.xml |   4 -
 10 files changed, 339 deletions(-)

diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index 10e325e2e9e..87c23ddf5c9 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -1,3 +1 @@
-DIST bugzilla-4.4.12.tar.gz 4931062 BLAKE2B 
21d060d3a6bc8fd16d5a0283bb5c3735a473283d829be711e22b9d21fc203c8bd33cc9b940417480fa4b16dc478dcb3b526f305c324c97ccac7965b2820bea01
 SHA512 
51520cc55ae0fb30f8a8efb98e9b5a5a35ca74e9ec3667528fae6520fa7f12137e01948009b152481d0b8e02d435b42c3cacb5449fb42fe709964db68a386548
-DIST bugzilla-5.0.3.tar.gz 4069689 BLAKE2B 
1be1d911b59a06f9073a2e610b88af2b1b62bda1e2ef812f65faf2fc35499cff20b96f29a522cf8478ed65c4de9008a349162159f180f59f79a380d777340548
 SHA512 
82334533bd75a4a5eee5213826da916175ecf39cbfd1c4d820519f015257b02998a3acd881f8f52c1650d1140158c8aa839e374574a1fa862a6a4a1351748c46
 DIST bugzilla-5.0.6.tar.gz 3970724 BLAKE2B 
9fab818a4d93bcd8092ddd2707f5a479b5535ba7621cccb84ce6b8785812e0e46f6d8883b76d3358a60ea5f0b6068008b9b2bfcc745b760f6fec5372216cc1af
 SHA512 
8ca47ea1be2b433a6ce68e1a595d72f3d0f0fede44d1194dc6bc9a116dbde3ab7285212c71995e200d31544876e4c3c57b63da1f877a0cb22747ab87a5d598de

diff --git a/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild 
b/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild
deleted file mode 100644
index c12d12dd9aa..000
--- a/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp depend.apache eutils
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz";
-HOMEPAGE="https://www.bugzilla.org";
-
-LICENSE="MPL-2.0"
-KEYWORDS="amd64 x86"
-
-IUSE="modperl extras graphviz mysql postgres sqlite test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=" || ( mysql postgres sqlite )"
-
-COMMON_DEPS="
-   >=dev-lang/perl-5.10.1
-   >=dev-perl/CGI-3.510.0
-   virtual/perl-Digest-SHA
-   >=dev-perl/DateTime-0.500.0
-   >=dev-perl/DateTime-TimeZone-0.710.0
-   >=dev-perl/DBI-1.601.0
-   >=dev-perl/Template-Toolkit-2.22
-   >=dev-perl/Email-Send-2.40.0
-   >=dev-perl/Email-MIME-1.904.0
-   dev-perl/URI
-   >=dev-perl/List-MoreUtils-0.329.0
-   dev-perl/Math-Random-ISAAC
-"
-
-DEPEND="test? ( dev-perl/Pod-Coverage${COMMON_DEPS} )"
-RDEPEND="
-   virtual/httpd-cgi
-   ${COMMON_DEPS}
-   postgres? ( >=dev-perl/DBD-Pg-1.49.0 )
-   mysql? ( >=dev-perl/DBD-mysql-4.0.5 )
-   sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 )
-   extras? (
-   >=dev-perl/GD-2.35[png,truetype]
-   >=dev-perl/Chart-2.4.1
-   dev-perl/Template-GD
-   dev-perl/GDTextUtil
-   dev-perl/GDGraph
-   dev-perl/XML-Twig
-   >=dev-perl/MIME-tools-5.427.0
-   dev-perl/libwww-perl
-   >=dev-perl/PatchReader-0.9.6
-   dev-perl/perl-ldap
-   dev-perl/Authen-Radius
-   dev-perl/Authen-SASL
-   >=dev-perl/SOAP-Lite-0.712.0
-   dev-perl/JSON-RPC
-   >=dev-perl/JSON-XS-2.0.0
-   dev-perl/Test-Taint
-   >=dev-perl/HTML-Parser-3.67.0
-   dev-perl/HTML-Scrubber
-   >=virtual/perl-Encode-2.21.0
-   dev-perl/Encode-Detect
-   dev-perl/Email-MIME-Attachment-Stripper
-   dev-perl/Email-Reply
-   dev-perl/TheSchwartz
-   dev-perl/Daemon-Generic
-   dev-perl/File-MimeInfo
-   virtual/imagemagick-tools[perl]
-   dev-perl/MIME-tools
-   )
-   modperl? (
-   www-apache/mod_perl:1
-   

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

2020-08-01 Thread Sam James
commit: f2fa70ce5190a8073fd697326a8495f2626326f2
Author: David Denoncin  gmail  com>
AuthorDate: Sat Jul 18 15:58:44 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug  1 20:27:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2fa70ce

www-apps/bugzilla: vbump 5.0.6

This new ebuild leaves dealing with mod_perl to experienced users. This
change enables bumping the ebuild to EAPI 7.

It also loses using use flags for optional runtime dependencies.

Bug: https://bugs.gentoo.org/712706
Closes: https://bugs.gentoo.org/332251
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Denoncin  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16125
Signed-off-by: Sam James  gentoo.org>

 www-apps/bugzilla/Manifest |   1 +
 www-apps/bugzilla/bugzilla-5.0.6.ebuild| 118 +
 .../bugzilla/files/bugzilla-5.0.6-leftbrace.patch  |  17 +++
 www-apps/bugzilla/files/bugzilla-5.0.6-perl.patch  |  17 +++
 .../bugzilla/files/bugzilla-5.0.6-template.patch   |  17 +++
 www-apps/bugzilla/files/postinstall-5.0.6-en.txt   |  30 ++
 www-apps/bugzilla/files/postinstall-en.txt |   1 +
 www-apps/bugzilla/files/postupgrade-5.0.6-en.txt   |  10 ++
 8 files changed, 211 insertions(+)

diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index 3a86ce2d8c4..10e325e2e9e 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -1,2 +1,3 @@
 DIST bugzilla-4.4.12.tar.gz 4931062 BLAKE2B 
21d060d3a6bc8fd16d5a0283bb5c3735a473283d829be711e22b9d21fc203c8bd33cc9b940417480fa4b16dc478dcb3b526f305c324c97ccac7965b2820bea01
 SHA512 
51520cc55ae0fb30f8a8efb98e9b5a5a35ca74e9ec3667528fae6520fa7f12137e01948009b152481d0b8e02d435b42c3cacb5449fb42fe709964db68a386548
 DIST bugzilla-5.0.3.tar.gz 4069689 BLAKE2B 
1be1d911b59a06f9073a2e610b88af2b1b62bda1e2ef812f65faf2fc35499cff20b96f29a522cf8478ed65c4de9008a349162159f180f59f79a380d777340548
 SHA512 
82334533bd75a4a5eee5213826da916175ecf39cbfd1c4d820519f015257b02998a3acd881f8f52c1650d1140158c8aa839e374574a1fa862a6a4a1351748c46
+DIST bugzilla-5.0.6.tar.gz 3970724 BLAKE2B 
9fab818a4d93bcd8092ddd2707f5a479b5535ba7621cccb84ce6b8785812e0e46f6d8883b76d3358a60ea5f0b6068008b9b2bfcc745b760f6fec5372216cc1af
 SHA512 
8ca47ea1be2b433a6ce68e1a595d72f3d0f0fede44d1194dc6bc9a116dbde3ab7285212c71995e200d31544876e4c3c57b63da1f877a0cb22747ab87a5d598de

diff --git a/www-apps/bugzilla/bugzilla-5.0.6.ebuild 
b/www-apps/bugzilla/bugzilla-5.0.6.ebuild
new file mode 100644
index 000..b9d651ea973
--- /dev/null
+++ b/www-apps/bugzilla/bugzilla-5.0.6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils webapp
+
+DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz";
+HOMEPAGE="https://www.bugzilla.org";
+
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="apache2 doc mysql postgres sqlite test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# sorting is identical to upstream MYMETA.json, please don't change
+# These are mandatory for checksetup.pl to configure bugzilla
+BASIC_DEPS="
+   dev-lang/perl
+   >=dev-perl/CGI-3.510.0
+   >=dev-perl/DBI-1.614.0
+   >=dev-perl/TimeDate-2.230.0
+   >=dev-perl/DateTime-0.750.0
+   >=dev-perl/DateTime-TimeZone-1.640.0
+   virtual/perl-Digest-SHA
+   >=dev-perl/Email-MIME-1.904.0
+   >=dev-perl/Email-Sender-1.300.11
+   >=dev-perl/JSON-XS-2.10.0
+   >=dev-perl/List-MoreUtils-0.320.0
+   >=dev-perl/Math-Random-ISAAC-1.0.1
+   >=dev-perl/Template-Toolkit-2.240.0
+   >=dev-perl/URI-1.550.0
+"
+
+RDEPEND="
+   ${BASIC_DEPS}
+   apache2? ( www-servers/apache[apache2_modules_access_compat] )
+   !apache2? ( virtual/httpd-cgi )
+   postgres? ( >=dev-perl/DBD-Pg-1.49 )
+   mysql? ( >=dev-perl/DBD-mysql-4.0.5 )
+   sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 )
+"
+
+BDEPEND="
+   test? ( ${BASIC_DEPS} )
+   doc? (
+   dev-python/sphinx
+   dev-perl/File-Copy-Recursive
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-5.0.6-leftbrace.patch"
+   "${FILESDIR}/${PN}-5.0.6-perl.patch"
+   "${FILESDIR}/${PN}-5.0.6-template.patch"
+)
+
+src_prepare() {
+   default
+
+   # Get rid of the bzr files
+   rm -r .bzr* || die
+
+   # unconditionnally remove pod-coverage tests
+   rm t/011pod.t || die
+}
+
+src_test() {
+   TZ=UTC perl -I. runtests.pl || die
+}
+
+src_install() {
+   webapp_src_preinst
+
+   insinto "${MY_HTDOCSDIR}"
+   doins -r .
+
+   webapp_postinst_txt en "${FILESDIR}/postinstall-${PV}-en.txt"
+   webapp_postupgrade_txt en "${FILESDIR}/postupgrade-${PV}-en.txt"
+   webapp_src_install
+
+   if use doc; then
+   docs/makedocs.p

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

2018-12-25 Thread Andreas K. Hüttel
commit: bce34290b1ac77ddf8e9f018b93356b7e859dadc
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Tue Dec 25 20:40:22 2018 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Tue Dec 25 20:40:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bce34290

www-apps/bugzilla: Fix tests for Perl 5.26, bug 632064

The required modules are not installed into any Perl default search
paths, but into the BZ web directory. This means that not finding
the modules is a test-specific problem; in actual usage they will
be found otherwise.

Closes: https://bugs.gentoo.org/632064
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild| 11 ++---
 www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild | 11 ++---
 .../bugzilla/files/bugzilla-5.0.3-leftbrace.patch  | 26 ++
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild 
b/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild
index 2d6b66fd871..9668d236f5d 100644
--- a/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild
+++ b/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -75,6 +75,10 @@ RDEPEND="
 want_apache modperl
 need_httpd_cgi
 
+PATCHES=(
+   "${FILESDIR}/${PN}"-5.0.3-leftbrace.patch
+)
+
 pkg_setup() {
depend.apache_pkg_setup modperl
webapp_pkg_setup
@@ -86,11 +90,12 @@ src_prepare() {
 
# Remove bundled perl modules
rm -r lib/ || die
-   eapply_user
+
+   default
 }
 
 src_test() {
-   perl runtests.pl || die
+   perl -I. runtests.pl || die
 }
 
 src_install () {

diff --git a/www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild 
b/www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild
index 0675641f321..feb026881ff 100644
--- a/www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild
+++ b/www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -79,6 +79,10 @@ RDEPEND="
 want_apache modperl
 need_httpd_cgi
 
+PATCHES=(
+   "${FILESDIR}/${PN}"-5.0.3-leftbrace.patch
+)
+
 pkg_setup() {
depend.apache_pkg_setup modperl
webapp_pkg_setup
@@ -90,11 +94,12 @@ src_prepare() {
 
# Remove bundled perl modules
rm -r lib/ || die
-   eapply_user
+
+   default
 }
 
 src_test() {
-   perl runtests.pl || die
+   perl -I. runtests.pl || die
 }
 
 src_install () {

diff --git a/www-apps/bugzilla/files/bugzilla-5.0.3-leftbrace.patch 
b/www-apps/bugzilla/files/bugzilla-5.0.3-leftbrace.patch
new file mode 100644
index 000..f5704406d87
--- /dev/null
+++ b/www-apps/bugzilla/files/bugzilla-5.0.3-leftbrace.patch
@@ -0,0 +1,26 @@
+From 3c60fba26b1fa51ec302d05dc6e76236d2f54ba4 Mon Sep 17 00:00:00 2001
+From: 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
+