- up to fit 3.3.3

Changed files:
    bugzilla-pld.patch -> 1.11

diff --git a/bugzilla-pld.patch b/bugzilla-pld.patch
index 57becf8b155349d4db11fbda0a8d59bb73aa11d7..dc884aa86d5378773b23e78b3dabaf24aef677ea 100644 (file)
--- a/bugzilla-pld.patch
+++ b/bugzilla-pld.patch
@@ -1,28 +1,7 @@
---- a/collectstats.pl  2005-01-21 08:57:30.975582527 +0200
-+++ a/collectstats.pl  2006-04-24 23:04:25.847159729 +0300
-@@ -48,7 +48,7 @@
- if (chdir("graphs")) {
-     unlink <./*.gif>;
-     unlink <./*.png>;
--    chdir("..");
-+    chdir("/usr/share/bugzilla");
- }
- 
- GetVersionTable();
-@@ -96,8 +96,8 @@
-     trick_taint($perl);
- 
-     # Generate a static RDF file containing the default view of the duplicates data.
--    open(CGI, "$perl -T duplicates.cgi |")
--        || die "can't fork duplicates.cgi: $!";
-+    open(CGI, "$perl -T htdocs/duplicates.cgi |")
-+        || die "can't fork htdocs/duplicates.cgi: $!";
-     open(RDF, ">$datadir/duplicates.tmp")
-         || die "can't write to $datadir/duplicates.tmp: $!";
-     my $headers_done = 0;
---- bugzilla-3.0/Bugzilla/Constants.pm~        2007-05-10 01:47:17.000000000 +0300
-+++ bugzilla-3.0/Bugzilla/Constants.pm 2007-06-21 23:57:48.044744852 +0300
-@@ -407,10 +407,10 @@
+diff -burNp bugzilla-3.3.3/Bugzilla/Constants.pm bugzilla-3.3.3-dud/Bugzilla/Constants.pm
+--- bugzilla-3.3.3/Bugzilla/Constants.pm       2009-02-03 11:03:46.000000000 +0100
++++ bugzilla-3.3.3-dud/Bugzilla/Constants.pm   2009-03-18 16:41:34.475759477 +0100
+@@ -482,10 +482,10 @@ sub bz_locations {
      my ($project, $localconfig, $datadir);
      if ($ENV{'PROJECT'} && $ENV{'PROJECT'} =~ /^(\w+)$/) {
          $project = $1;
@@ -35,8 +14,8 @@
          $datadir = "data";
      }
  
-@@ -420,13 +420,13 @@
-         'libpath'     => $libpath,
+@@ -496,13 +496,13 @@ sub bz_locations {
+         'ext_libpath' => "$libpath/lib",
          # If you put the libraries in a different location than the CGIs,
          # make sure this still points to the CGIs.
 -        'cgi_path'    => $libpath,
@@ -52,12 +31,13 @@
 +        'datadir'     => "/var/lib/bugzilla/$datadir",
 +        'attachdir'   => "/var/lib/bugzilla/$datadir/attachments",
 +        'skinsdir'    => "/usr/share/bugzilla/htdocs/skins",
-         # $webdotdir must be in the webtree somewhere. Even if you use a 
+         # $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 
---- bugzilla-3.0/Bugzilla/Install/Filesystem.pm        2006-12-09 13:58:14.000000000 +0200
-+++ bugzilla-3.0/Bugzilla/Install/Filesystem.pm        2007-06-22 00:08:36.399403065 +0300
-@@ -99,21 +99,6 @@
+diff -burNp bugzilla-3.3.3/Bugzilla/Install/Filesystem.pm bugzilla-3.3.3-dud/Bugzilla/Install/Filesystem.pm
+--- bugzilla-3.3.3/Bugzilla/Install/Filesystem.pm      2009-01-23 22:34:42.000000000 +0100
++++ bugzilla-3.3.3-dud/Bugzilla/Install/Filesystem.pm  2009-03-18 16:44:33.952669848 +0100
+@@ -103,27 +103,6 @@ sub FILESYSTEM {
  
      # --- FILE PERMISSIONS (Non-created files) --- #
      my %files = (
@@ -72,14 +52,20 @@
 -        'whine.pl'        => { perms => $ws_executable },
 -        'customfield.pl'  => { perms => $owner_executable },
 -        'email_in.pl'     => { perms => $ws_executable },
+-        'sanitycheck.pl'  => { perms => $ws_executable },
+-        'jobqueue.pl'     => { perms => $owner_executable },
+-        'install-module.pl' => { perms => $owner_executable },
+-
+-        "$localconfig.old" => { perms => $owner_readable },
 -
 -        'docs/makedocs.pl'   => { perms => $owner_executable },
--        'docs/rel_notes.txt' => { perms => $ws_readable },
--        'docs/README.docs'   => { perms => $owner_readable },
+-        'docs/style.css'       => { perms => $ws_readable },
+-        'docs/*/rel_notes.txt' => { perms => $ws_readable },
+-        'docs/*/README.docs'   => { perms => $owner_readable },
          "$datadir/bugzilla-update.xml" => { perms => $ws_writeable },
          "$datadir/params" => { perms => $ws_writeable },
          "$datadir/mailer.testfile" => { perms => $ws_writeable },
-@@ -123,8 +108,6 @@
+@@ -133,8 +112,6 @@ sub FILESYSTEM {
      # recurse through. These are directories we didn't create
      # in checkesetup.pl.
      my %non_recurse_dirs = (
@@ -88,8 +74,7 @@
      );
  
      # This sets the permissions for each item inside each of these 
-@@ -138,29 +121,13 @@
-          $attachdir         => { files => $ws_writeable,
+@@ -149,32 +126,12 @@ sub FILESYSTEM {
                                    dirs => $ws_dir_writeable },
           $webdotdir         => { files => $ws_writeable,
                                    dirs => $ws_dir_writeable },
@@ -103,27 +88,42 @@
                                       dirs => $ws_dir_readable },
 -         "$libdir/Bugzilla"    => { files => $ws_readable,
 -                                     dirs => $ws_dir_readable },
+-         $extlib               => { files => $ws_readable,
+-                                     dirs => $ws_dir_readable },
 -         $templatedir          => { files => $ws_readable,
 -                                     dirs => $ws_dir_readable },
+-         $extensionsdir        => { files => $ws_readable,
+-                                     dirs => $ws_dir_readable },
 -         images                => { files => $ws_readable,
 -                                     dirs => $ws_dir_readable },
 -         css                   => { files => $ws_readable,
 -                                     dirs => $ws_dir_readable },
 -         js                    => { files => $ws_readable,
 -                                     dirs => $ws_dir_readable },
--         skins                 => { files => $ws_readable,
+-         $skinsdir             => { files => $ws_readable,
 -                                     dirs => $ws_dir_readable },
 -         t                     => { files => $owner_readable,
 -                                     dirs => $owner_dir_readable },
-          'docs/html'           => { files => $ws_readable,
+          'docs/*/html'         => { files => $ws_readable,
                                       dirs => $ws_dir_readable },
-          'docs/pdf'            => { files => $ws_readable,
-@@ -186,7 +153,7 @@
+          'docs/*/pdf'          => { files => $ws_readable,
+@@ -199,7 +156,6 @@ sub FILESYSTEM {
          "$datadir/duplicates"   => $ws_dir_readable,
          $attachdir              => $ws_dir_writeable,
          $extensionsdir          => $ws_dir_readable,
 -        graphs                  => $ws_dir_writeable,
-+        "$datadir/graphs"       => $ws_dir_writeable,
          $webdotdir              => $ws_dir_writeable,
-         'skins/custom'          => $ws_dir_readable,
-         'skins/contrib'         => $ws_dir_readable,
+         "$skinsdir/custom"      => $ws_dir_readable,
+         "$skinsdir/contrib"     => $ws_dir_readable,
+diff -burNp bugzilla-3.3.3/collectstats.pl bugzilla-3.3.3-dud/collectstats.pl
+--- bugzilla-3.3.3/collectstats.pl     2008-12-16 22:16:28.000000000 +0100
++++ bugzilla-3.3.3-dud/collectstats.pl 2009-03-18 16:38:32.469101656 +0100
+@@ -56,7 +56,7 @@ if (chdir("graphs")) {
+     unlink <./*.gif>;
+     unlink <./*.png>;
+     # chdir("..") doesn't work if graphs is a symlink, see bug 429378
+-    chdir($cwd);
++    chdir("/usr/share/bugzilla");
+ }
+ 
+ my $dbh = Bugzilla->switch_to_shadow_db();