Date: Wed, 17 Aug 2011 00:11:15 +0200 (CEST) From: Olli Hauer <ohauer@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: skv@FreeBSD.org Subject: ports/159823: [patch] devel/bugzilla fix for chacksetup if p5-version>=0.92 is installed Message-ID: <20110816221116.270C320808@p578be941.dip0.t-ipconnect.de> Resent-Message-ID: <201108162220.p7GMK7Vj000667@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159823 >Category: ports >Synopsis: [patch] devel/bugzilla fix for chacksetup if p5-version>=0.92 is installed >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Aug 16 22:20:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Olli Hauer >Release: FreeBSD 7.4-RELEASE-p2 i386 >Organization: >Environment: >Description: Fix checksetup issue if p5-version>=0.92 is installed (which is in current ports tree) See https://bugzilla.mozilla.org/show_bug.cgi?id=678772 Issue: checksetup stops at the routine to detect DBD modules and setup / upgrade fails. >How-To-Repeat: >Fix: --- bugzilla.diff begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/devel/bugzilla/Makefile,v retrieving revision 1.87 diff -u -r1.87 Makefile --- Makefile 13 Aug 2011 18:24:21 -0000 1.87 +++ Makefile 16 Aug 2011 21:48:51 -0000 @@ -7,6 +7,7 @@ PORTNAME= bugzilla PORTVERSION= 4.0.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= webtools webtools/archived Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/devel/bugzilla/pkg-plist,v retrieving revision 1.39 diff -u -r1.39 pkg-plist --- pkg-plist 18 Jul 2011 21:56:01 -0000 1.39 +++ pkg-plist 16 Aug 2011 21:48:51 -0000 @@ -970,7 +970,7 @@ @dirrmtry %%WWWDIR%%/js/yui/assets @dirrmtry %%WWWDIR%%/js/yui/animation @dirrmtry %%WWWDIR%%/js/yui -@dirrm %%WWWDIR%%/js +@dirrmtry %%WWWDIR%%/js @dirrm %%WWWDIR%%/images %%CONTRIB%%@dirrm %%WWWDIR%%/contrib/cmdline %%CONTRIB%%@dirrm %%WWWDIR%%/contrib/bugzilla-submit Index: files/patch-Bugzilla__Install__Requirements.pm =================================================================== RCS file: files/patch-Bugzilla__Install__Requirements.pm diff -N files/patch-Bugzilla__Install__Requirements.pm --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Bugzilla__Install__Requirements.pm 16 Aug 2011 21:48:51 -0000 @@ -0,0 +1,14 @@ +--- ./Bugzilla/Install/Requirements.pm.orig 2011-08-05 04:25:35.000000000 +0200 ++++ ./Bugzilla/Install/Requirements.pm 2011-08-16 08:55:28.000000000 +0200 +@@ -698,8 +698,9 @@ + # show "ok" or "not found". + if (exists $params->{found}) { + my $found_string; +- # We do a string compare in case it's non-numeric. +- if ($found and $found eq "-1") { ++ # We do a string compare in case it's non-numeric. We make sure ++ # it's not a version object as negative versions are forbidden. ++ if ($found && !ref($found) && $found eq '-1') { + $found_string = install_string('module_not_found'); + } + elsif ($found) { --- bugzilla.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110816221116.270C320808>