[Pkg-bugzilla-commits] r58 - in trunk/bugzilla-2.18: . Bugzilla
Alexis Sukrieh
sukria-guest@costa.debian.org
Thu, 21 Apr 2005 10:17:03 +0000
Author: sukria-guest
Date: 2005-04-21 10:16:58 +0000 (Thu, 21 Apr 2005)
New Revision: 58
Modified:
trunk/bugzilla-2.18/Bugzilla/Config.pm
trunk/bugzilla-2.18/CGI.pl
trunk/bugzilla-2.18/attachment.cgi
trunk/bugzilla-2.18/checksetup.pl
trunk/bugzilla-2.18/colchange.cgi
trunk/bugzilla-2.18/collectstats.pl
trunk/bugzilla-2.18/doeditparams.cgi
trunk/bugzilla-2.18/duplicates.cgi
trunk/bugzilla-2.18/editcomponents.cgi
trunk/bugzilla-2.18/editflagtypes.cgi
trunk/bugzilla-2.18/editgroups.cgi
trunk/bugzilla-2.18/editmilestones.cgi
trunk/bugzilla-2.18/editparams.cgi
trunk/bugzilla-2.18/editversions.cgi
trunk/bugzilla-2.18/enter_bug.cgi
trunk/bugzilla-2.18/index.cgi
trunk/bugzilla-2.18/long_list.cgi
trunk/bugzilla-2.18/move.pl
trunk/bugzilla-2.18/post_bug.cgi
trunk/bugzilla-2.18/process_bug.cgi
trunk/bugzilla-2.18/quips.cgi
trunk/bugzilla-2.18/report.cgi
trunk/bugzilla-2.18/reports.cgi
trunk/bugzilla-2.18/show_activity.cgi
trunk/bugzilla-2.18/showattachment.cgi
trunk/bugzilla-2.18/showdependencygraph.cgi
trunk/bugzilla-2.18/userprefs.cgi
trunk/bugzilla-2.18/votes.cgi
trunk/bugzilla-2.18/xml.cgi
Log:
unpatching
Modified: trunk/bugzilla-2.18/Bugzilla/Config.pm
===================================================================
--- trunk/bugzilla-2.18/Bugzilla/Config.pm 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/Bugzilla/Config.pm 2005-04-21 10:16:58 UTC (rev 58)
@@ -263,11 +263,10 @@
close $fh;
- # rename $tmpname, "$datadir/params.new" and use ucf after...
- rename $tmpname, "$datadir/params.new"
- || die "Can't rename $tmpname to $datadir/params.new: $!";
+ rename $tmpname, "$datadir/params"
+ || die "Can't rename $tmpname to $datadir/params: $!";
- ChmodDataFile("$datadir/params.new", 0666);
+ ChmodDataFile("$datadir/params", 0666);
}
# Some files in the data directory must be world readable iff we don't have
Modified: trunk/bugzilla-2.18/CGI.pl
===================================================================
--- trunk/bugzilla-2.18/CGI.pl 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/CGI.pl 2005-04-21 10:16:58 UTC (rev 58)
@@ -28,7 +28,7 @@
# Contains some global routines used throughout the CGI scripts of Bugzilla.
use strict;
-use lib "/usr/share/bugzilla";
+use lib ".";
# use Carp; # for confess
Modified: trunk/bugzilla-2.18/attachment.cgi
===================================================================
--- trunk/bugzilla-2.18/attachment.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/attachment.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -31,7 +31,7 @@
# Make it harder for us to do dangerous things in Perl.
use strict;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
use vars qw(
$template
Modified: trunk/bugzilla-2.18/checksetup.pl
===================================================================
--- trunk/bugzilla-2.18/checksetup.pl 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/checksetup.pl 2005-04-21 10:16:58 UTC (rev 58)
@@ -1,5 +1,4 @@
#!/usr/bin/perl -w
-$|=1;
# -*- Mode: perl; indent-tabs-mode: nil -*-
#
# The contents of this file are subject to the Mozilla Public
@@ -115,11 +114,10 @@
#
use strict;
-use lib "/usr/share/bugzilla";
+use lib ".";
use vars qw( $db_name %answer );
use Bugzilla::Constants;
-use constant MAX_PROMPT_CYCLE => 10;
my $silent;
@@ -157,26 +155,6 @@
exit 1;
}
-# the Debian way of fixing permissions
-# Comes from bugzilla.postinst.
-sub fix_www_data_perm {
- my $path = shift;
- my $chown_cmd = "chown -R www-data.www-data $path";
- my $chmod_file_cmd = "find $path -type f -exec chmod 644 {} \\;";
- my $chmod_dir_cmd = "find $path -type d -exec chmod 755 {} \\; ";
-
- foreach my $cmd ($chown_cmd, $chmod_file_cmd, $chmod_dir_cmd) {
- system($cmd) == 0
- or die "Command `$cmd` failed ($!)";
- }
-}
-sub fix_pl_scripts_perm
-{
- my $path = shift;
- system(qq{find $path -type f -name '*.pl' -print0 | xargs -0 chmod 755}) == 0
- or die "Can't fix $path/* .pl perm : $!";
-}
-
###########################################################################
# Non-interactive override. Pass a filename on the command line which is
# a Perl script. This script defines a %answer hash whose names are tags
@@ -913,8 +891,7 @@
unless (-d 'graphs') {
print "Creating graphs directory...\n";
# permissions for non-webservergroup are fixed later on
- mkdir 'graphs', 0775;
- `chmod a+r graphs`;
+ mkdir 'graphs', 0770;
# Upgrade data format
foreach my $in_file (glob("$datadir/mining/*"))
{
@@ -1040,21 +1017,17 @@
}
}
-
- # This has nothing to do with Debian in fact, as Bugzilla Perl modules are
- # in /usr/share/perl5/Bugzilla.
- # I then comment out that block.
-# if (!-e "Bugzilla/.htaccess") {
-# print "Creating Bugzilla/.htaccess...\n";
-# open HTACCESS, '>', 'Bugzilla/.htaccess';
-# print HTACCESS <<'END';
-## nothing in this directory is retrievable unless overriden by an .htaccess
-## in a subdirectory
-#deny from all
-#END
-# close HTACCESS;
-# chmod $fileperm, "Bugzilla/.htaccess";
-# }
+ if (!-e "Bugzilla/.htaccess") {
+ print "Creating Bugzilla/.htaccess...\n";
+ open HTACCESS, '>', 'Bugzilla/.htaccess';
+ print HTACCESS <<'END';
+# nothing in this directory is retrievable unless overriden by an .htaccess
+# in a subdirectory
+deny from all
+END
+ close HTACCESS;
+ chmod $fileperm, "Bugzilla/.htaccess";
+ }
# Even though $datadir may not (and should not) be in the webtree,
# we can't know for sure, so create the .htaccess anyeay. Its harmless
# if its not accessible...
@@ -1335,11 +1308,6 @@
# fix file (or files - wildcards ok) permissions
sub fixPerms {
-
- # In Debian, we already have good permissions thanks to postinst
- # and we use a simpliest method for that, see fix_www_data_perm()
- return;
-
my ($file_pattern, $owner, $group, $umask, $do_dirs) = @_;
my @files = glob($file_pattern);
my $execperm = 0777 & ~ $umask;
@@ -1349,7 +1317,6 @@
# do not change permissions on directories here unless $do_dirs is set
if (!(-d $file)) {
chown $owner, $group, $file;
- print "chown $owner, $group, $file;\n";
# check if the file is executable.
if (isExecutableFile($file)) {
#printf ("Changing $file to %o\n", $execperm);
@@ -1361,7 +1328,6 @@
}
elsif ($do_dirs) {
chown $owner, $group, $file;
- print "chown $owner, $group, $file;\n";
if ($file =~ /CVS$/) {
chmod 0700, $file;
}
@@ -1396,14 +1362,14 @@
fixPerms($templatedir, $<, $webservergid, 027, 1);
fixPerms('css', $<, $webservergid, 027, 1);
fixPerms('js', $<, $webservergid, 027, 1);
-# chmod 0644, 'globals.pl';
+ chmod 0644, 'globals.pl';
# Don't use fixPerms here, because it won't change perms on the directory
# unless its using recursion
-# chown $<, $webservergid, $datadir;
-# chmod 0771, $datadir;
-# chown $<, $webservergid, 'graphs';
-# chmod 0770, 'graphs';
+ chown $<, $webservergid, $datadir;
+ chmod 0771, $datadir;
+ chown $<, $webservergid, 'graphs';
+ chmod 0770, 'graphs';
} else {
# get current gid from $( list
my $gid = (split " ", $()[0];
@@ -1424,10 +1390,10 @@
# Don't use fixPerms here, because it won't change perms on the directory
# unless its using recursion
-# chown $<, $gid, $datadir;
-# chmod 0777, $datadir;
-# chown $<, $gid, 'graphs';
-# chmod 01777, 'graphs';
+ chown $<, $gid, $datadir;
+ chmod 0777, $datadir;
+ chown $<, $gid, 'graphs';
+ chmod 01777, 'graphs';
}
}
@@ -4229,9 +4195,7 @@
" WHERE name = 'admin' AND id = group_id");
$sth->execute;
# when we have no admin users, prompt for admin email address and password ...
-# if we are in non-interactive mode, process anyway.
-if ($sth->rows == 0 or defined $answer{'ADMIN_EMAIL'}) {
- my $update_only = 1 if $sth->rows > 0;
+if ($sth->rows == 0) {
my $login = "";
my $realname = "";
my $pass1 = "";
@@ -4256,24 +4220,16 @@
and at least one \'.\' after the @.';
}
- unless ($update_only) {
- print "\nLooks like we don't have an administrator set up yet. Either this is your\n";
- print "first time using Bugzilla, or your administrator's privileges might have accidently\n";
- print "been deleted.\n";
- }
-
- #this is useful when using this script in non-interactive mode.
- my $cycle_count = 0;
-
- while(! $admin_ok ) {
- while( $login eq "") {
- print "Enter the e-mail address of the administrator: "
- unless defined $answer{'ADMIN_EMAIL'};
+ print "\nLooks like we don't have an administrator set up yet. Either this is your\n";
+ print "first time using Bugzilla, or your administrator's privileges might have accidently\n";
+ print "been deleted.\n";
+ while(! $admin_ok ) {
+ while( $login eq "" ) {
+ print "Enter the e-mail address of the administrator: ";
$login = $answer{'ADMIN_EMAIL'}
|| ($silent && die("cant preload ADMIN_EMAIL"))
|| <STDIN>;
chomp $login;
-
if(! $login ) {
print "\nYou DO want an administrator, don't you?\n";
}
@@ -4285,24 +4241,18 @@
# Go round, and ask them again
$login = "";
}
-
- die "Failed to get a valid email address: $login\n" if
- ($cycle_count++ > MAX_PROMPT_CYCLE);
}
$login = $dbh->quote($login);
$sth = $dbh->prepare("SELECT login_name FROM profiles" .
" WHERE login_name=$login");
$sth->execute;
if ($sth->rows > 0) {
- if (not $answer{'ADMIN_OK'}) {
- print "$login already has an account.\n";
- print "Make this user the administrator? [Y/n] ";
- }
+ print "$login already has an account.\n";
+ print "Make this user the administrator? [Y/n] ";
my $ok = $answer{'ADMIN_OK'}
|| ($silent && die("cant preload ADMIN_OK"))
|| <STDIN>;
chomp $ok;
-
if ($ok !~ /^n/i) {
$admin_ok = 1;
$admin_create = 0;
@@ -4325,21 +4275,17 @@
}
}
+ if ($admin_create) {
- $cycle_count = 0;
while( $realname eq "" ) {
- print "Enter the real name of the administrator: "
- unless defined $answer{'ADMIN_REALNAME'};
+ print "Enter the real name of the administrator: ";
$realname = $answer{'ADMIN_REALNAME'}
|| ($silent && die("cant preload ADMIN_REALNAME"))
|| <STDIN>;
chomp $realname;
-
if(! $realname ) {
print "\nReally. We need a full name.\n";
}
- die "Failed to get a valid realname: $realname\n" if
- ($cycle_count++ > MAX_PROMPT_CYCLE);
}
# trap a few interrupts so we can fix the echo if we get aborted.
@@ -4348,23 +4294,17 @@
$SIG{QUIT} = \&bailout;
$SIG{TERM} = \&bailout;
- # only on interactive mode !
- if ((not $answer{'ADMIN_PASSWORD'}) and $^O !~ /MSWin32/i) {
+ if ($^O !~ /MSWin32/i) {
system("stty","-echo"); # disable input echoing
}
- my $interactive = 1;
- $interactive = 0 if defined $answer{'ADMIN_PASSWORD'};
-
+
while( $pass1 ne $pass2 ) {
- $cycle_count = 0;
while( $pass1 eq "" || $pass1 !~ /^[[:print:]]{3,16}$/ ) {
- print "Enter a password for the administrator account: "
- unless defined $answer{'ADMIN_PASSWORD'};
+ print "Enter a password for the administrator account: ";
$pass1 = $answer{'ADMIN_PASSWORD'}
|| ($silent && die("cant preload ADMIN_PASSWORD"))
|| <STDIN>;
chomp $pass1;
-
if(! $pass1 ) {
print "\n\nAn empty password is a security risk. Try again!\n";
} elsif ( $pass1 !~ /^.{3,16}$/ ) {
@@ -4372,13 +4312,8 @@
} elsif ( $pass1 !~ /^[[:print:]]{3,16}$/ ) {
print "\n\nThe password contains non-printable characters.\n";
}
-
- die "Failed to get a valid password: $pass1\n" if
- ($cycle_count++ > MAX_PROMPT_CYCLE);
}
- print "\nPlease retype the password to verify: "
- if $interactive;
-
+ print "\nPlease retype the password to verify: ";
$pass2 = $answer{'ADMIN_PASSWORD'}
|| ($silent && die("cant preload ADMIN_PASSWORD"))
|| <STDIN>;
@@ -4393,8 +4328,7 @@
# Crypt the administrator's password
my $cryptedpassword = Crypt($pass1);
- # Only on interactive mode
- if ($interactive and $^O !~ /MSWin32/i) {
+ if ($^O !~ /MSWin32/i) {
system("stty","echo"); # re-enable input echoing
}
@@ -4409,26 +4343,9 @@
# Set default email flags for the Admin, same as for users
my $defaultflagstring = $dbh->quote(Bugzilla::Constants::DEFAULT_EMAIL_SETTINGS);
- if ($admin_create) {
- warn "Creating the administrator $login...\n"
- if ($answer{'ADMIN_REALNAME'});
-
- unless($dbh->do("INSERT INTO profiles (login_name, realname, cryptpassword, emailflags) " .
- "VALUES ($login, $realname, $cryptedpassword, $defaultflagstring)")) {
- die "Unable to create the $login profile.";
- }
+ $dbh->do("INSERT INTO profiles (login_name, realname, cryptpassword, emailflags) " .
+ "VALUES ($login, $realname, $cryptedpassword, $defaultflagstring)");
}
-
- # The ADMIN_REALNAME exists already, but we have to update his profile.
- else {
- warn "Updating the $login account...\n";
- unless ($dbh->do("UPDATE profiles SET realname=$realname, cryptpassword=$cryptedpassword ".
- "WHERE login_name=$login")) {
- die "Unable to update the $login profile.";
- }
- }
-
- unless ($update_only) {
# Put the admin in each group if not already
my $query = "select userid from profiles where login_name = $login";
$sth = $dbh->prepare($query);
@@ -4445,7 +4362,6 @@
(user_id, group_id, isbless, grant_type)
VALUES ($userid, $admingroupid, 1, " . GRANT_DIRECT . ")");
-
# Admins get inherited membership and bless capability for all groups
foreach my $group ( @groups ) {
$dbh->do("INSERT INTO group_group_map
@@ -4455,7 +4371,6 @@
(member_id, grantor_id, isbless)
VALUES ($admingroupid, $group, 1)");
}
- }
print "\n$login is now set up as an administrator account.\n";
}
@@ -4592,16 +4507,5 @@
# when test product was created, admin was unknown
$dbh->do("UPDATE components SET initialowner = $adminuid WHERE initialowner = 0");
-# That's deprecated...
-#
-# Now fixing the right permissions ala bugzilla.postinst.
-# Doing this here is better : it will allow user to run
-# checksetup.pl by hand without breaking bugzilla.
-# (closes #200707)
-# print "Fixing permissions for www-data...\n";
-fix_www_data_perm('/usr/share/bugzilla');
-fix_www_data_perm('/var/cache/bugzilla');
-fix_pl_scripts_perm('/usr/share/bugzilla/lib');
-
unlink "$datadir/versioncache";
Modified: trunk/bugzilla-2.18/colchange.cgi
===================================================================
--- trunk/bugzilla-2.18/colchange.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/colchange.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -23,7 +23,7 @@
use strict;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
use vars qw(
@legal_keywords
Modified: trunk/bugzilla-2.18/collectstats.pl
===================================================================
--- trunk/bugzilla-2.18/collectstats.pl 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/collectstats.pl 2005-04-21 10:16:58 UTC (rev 58)
@@ -34,7 +34,7 @@
use IO::Handle;
use vars @::legal_product;
-use lib "/usr/share/bugzilla";
+use lib ".";
require "globals.pl";
use Bugzilla::Search;
use Bugzilla::User;
@@ -96,7 +96,7 @@
trick_taint($perl);
# Generate a static RDF file containing the default view of the duplicates data.
- open(CGI, "$perl -T /usr/lib/cgi-bin/bugzilla/duplicates.cgi |")
+ open(CGI, "$perl -T duplicates.cgi |")
|| die "can't fork duplicates.cgi: $!";
open(RDF, ">$datadir/duplicates.tmp")
|| die "can't write to $datadir/duplicates.tmp: $!";
Modified: trunk/bugzilla-2.18/doeditparams.cgi
===================================================================
--- trunk/bugzilla-2.18/doeditparams.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/doeditparams.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -23,7 +23,7 @@
use strict;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
Modified: trunk/bugzilla-2.18/duplicates.cgi
===================================================================
--- trunk/bugzilla-2.18/duplicates.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/duplicates.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -27,7 +27,7 @@
use AnyDBM_File;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
require "globals.pl";
require "CGI.pl";
Modified: trunk/bugzilla-2.18/editcomponents.cgi
===================================================================
--- trunk/bugzilla-2.18/editcomponents.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/editcomponents.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -26,7 +26,7 @@
# Holger Schurig <holgerschurig@nikocity.de>
use strict;
-use lib '/usr/share/bugzilla';
+use lib ".";
require "CGI.pl";
require "globals.pl";
Modified: trunk/bugzilla-2.18/editflagtypes.cgi
===================================================================
--- trunk/bugzilla-2.18/editflagtypes.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/editflagtypes.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -26,7 +26,7 @@
# Make it harder for us to do dangerous things in Perl.
use strict;
-use lib '/usr/share/bugzilla';
+use lib ".";
# Include the Bugzilla CGI and general utility library.
require "CGI.pl";
Modified: trunk/bugzilla-2.18/editgroups.cgi
===================================================================
--- trunk/bugzilla-2.18/editgroups.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/editgroups.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -26,7 +26,7 @@
# Code derived from editowners.cgi and editusers.cgi
use strict;
-use lib '/usr/share/bugzilla';
+use lib ".";
use Bugzilla;
use Bugzilla::Constants;
Modified: trunk/bugzilla-2.18/editmilestones.cgi
===================================================================
--- trunk/bugzilla-2.18/editmilestones.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/editmilestones.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -14,7 +14,7 @@
use strict;
-use lib '/usr/share/bugzilla';
+use lib ".";
require "CGI.pl";
require "globals.pl";
Modified: trunk/bugzilla-2.18/editparams.cgi
===================================================================
--- trunk/bugzilla-2.18/editparams.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/editparams.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -23,7 +23,7 @@
use strict;
-use lib '/usr/share/bugzilla';
+use lib ".";
use Bugzilla::Constants;
use Bugzilla::Config qw(:DEFAULT :admin);
Modified: trunk/bugzilla-2.18/editversions.cgi
===================================================================
--- trunk/bugzilla-2.18/editversions.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/editversions.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -27,7 +27,7 @@
# Holger Schurig <holgerschurig@nikocity.de>
use strict;
-use lib '/usr/share/bugzilla';
+use lib ".";
require "CGI.pl";
require "globals.pl";
Modified: trunk/bugzilla-2.18/enter_bug.cgi
===================================================================
--- trunk/bugzilla-2.18/enter_bug.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/enter_bug.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -34,7 +34,7 @@
use strict;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
Modified: trunk/bugzilla-2.18/index.cgi
===================================================================
--- trunk/bugzilla-2.18/index.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/index.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -29,7 +29,7 @@
use strict;
# Include the Bugzilla CGI and general utility library.
-use lib '/usr/share/bugzilla';
+use lib ".";
require "CGI.pl";
use vars qw(
Modified: trunk/bugzilla-2.18/long_list.cgi
===================================================================
--- trunk/bugzilla-2.18/long_list.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/long_list.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -22,7 +22,7 @@
# Gervase Markham <gerv@gerv.net>
use strict;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
use Bugzilla;
Modified: trunk/bugzilla-2.18/move.pl
===================================================================
--- trunk/bugzilla-2.18/move.pl 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/move.pl 2005-04-21 10:16:58 UTC (rev 58)
@@ -24,7 +24,7 @@
use strict;
-use lib "/usr/share/bugzilla";
+use lib qw(.);
require "CGI.pl";
Modified: trunk/bugzilla-2.18/post_bug.cgi
===================================================================
--- trunk/bugzilla-2.18/post_bug.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/post_bug.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -24,7 +24,7 @@
# Gervase Markham <gerv@gerv.net>
use strict;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
Modified: trunk/bugzilla-2.18/process_bug.cgi
===================================================================
--- trunk/bugzilla-2.18/process_bug.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/process_bug.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -29,7 +29,7 @@
my $UserInEditGroupSet = -1;
my $UserInCanConfirmGroupSet = -1;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
Modified: trunk/bugzilla-2.18/quips.cgi
===================================================================
--- trunk/bugzilla-2.18/quips.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/quips.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -31,7 +31,7 @@
$vars
);
-use lib '/usr/share/bugzilla';
+use lib qw(.);
require "CGI.pl";
Modified: trunk/bugzilla-2.18/report.cgi
===================================================================
--- trunk/bugzilla-2.18/report.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/report.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -22,7 +22,7 @@
# <rdean@cambianetworks.com>
use strict;
-use lib '/usr/share/bugzilla';
+use lib ".";
require "CGI.pl";
Modified: trunk/bugzilla-2.18/reports.cgi
===================================================================
--- trunk/bugzilla-2.18/reports.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/reports.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -35,7 +35,7 @@
use strict;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
use Bugzilla::Config qw(:DEFAULT $datadir);
Modified: trunk/bugzilla-2.18/show_activity.cgi
===================================================================
--- trunk/bugzilla-2.18/show_activity.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/show_activity.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -24,7 +24,7 @@
use strict;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
use vars qw ($template $vars);
require "CGI.pl";
Modified: trunk/bugzilla-2.18/showattachment.cgi
===================================================================
--- trunk/bugzilla-2.18/showattachment.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/showattachment.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -23,7 +23,7 @@
use strict;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
use Bugzilla;
use Bugzilla::Util;
Modified: trunk/bugzilla-2.18/showdependencygraph.cgi
===================================================================
--- trunk/bugzilla-2.18/showdependencygraph.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/showdependencygraph.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -23,7 +23,7 @@
use strict;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
use File::Temp;
use Bugzilla;
Modified: trunk/bugzilla-2.18/userprefs.cgi
===================================================================
--- trunk/bugzilla-2.18/userprefs.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/userprefs.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -23,7 +23,7 @@
use strict;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
use Bugzilla;
use Bugzilla::Constants;
Modified: trunk/bugzilla-2.18/votes.cgi
===================================================================
--- trunk/bugzilla-2.18/votes.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/votes.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -24,7 +24,7 @@
# Gervase Markham <gerv@gerv.net>
use strict;
-use lib '/usr/share/bugzilla';
+use lib ".";
use Bugzilla;
use Bugzilla::Constants;
Modified: trunk/bugzilla-2.18/xml.cgi
===================================================================
--- trunk/bugzilla-2.18/xml.cgi 2005-04-21 10:15:50 UTC (rev 57)
+++ trunk/bugzilla-2.18/xml.cgi 2005-04-21 10:16:58 UTC (rev 58)
@@ -24,7 +24,7 @@
use strict;
-use lib '/usr/share/bugzilla';
+use lib qw(.);
require "CGI.pl";