diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/admin.cgi bugzilla-3.6.3-fhs//admin.cgi
--- bugzilla-3.6.3/admin.cgi 2007-10-19 06:46:10.000000000 +0000
+++ bugzilla-3.6.3-fhs//admin.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -20,8 +20,7 @@
# Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/attachment.cgi bugzilla-3.6.3-fhs//attachment.cgi
--- bugzilla-3.6.3/attachment.cgi 2010-10-26 18:35:08.000000000 +0000
+++ bugzilla-3.6.3-fhs//attachment.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -35,8 +35,7 @@
# Make it harder for us to do dangerous things in Perl.
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::BugMail;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/buglist.cgi bugzilla-3.6.3-fhs//buglist.cgi
--- bugzilla-3.6.3/buglist.cgi 2010-10-18 09:49:49.000000000 +0000
+++ bugzilla-3.6.3-fhs//buglist.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -31,8 +31,7 @@
# Make it harder for us to do dangerous things in Perl.
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/Bugzilla/Constants.pm bugzilla-3.6.3-fhs//Bugzilla/Constants.pm
--- bugzilla-3.6.3/Bugzilla/Constants.pm 2010-11-03 00:46:03.000000000 +0000
+++ bugzilla-3.6.3-fhs//Bugzilla/Constants.pm 2010-11-06 17:49:03.000000000 +0000
@@ -514,44 +514,41 @@
#
# On mod_cgi this will be a relative path. On mod_perl it will be an
# absolute path.
- my $libpath = dirname(dirname($INC{'Bugzilla/Constants.pm'}));
- # We have to detaint $libpath, but we can't use Bugzilla::Util here.
- $libpath =~ /(.*)/;
- $libpath = $1;
+ my $basepath = '/usr/share/bugzilla';
my ($project, $localconfig, $datadir);
if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) {
$project = $1;
- $localconfig = "localconfig.$project";
- $datadir = "data/$project";
+ $localconfig = "/etc/bugzilla/localconfig.$project";
+ $datadir = "/var/lib/bugzilla/$project";
} else {
- $localconfig = "localconfig";
- $datadir = "data";
+ $localconfig = "/etc/bugzilla/localconfig";
+ $datadir = "/var/lib/bugzilla";
}
# We have to return absolute paths for mod_perl.
# That means that if you modify these paths, they must be absolute paths.
return {
- 'libpath' => $libpath,
- 'ext_libpath' => "$libpath/lib",
+ 'libpath' => "$basepath/lib",
+ 'ext_libpath' => "",
# If you put the libraries in a different location than the CGIs,
# make sure this still points to the CGIs.
- 'cgi_path' => $libpath,
- 'templatedir' => "$libpath/template",
+ 'cgi_path' => "$basepath/www",
+ 'templatedir' => "$basepath/template",
'project' => $project,
- 'localconfig' => "$libpath/$localconfig",
- 'datadir' => "$libpath/$datadir",
- 'attachdir' => "$libpath/$datadir/attachments",
- 'skinsdir' => "$libpath/skins",
- 'graphsdir' => "$libpath/graphs",
+ 'localconfig' => "$localconfig",
+ 'datadir' => "$datadir",
+ 'attachdir' => "$datadir/attachments",
+ 'skinsdir' => "$basepath/www/skins",
+ 'graphsdir' => "$datadir/graphs",
# $webdotdir must be in the web server's tree somewhere. Even if you use a
# local dot, we output images to there. Also, if $webdotdir is
# not relative to the bugzilla root directory, you'll need to
# change showdependencygraph.cgi to set image_url to the correct
# location.
# The script should really generate these graphs directly...
- 'webdotdir' => "$libpath/$datadir/webdot",
- 'extensionsdir' => "$libpath/extensions",
+ 'webdotdir' => "$datadir/webdot",
+ 'extensionsdir' => "$basepath/extensions",
};
}
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/Bugzilla/Install/Localconfig.pm bugzilla-3.6.3-fhs//Bugzilla/Install/Localconfig.pm
--- bugzilla-3.6.3/Bugzilla/Install/Localconfig.pm 2010-04-22 18:22:50.000000000 +0000
+++ bugzilla-3.6.3-fhs//Bugzilla/Install/Localconfig.pm 2010-11-06 17:26:33.000000000 +0000
@@ -49,7 +49,7 @@
use constant LOCALCONFIG_VARS => (
{
name => 'create_htaccess',
- default => 1,
+ default => 0,
desc => <<EOT
# If you are using Apache as your web server, Bugzilla can create .htaccess
# files for you that will instruct Apache not to serve files that shouldn't
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/chart.cgi bugzilla-3.6.3-fhs//chart.cgi
--- bugzilla-3.6.3/chart.cgi 2010-10-28 15:35:01.000000000 +0000
+++ bugzilla-3.6.3-fhs//chart.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -44,7 +44,7 @@
# Offer subscription when you get a "series already exists" error?
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/checksetup.pl bugzilla-3.6.3-fhs//checksetup.pl
--- bugzilla-3.6.3/checksetup.pl 2010-03-28 21:38:41.000000000 +0000
+++ bugzilla-3.6.3-fhs//checksetup.pl 2010-11-06 17:26:33.000000000 +0000
@@ -49,8 +49,7 @@
use Pod::Usage;
use Safe;
-BEGIN { chdir dirname($0); }
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla::Constants;
use Bugzilla::Install::Requirements;
use Bugzilla::Install::Util qw(install_string get_version_and_os init_console);
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/colchange.cgi bugzilla-3.6.3-fhs//colchange.cgi
--- bugzilla-3.6.3/colchange.cgi 2010-05-19 16:34:05.000000000 +0000
+++ bugzilla-3.6.3-fhs//colchange.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -24,8 +24,7 @@
# Pascal Held <paheld@gmail.com>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/collectstats.pl bugzilla-3.6.3-fhs//collectstats.pl
--- bugzilla-3.6.3/collectstats.pl 2010-11-02 23:20:36.000000000 +0000
+++ bugzilla-3.6.3-fhs//collectstats.pl 2010-11-06 17:26:33.000000000 +0000
@@ -31,7 +31,7 @@
# ISO (2004-08-14) format.
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use List::Util qw(first);
use Cwd;
@@ -44,6 +44,7 @@
use Bugzilla::User;
use Bugzilla::Product;
use Bugzilla::Field;
+use Bugzilla::Error;
# Turn off output buffering (probably needed when displaying output feedback
# in the regenerate mode).
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/config.cgi bugzilla-3.6.3-fhs//config.cgi
--- bugzilla-3.6.3/config.cgi 2010-03-18 14:02:54.000000000 +0000
+++ bugzilla-3.6.3-fhs//config.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -28,8 +28,7 @@
# Make it harder for us to do dangerous things in Perl.
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/contrib/bzdbcopy.pl bugzilla-3.6.3-fhs//contrib/bzdbcopy.pl
--- bugzilla-3.6.3/contrib/bzdbcopy.pl 2009-10-24 05:30:19.000000000 +0000
+++ bugzilla-3.6.3-fhs//contrib/bzdbcopy.pl 2010-11-06 17:26:33.000000000 +0000
@@ -19,7 +19,7 @@
# Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
use Bugzilla::DB;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/contrib/bz_webservice_demo.pl bugzilla-3.6.3-fhs//contrib/bz_webservice_demo.pl
--- bugzilla-3.6.3/contrib/bz_webservice_demo.pl 2010-10-05 04:35:36.000000000 +0000
+++ bugzilla-3.6.3-fhs//contrib/bz_webservice_demo.pl 2010-11-06 17:26:33.000000000 +0000
@@ -29,7 +29,7 @@
=cut
use strict;
-use lib qw(lib);
+use lib '/usr/share/bugzilla/lib';
use Getopt::Long;
use Pod::Usage;
use File::Basename qw(dirname);
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/contrib/cmdline/makequery bugzilla-3.6.3-fhs//contrib/cmdline/makequery
--- bugzilla-3.6.3/contrib/cmdline/makequery 2005-01-27 19:42:34.000000000 +0000
+++ bugzilla-3.6.3-fhs//contrib/cmdline/makequery 2010-11-06 17:26:33.000000000 +0000
@@ -19,7 +19,7 @@
#
# Contributor(s):
-conf="`dirname $0`/query.conf"
+conf='/etc/bugzilla/query.conf'
query="https://bugzilla.mozilla.org/buglist.cgi?ctype=csv"
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/contrib/console.pl bugzilla-3.6.3-fhs//contrib/console.pl
--- bugzilla-3.6.3/contrib/console.pl 2010-01-31 17:49:13.000000000 +0000
+++ bugzilla-3.6.3-fhs//contrib/console.pl 2010-11-06 17:26:33.000000000 +0000
@@ -21,8 +21,7 @@
# Contributor(s): Jesse Clark <jjclark1982@gmail.com>
use File::Basename;
-BEGIN { chdir dirname($0) . "/.."; }
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/contrib/extension-convert.pl bugzilla-3.6.3-fhs//contrib/extension-convert.pl
--- bugzilla-3.6.3/contrib/extension-convert.pl 2009-11-25 03:37:09.000000000 +0000
+++ bugzilla-3.6.3-fhs//contrib/extension-convert.pl 2010-11-06 17:26:33.000000000 +0000
@@ -21,7 +21,7 @@
use strict;
use warnings;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/contrib/fixperms.pl bugzilla-3.6.3-fhs//contrib/fixperms.pl
--- bugzilla-3.6.3/contrib/fixperms.pl 2010-03-09 07:00:48.000000000 +0000
+++ bugzilla-3.6.3-fhs//contrib/fixperms.pl 2010-11-06 17:26:33.000000000 +0000
@@ -21,7 +21,7 @@
use strict;
use warnings;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Install::Filesystem qw(fix_all_file_permissions);
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/contrib/merge-users.pl bugzilla-3.6.3-fhs//contrib/merge-users.pl
--- bugzilla-3.6.3/contrib/merge-users.pl 2008-03-11 15:50:04.000000000 +0000
+++ bugzilla-3.6.3-fhs//contrib/merge-users.pl 2010-11-06 17:26:33.000000000 +0000
@@ -44,7 +44,7 @@
=cut
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/contrib/recode.pl bugzilla-3.6.3-fhs//contrib/recode.pl
--- bugzilla-3.6.3/contrib/recode.pl 2009-02-20 21:54:16.000000000 +0000
+++ bugzilla-3.6.3-fhs//contrib/recode.pl 2010-11-06 17:26:33.000000000 +0000
@@ -20,7 +20,7 @@
# Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/contrib/sendbugmail.pl bugzilla-3.6.3-fhs//contrib/sendbugmail.pl
--- bugzilla-3.6.3/contrib/sendbugmail.pl 2010-03-08 02:47:38.000000000 +0000
+++ bugzilla-3.6.3-fhs//contrib/sendbugmail.pl 2010-11-06 17:26:33.000000000 +0000
@@ -12,7 +12,7 @@
#
# Usage: perl -T contrib/sendbugmail.pl bug_id user_email
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Util;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/contrib/sendunsentbugmail.pl bugzilla-3.6.3-fhs//contrib/sendunsentbugmail.pl
--- bugzilla-3.6.3/contrib/sendunsentbugmail.pl 2007-10-19 06:46:17.000000000 +0000
+++ bugzilla-3.6.3-fhs//contrib/sendunsentbugmail.pl 2010-11-06 17:26:33.000000000 +0000
@@ -22,8 +22,7 @@
# Myk Melez <myk@mozilla.org>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/contrib/syncLDAP.pl bugzilla-3.6.3-fhs//contrib/syncLDAP.pl
--- bugzilla-3.6.3/contrib/syncLDAP.pl 2008-07-07 09:01:51.000000000 +0000
+++ bugzilla-3.6.3-fhs//contrib/syncLDAP.pl 2010-11-06 17:26:33.000000000 +0000
@@ -21,8 +21,7 @@
#
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Net::LDAP;
use Bugzilla;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/createaccount.cgi bugzilla-3.6.3-fhs//createaccount.cgi
--- bugzilla-3.6.3/createaccount.cgi 2007-11-11 22:03:16.000000000 +0000
+++ bugzilla-3.6.3-fhs//createaccount.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -25,8 +25,7 @@
# Gervase Markham <gerv@gerv.net>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/describecomponents.cgi bugzilla-3.6.3-fhs//describecomponents.cgi
--- bugzilla-3.6.3/describecomponents.cgi 2009-05-21 08:43:23.000000000 +0000
+++ bugzilla-3.6.3-fhs//describecomponents.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -23,7 +23,7 @@
# Frédéric Buclin <LpSolit@gmail.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/describekeywords.cgi bugzilla-3.6.3-fhs//describekeywords.cgi
--- bugzilla-3.6.3/describekeywords.cgi 2009-01-25 12:42:51.000000000 +0000
+++ bugzilla-3.6.3-fhs//describekeywords.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -22,7 +22,7 @@
# Contributor(s): Gervase Markham <gerv@gerv.net>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Error;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/duplicates.cgi bugzilla-3.6.3-fhs//duplicates.cgi
--- bugzilla-3.6.3/duplicates.cgi 2010-02-02 00:02:50.000000000 +0000
+++ bugzilla-3.6.3-fhs//duplicates.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -23,7 +23,7 @@
# Max Kanat-Alexander <mkanat@bugzilla.org>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editclassifications.cgi bugzilla-3.6.3-fhs//editclassifications.cgi
--- bugzilla-3.6.3/editclassifications.cgi 2009-01-02 13:59:22.000000000 +0000
+++ bugzilla-3.6.3-fhs//editclassifications.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -21,7 +21,7 @@
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editcomponents.cgi bugzilla-3.6.3-fhs//editcomponents.cgi
--- bugzilla-3.6.3/editcomponents.cgi 2010-01-31 23:33:30.000000000 +0000
+++ bugzilla-3.6.3-fhs//editcomponents.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -24,7 +24,7 @@
# Akamai Technologies <bugzilla-dev@akamai.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editfields.cgi bugzilla-3.6.3-fhs//editfields.cgi
--- bugzilla-3.6.3/editfields.cgi 2009-01-15 15:47:36.000000000 +0000
+++ bugzilla-3.6.3-fhs//editfields.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -16,7 +16,7 @@
# Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editflagtypes.cgi bugzilla-3.6.3-fhs//editflagtypes.cgi
--- bugzilla-3.6.3/editflagtypes.cgi 2009-11-23 22:40:54.000000000 +0000
+++ bugzilla-3.6.3-fhs//editflagtypes.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -27,7 +27,7 @@
# Make it harder for us to do dangerous things in Perl.
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
# Use Bugzilla's flag modules for handling flag types.
use Bugzilla;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editgroups.cgi bugzilla-3.6.3-fhs//editgroups.cgi
--- bugzilla-3.6.3/editgroups.cgi 2009-12-31 12:48:21.000000000 +0000
+++ bugzilla-3.6.3-fhs//editgroups.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -25,7 +25,7 @@
# Frédéric Buclin <LpSolit@gmail.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editkeywords.cgi bugzilla-3.6.3-fhs//editkeywords.cgi
--- bugzilla-3.6.3/editkeywords.cgi 2010-07-05 01:34:38.000000000 +0000
+++ bugzilla-3.6.3-fhs//editkeywords.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -21,7 +21,7 @@
# Contributor(s): Terry Weissman <terry@mozilla.org>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editmilestones.cgi bugzilla-3.6.3-fhs//editmilestones.cgi
--- bugzilla-3.6.3/editmilestones.cgi 2008-01-27 23:14:14.000000000 +0000
+++ bugzilla-3.6.3-fhs//editmilestones.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -20,7 +20,7 @@
# Frédéric Buclin <LpSolit@gmail.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editparams.cgi bugzilla-3.6.3-fhs//editparams.cgi
--- bugzilla-3.6.3/editparams.cgi 2010-02-10 04:17:28.000000000 +0000
+++ bugzilla-3.6.3-fhs//editparams.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -23,7 +23,7 @@
# Frédéric Buclin <LpSolit@gmail.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editproducts.cgi bugzilla-3.6.3-fhs//editproducts.cgi
--- bugzilla-3.6.3/editproducts.cgi 2009-12-17 23:31:52.000000000 +0000
+++ bugzilla-3.6.3-fhs//editproducts.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -29,7 +29,7 @@
# Elliotte Martin <elliotte.martin@yahoo.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editsettings.cgi bugzilla-3.6.3-fhs//editsettings.cgi
--- bugzilla-3.6.3/editsettings.cgi 2008-01-27 23:14:14.000000000 +0000
+++ bugzilla-3.6.3-fhs//editsettings.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -17,7 +17,7 @@
# Frédéric Buclin <LpSolit@gmail.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editusers.cgi bugzilla-3.6.3-fhs//editusers.cgi
--- bugzilla-3.6.3/editusers.cgi 2009-12-30 14:28:38.000000000 +0000
+++ bugzilla-3.6.3-fhs//editusers.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -21,7 +21,7 @@
# Gavin Shelley <bugzilla@chimpychompy.org>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editvalues.cgi bugzilla-3.6.3-fhs//editvalues.cgi
--- bugzilla-3.6.3/editvalues.cgi 2010-05-14 14:35:51.000000000 +0000
+++ bugzilla-3.6.3-fhs//editvalues.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -19,7 +19,7 @@
# with some cleanup.
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Util;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editversions.cgi bugzilla-3.6.3-fhs//editversions.cgi
--- bugzilla-3.6.3/editversions.cgi 2009-04-10 09:36:43.000000000 +0000
+++ bugzilla-3.6.3-fhs//editversions.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -24,7 +24,7 @@
# Frédéric Buclin <LpSolit@gmail.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editwhines.cgi bugzilla-3.6.3-fhs//editwhines.cgi
--- bugzilla-3.6.3/editwhines.cgi 2010-01-31 23:33:30.000000000 +0000
+++ bugzilla-3.6.3-fhs//editwhines.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -26,8 +26,7 @@
################################################################################
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/editworkflow.cgi bugzilla-3.6.3-fhs//editworkflow.cgi
--- bugzilla-3.6.3/editworkflow.cgi 2008-07-02 19:10:17.000000000 +0000
+++ bugzilla-3.6.3-fhs//editworkflow.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -20,8 +20,7 @@
# Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/email_in.pl bugzilla-3.6.3-fhs//email_in.pl
--- bugzilla-3.6.3/email_in.pl 2010-09-22 12:05:03.000000000 +0000
+++ bugzilla-3.6.3-fhs//email_in.pl 2010-11-06 17:26:33.000000000 +0000
@@ -21,18 +21,7 @@
use strict;
use warnings;
-
-# MTAs may call this script from any directory, but it should always
-# run from this one so that it can find its modules.
-use Cwd qw(abs_path);
-use File::Basename qw(dirname);
-BEGIN {
- # Untaint the abs_path.
- my ($a) = abs_path($0) =~ /^(.*)$/;
- chdir dirname($a);
-}
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Data::Dumper;
use Email::Address;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/enter_bug.cgi bugzilla-3.6.3-fhs//enter_bug.cgi
--- bugzilla-3.6.3/enter_bug.cgi 2010-03-14 22:45:58.000000000 +0000
+++ bugzilla-3.6.3-fhs//enter_bug.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -35,8 +35,7 @@
##############################################################################
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/extensions/create.pl bugzilla-3.6.3-fhs//extensions/create.pl
--- bugzilla-3.6.3/extensions/create.pl 2009-11-25 05:02:55.000000000 +0000
+++ bugzilla-3.6.3-fhs//extensions/create.pl 2010-11-06 17:26:33.000000000 +0000
@@ -20,7 +20,7 @@
# Max Kanat-Alexander <mkanat@bugzilla.org>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
use Bugzilla::Error;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/importxml.pl bugzilla-3.6.3-fhs//importxml.pl
--- bugzilla-3.6.3/importxml.pl 2010-09-23 18:58:04.000000000 +0000
+++ bugzilla-3.6.3-fhs//importxml.pl 2010-11-06 17:26:33.000000000 +0000
@@ -54,16 +54,7 @@
#
#####################################################################
-use File::Basename qw(dirname);
-# MTAs may call this script from any directory, but it should always
-# run from this one so that it can find its modules.
-BEGIN {
- require File::Basename;
- my $dir = $0; $dir =~ /(.*)/; $dir = $1; # trick taint
- chdir(File::Basename::dirname($dir));
-}
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
# Data dumber is used for debugging, I got tired of copying it back in
# and then removing it.
#use Data::Dumper;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/index.cgi bugzilla-3.6.3-fhs//index.cgi
--- bugzilla-3.6.3/index.cgi 2009-10-09 04:31:09.000000000 +0000
+++ bugzilla-3.6.3-fhs//index.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -29,7 +29,7 @@
use strict;
# Include the Bugzilla CGI and general utility library.
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/install-module.pl bugzilla-3.6.3-fhs//install-module.pl
--- bugzilla-3.6.3/install-module.pl 2010-04-20 22:17:50.000000000 +0000
+++ bugzilla-3.6.3-fhs//install-module.pl 2010-11-06 17:26:33.000000000 +0000
@@ -22,14 +22,7 @@
use strict;
use warnings;
-# Have to abs_path('.') or calls to Bugzilla modules won't work once
-# CPAN has chdir'ed around. We do all of this in this funny order to
-# make sure that we use the lib/ modules instead of the base Perl modules,
-# in case the lib/ modules are newer.
-use Cwd qw(abs_path cwd);
-use lib abs_path('.');
-use Bugzilla::Constants;
-use lib abs_path(bz_locations()->{ext_libpath});
++use lib '/usr/share/bugzilla/lib';
use Bugzilla::Install::CPAN;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/jobqueue.pl bugzilla-3.6.3-fhs//jobqueue.pl
--- bugzilla-3.6.3/jobqueue.pl 2009-09-04 21:20:16.000000000 +0000
+++ bugzilla-3.6.3-fhs//jobqueue.pl 2010-11-06 17:26:33.000000000 +0000
@@ -23,9 +23,8 @@
use strict;
use File::Basename;
-BEGIN { chdir dirname($0); }
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::JobQueue::Runner;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/jsonrpc.cgi bugzilla-3.6.3-fhs//jsonrpc.cgi
--- bugzilla-3.6.3/jsonrpc.cgi 2009-11-10 21:19:46.000000000 +0000
+++ bugzilla-3.6.3-fhs//jsonrpc.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -21,7 +21,7 @@
# Max Kanat-Alexander <mkanat@bugzilla.org>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/long_list.cgi bugzilla-3.6.3-fhs//long_list.cgi
--- bugzilla-3.6.3/long_list.cgi 2007-10-19 06:46:11.000000000 +0000
+++ bugzilla-3.6.3-fhs//long_list.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -22,7 +22,7 @@
# Gervase Markham <gerv@gerv.net>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
my $cgi = Bugzilla->cgi;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/migrate.pl bugzilla-3.6.3-fhs//migrate.pl
--- bugzilla-3.6.3/migrate.pl 2009-10-24 05:30:15.000000000 +0000
+++ bugzilla-3.6.3-fhs//migrate.pl 2010-11-06 17:26:33.000000000 +0000
@@ -21,9 +21,8 @@
# Max Kanat-Alexander <mkanat@bugzilla.org>
use strict;
+use lib '/usr/share/bugzilla/lib';
use File::Basename;
-BEGIN { chdir dirname($0); }
-use lib qw(. lib);
use Bugzilla;
use Bugzilla::Migrate;
@@ -107,4 +106,4 @@
You may also need to increase the number of file handles a process is allowed
to hold open (as the migrator will create a file handle for each attachment
in your database). On Linux and simliar systems, you can do this as root
-by typing C<ulimit -n 65535> before running your script.
\ Pas de fin de ligne à la fin du fichier.
+by typing C<ulimit -n 65535> before running your script.
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/page.cgi bugzilla-3.6.3-fhs//page.cgi
--- bugzilla-3.6.3/page.cgi 2010-07-08 22:04:23.000000000 +0000
+++ bugzilla-3.6.3-fhs//page.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -29,8 +29,7 @@
###############################################################################
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Error;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/post_bug.cgi bugzilla-3.6.3-fhs//post_bug.cgi
--- bugzilla-3.6.3/post_bug.cgi 2010-04-07 03:31:29.000000000 +0000
+++ bugzilla-3.6.3-fhs//post_bug.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -25,7 +25,7 @@
# Marc Schumann <wurblzap@gmail.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Attachment;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/process_bug.cgi bugzilla-3.6.3-fhs//process_bug.cgi
--- bugzilla-3.6.3/process_bug.cgi 2010-04-07 03:31:29.000000000 +0000
+++ bugzilla-3.6.3-fhs//process_bug.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -42,8 +42,7 @@
# later processing.
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/query.cgi bugzilla-3.6.3-fhs//query.cgi
--- bugzilla-3.6.3/query.cgi 2010-10-13 22:50:00.000000000 +0000
+++ bugzilla-3.6.3-fhs//query.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -26,7 +26,7 @@
# Max Kanat-Alexander <mkanat@bugzilla.org>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Bug;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/quips.cgi bugzilla-3.6.3-fhs//quips.cgi
--- bugzilla-3.6.3/quips.cgi 2008-11-05 18:38:49.000000000 +0000
+++ bugzilla-3.6.3-fhs//quips.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -24,8 +24,7 @@
# Tobias Burnus <burnus@net-b.de>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/relogin.cgi bugzilla-3.6.3-fhs//relogin.cgi
--- bugzilla-3.6.3/relogin.cgi 2010-08-04 21:49:23.000000000 +0000
+++ bugzilla-3.6.3-fhs//relogin.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -23,7 +23,7 @@
# A. Karl Kornel <karl@kornel.name>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Mailer;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/report.cgi bugzilla-3.6.3-fhs//report.cgi
--- bugzilla-3.6.3/report.cgi 2010-02-18 19:33:13.000000000 +0000
+++ bugzilla-3.6.3-fhs//report.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -22,7 +22,7 @@
# <rdean@cambianetworks.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/reports.cgi bugzilla-3.6.3-fhs//reports.cgi
--- bugzilla-3.6.3/reports.cgi 2010-11-02 23:20:36.000000000 +0000
+++ bugzilla-3.6.3-fhs//reports.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -36,8 +36,7 @@
# Templatization.
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/request.cgi bugzilla-3.6.3-fhs//request.cgi
--- bugzilla-3.6.3/request.cgi 2010-08-04 22:01:37.000000000 +0000
+++ bugzilla-3.6.3-fhs//request.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -27,8 +27,7 @@
# Make it harder for us to do dangerous things in Perl.
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Util;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/runtests.pl bugzilla-3.6.3-fhs//runtests.pl
--- bugzilla-3.6.3/runtests.pl 2007-10-19 06:46:11.000000000 +0000
+++ bugzilla-3.6.3-fhs//runtests.pl 2010-11-06 17:26:33.000000000 +0000
@@ -23,7 +23,7 @@
# Make it harder for us to do dangerous things in Perl.
use diagnostics;
use strict;
-use lib qw(lib);
+use lib '/usr/share/bugzilla/lib';
use Test::Harness qw(&runtests $verbose);
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/sanitycheck.cgi bugzilla-3.6.3-fhs//sanitycheck.cgi
--- bugzilla-3.6.3/sanitycheck.cgi 2009-12-17 23:31:53.000000000 +0000
+++ bugzilla-3.6.3-fhs//sanitycheck.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -25,8 +25,7 @@
# Frédéric Buclin <LpSolit@gmail.com>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Bug;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/sanitycheck.pl bugzilla-3.6.3-fhs//sanitycheck.pl
--- bugzilla-3.6.3/sanitycheck.pl 2008-12-16 21:16:29.000000000 +0000
+++ bugzilla-3.6.3-fhs//sanitycheck.pl 2010-11-06 17:26:33.000000000 +0000
@@ -20,8 +20,7 @@
# Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/search_plugin.cgi bugzilla-3.6.3-fhs//search_plugin.cgi
--- bugzilla-3.6.3/search_plugin.cgi 2008-12-16 22:39:41.000000000 +0000
+++ bugzilla-3.6.3-fhs//search_plugin.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -16,7 +16,7 @@
# Contributor(s): Frédéric Buclin <LpSolit@gmail.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Error;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/show_activity.cgi bugzilla-3.6.3-fhs//show_activity.cgi
--- bugzilla-3.6.3/show_activity.cgi 2009-01-25 12:42:52.000000000 +0000
+++ bugzilla-3.6.3-fhs//show_activity.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -23,8 +23,7 @@
# Gervase Markham <gerv@gerv.net>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Error;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/showattachment.cgi bugzilla-3.6.3-fhs//showattachment.cgi
--- bugzilla-3.6.3/showattachment.cgi 2007-10-19 06:46:11.000000000 +0000
+++ bugzilla-3.6.3-fhs//showattachment.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -22,8 +22,7 @@
# Jacob Steenhagen <jake@bugzilla.org>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Util;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/show_bug.cgi bugzilla-3.6.3-fhs//show_bug.cgi
--- bugzilla-3.6.3/show_bug.cgi 2009-11-10 16:31:48.000000000 +0000
+++ bugzilla-3.6.3-fhs//show_bug.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -21,8 +21,7 @@
# Contributor(s): Terry Weissman <terry@mozilla.org>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/showdependencygraph.cgi bugzilla-3.6.3-fhs//showdependencygraph.cgi
--- bugzilla-3.6.3/showdependencygraph.cgi 2010-03-08 01:05:21.000000000 +0000
+++ bugzilla-3.6.3-fhs//showdependencygraph.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -22,8 +22,7 @@
# Gervase Markham <gerv@gerv.net>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use File::Temp;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/showdependencytree.cgi bugzilla-3.6.3-fhs//showdependencytree.cgi
--- bugzilla-3.6.3/showdependencytree.cgi 2008-06-29 21:57:54.000000000 +0000
+++ bugzilla-3.6.3-fhs//showdependencytree.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -25,8 +25,7 @@
# Frédéric Buclin <LpSolit@gmail.com>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Error;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/sidebar.cgi bugzilla-3.6.3-fhs//sidebar.cgi
--- bugzilla-3.6.3/sidebar.cgi 2007-10-19 06:46:11.000000000 +0000
+++ bugzilla-3.6.3-fhs//sidebar.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -16,8 +16,7 @@
# Contributor(s): Jacob Steenhagen <jake@bugzilla.org>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Error;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/summarize_time.cgi bugzilla-3.6.3-fhs//summarize_time.cgi
--- bugzilla-3.6.3/summarize_time.cgi 2009-11-10 16:31:48.000000000 +0000
+++ bugzilla-3.6.3-fhs//summarize_time.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -18,8 +18,7 @@
# Frédéric Buclin <LpSolit@gmail.com>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Date::Parse; # strptime
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/testserver.pl bugzilla-3.6.3-fhs//testserver.pl
--- bugzilla-3.6.3/testserver.pl 2009-09-04 21:08:05.000000000 +0000
+++ bugzilla-3.6.3-fhs//testserver.pl 2010-11-06 17:26:33.000000000 +0000
@@ -19,7 +19,7 @@
# issues as possible.
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/token.cgi bugzilla-3.6.3-fhs//token.cgi
--- bugzilla-3.6.3/token.cgi 2009-10-09 04:31:09.000000000 +0000
+++ bugzilla-3.6.3-fhs//token.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -27,8 +27,7 @@
# Make it harder for us to do dangerous things in Perl.
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/userprefs.cgi bugzilla-3.6.3-fhs//userprefs.cgi
--- bugzilla-3.6.3/userprefs.cgi 2010-03-29 21:47:39.000000000 +0000
+++ bugzilla-3.6.3-fhs//userprefs.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -23,8 +23,7 @@
# Shane H. W. Travis <travis@sedsystems.ca>
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/votes.cgi bugzilla-3.6.3-fhs//votes.cgi
--- bugzilla-3.6.3/votes.cgi 2010-04-07 03:31:30.000000000 +0000
+++ bugzilla-3.6.3-fhs//votes.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -25,7 +25,7 @@
# Frédéric Buclin <LpSolit@gmail.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/whineatnews.pl bugzilla-3.6.3-fhs//whineatnews.pl
--- bugzilla-3.6.3/whineatnews.pl 2008-04-02 17:42:26.000000000 +0000
+++ bugzilla-3.6.3-fhs//whineatnews.pl 2010-11-06 17:26:33.000000000 +0000
@@ -29,7 +29,7 @@
# touched for more than the number of days specified in the whinedays param.
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Mailer;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/whine.pl bugzilla-3.6.3-fhs//whine.pl
--- bugzilla-3.6.3/whine.pl 2009-12-28 00:58:47.000000000 +0000
+++ bugzilla-3.6.3-fhs//whine.pl 2010-11-06 17:26:33.000000000 +0000
@@ -25,8 +25,7 @@
################################################################################
use strict;
-
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/xml.cgi bugzilla-3.6.3-fhs//xml.cgi
--- bugzilla-3.6.3/xml.cgi 2007-10-19 06:46:11.000000000 +0000
+++ bugzilla-3.6.3-fhs//xml.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -23,8 +23,8 @@
# Gervase Markham <gerv@gerv.net>
use strict;
+use lib '/usr/share/bugzilla/lib';
-use lib qw(. lib);
use Bugzilla;
my $cgi = Bugzilla->cgi;
diff -Naur -x '*~' -x '*.orig' -x '*.rej' bugzilla-3.6.3/xmlrpc.cgi bugzilla-3.6.3-fhs//xmlrpc.cgi
--- bugzilla-3.6.3/xmlrpc.cgi 2009-11-10 21:19:46.000000000 +0000
+++ bugzilla-3.6.3-fhs//xmlrpc.cgi 2010-11-06 17:26:33.000000000 +0000
@@ -16,7 +16,7 @@
# Contributor(s): Marc Schumann <wurblzap@gmail.com>
use strict;
-use lib qw(. lib);
+use lib '/usr/share/bugzilla/lib';
use Bugzilla;
use Bugzilla::Constants;
