1 diff -burNp bugzilla-3.3.3/Bugzilla/Constants.pm bugzilla-3.3.3-dud/Bugzilla/Constants.pm
2 --- bugzilla-3.3.3/Bugzilla/Constants.pm 2009-02-03 11:03:46.000000000 +0100
3 +++ bugzilla-3.3.3-dud/Bugzilla/Constants.pm 2009-03-18 16:41:34.475759477 +0100
4 @@ -482,10 +482,10 @@ sub bz_locations {
5 my ($project, $localconfig, $datadir);
6 if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) {
8 - $localconfig = "localconfig.$project";
9 + $localconfig = "localconfig.$project.pl";
10 $datadir = "data/$project";
12 - $localconfig = "localconfig";
13 + $localconfig = "localconfig.pl";
17 @@ -496,13 +496,13 @@ sub bz_locations {
18 'ext_libpath' => "$libpath/lib",
19 # If you put the libraries in a different location than the CGIs,
20 # make sure this still points to the CGIs.
21 - 'cgi_path' => $libpath,
22 - 'templatedir' => "$libpath/template",
23 + 'cgi_path' => '/usr/share/bugzilla/htdocs',
24 + 'templatedir' => "/usr/share/bugzilla/template",
25 'project' => $project,
26 - 'localconfig' => "$libpath/$localconfig",
27 - 'datadir' => "$libpath/$datadir",
28 - 'attachdir' => "$libpath/$datadir/attachments",
29 - 'skinsdir' => "$libpath/skins",
30 + 'localconfig' => "/etc/webapps/bugzilla/$localconfig",
31 + 'datadir' => "/var/lib/bugzilla/$datadir",
32 + 'attachdir' => "/var/lib/bugzilla/$datadir/attachments",
33 + 'skinsdir' => "/usr/share/bugzilla/htdocs/skins",
34 # $webdotdir must be in the web server's tree somewhere. Even if you use a
35 # local dot, we output images to there. Also, if $webdotdir is
36 # not relative to the bugzilla root directory, you'll need to
37 diff -burNp bugzilla-3.3.3/Bugzilla/Install/Filesystem.pm bugzilla-3.3.3-dud/Bugzilla/Install/Filesystem.pm
38 --- bugzilla-3.3.3/Bugzilla/Install/Filesystem.pm 2009-01-23 22:34:42.000000000 +0100
39 +++ bugzilla-3.3.3-dud/Bugzilla/Install/Filesystem.pm 2009-03-18 16:44:33.952669848 +0100
40 @@ -103,27 +103,6 @@ sub FILESYSTEM {
42 # --- FILE PERMISSIONS (Non-created files) --- #
44 - '*' => { perms => $ws_readable },
45 - '*.cgi' => { perms => $ws_executable },
46 - 'whineatnews.pl' => { perms => $ws_executable },
47 - 'collectstats.pl' => { perms => $ws_executable },
48 - 'checksetup.pl' => { perms => $owner_executable },
49 - 'importxml.pl' => { perms => $ws_executable },
50 - 'runtests.pl' => { perms => $owner_executable },
51 - 'testserver.pl' => { perms => $ws_executable },
52 - 'whine.pl' => { perms => $ws_executable },
53 - 'customfield.pl' => { perms => $owner_executable },
54 - 'email_in.pl' => { perms => $ws_executable },
55 - 'sanitycheck.pl' => { perms => $ws_executable },
56 - 'jobqueue.pl' => { perms => $owner_executable },
57 - 'install-module.pl' => { perms => $owner_executable },
59 - "$localconfig.old" => { perms => $owner_readable },
61 - 'docs/makedocs.pl' => { perms => $owner_executable },
62 - 'docs/style.css' => { perms => $ws_readable },
63 - 'docs/*/rel_notes.txt' => { perms => $ws_readable },
64 - 'docs/*/README.docs' => { perms => $owner_readable },
65 "$datadir/bugzilla-update.xml" => { perms => $ws_writeable },
66 "$datadir/params" => { perms => $ws_writeable },
67 "$datadir/mailer.testfile" => { perms => $ws_writeable },
68 @@ -133,8 +112,6 @@ sub FILESYSTEM {
69 # recurse through. These are directories we didn't create
71 my %non_recurse_dirs = (
72 - '.' => $ws_dir_readable,
73 - docs => $ws_dir_readable,
76 # This sets the permissions for each item inside each of these
77 @@ -149,32 +126,12 @@ sub FILESYSTEM {
78 dirs => $ws_dir_writeable },
79 $webdotdir => { files => $ws_writeable,
80 dirs => $ws_dir_writeable },
81 - graphs => { files => $ws_writeable,
82 - dirs => $ws_dir_writeable },
84 # Readable directories
85 "$datadir/mining" => { files => $ws_readable,
86 dirs => $ws_dir_readable },
87 "$datadir/duplicates" => { files => $ws_readable,
88 dirs => $ws_dir_readable },
89 - "$libdir/Bugzilla" => { files => $ws_readable,
90 - dirs => $ws_dir_readable },
91 - $extlib => { files => $ws_readable,
92 - dirs => $ws_dir_readable },
93 - $templatedir => { files => $ws_readable,
94 - dirs => $ws_dir_readable },
95 - $extensionsdir => { files => $ws_readable,
96 - dirs => $ws_dir_readable },
97 - images => { files => $ws_readable,
98 - dirs => $ws_dir_readable },
99 - css => { files => $ws_readable,
100 - dirs => $ws_dir_readable },
101 - js => { files => $ws_readable,
102 - dirs => $ws_dir_readable },
103 - $skinsdir => { files => $ws_readable,
104 - dirs => $ws_dir_readable },
105 - t => { files => $owner_readable,
106 - dirs => $owner_dir_readable },
107 'docs/*/html' => { files => $ws_readable,
108 dirs => $ws_dir_readable },
109 'docs/*/pdf' => { files => $ws_readable,
110 @@ -199,7 +156,6 @@ sub FILESYSTEM {
111 "$datadir/duplicates" => $ws_dir_readable,
112 $attachdir => $ws_dir_writeable,
113 $extensionsdir => $ws_dir_readable,
114 - graphs => $ws_dir_writeable,
115 $webdotdir => $ws_dir_writeable,
116 "$skinsdir/custom" => $ws_dir_readable,
117 "$skinsdir/contrib" => $ws_dir_readable,
118 diff -burNp bugzilla-3.3.3/collectstats.pl bugzilla-3.3.3-dud/collectstats.pl
119 --- bugzilla-3.3.3/collectstats.pl 2008-12-16 22:16:28.000000000 +0100
120 +++ bugzilla-3.3.3-dud/collectstats.pl 2009-03-18 16:38:32.469101656 +0100
121 @@ -56,7 +56,7 @@ if (chdir("graphs")) {
124 # chdir("..") doesn't work if graphs is a symlink, see bug 429378
126 + chdir("/usr/share/bugzilla");
129 my $dbh = Bugzilla->switch_to_shadow_db();