[Pkg-bugzilla-commits] r100 - in trunk/bugzilla-2.18/debian: . patches

[Alexis Sukrieh]

Author: sukria-guest
Date: 2005-06-11 13:36:19 +0000 (Sat, 11 Jun 2005)
New Revision: 100

Added:
   trunk/bugzilla-2.18/debian/patches/07_virtualhosting.dpatch
Modified:
   trunk/bugzilla-2.18/debian/changelog
   trunk/bugzilla-2.18/debian/patches/00list
Log:
applying Yann Dirson .dpath for the X_BUGZILLA_SITE trick

Modified: trunk/bugzilla-2.18/debian/changelog
===================================================================
--- trunk/bugzilla-2.18/debian/changelog	2005-06-11 13:11:11 UTC (rev 99)
+++ trunk/bugzilla-2.18/debian/changelog	2005-06-11 13:36:19 UTC (rev 100)
@@ -3,10 +3,15 @@
   * Change the datadir to /var/lib/bugzilla
     + Add a patch for replacing $datadir with /var/lib/bugzilla
     + Update bugzilla.postinst for fixing the permissions on /var/lib/bugzilla
-    + Update bugzilla.postrm for purging /var/lib/bugzilla 
+    + Update bugzilla.postrm for purging /var/lib/bugzilla
+    + data and graphs are under /var/lib/bugzilla instead of
+    /usr/share/bugzilla.
     (closes: #308232)
+  * Add upstream security patch for closing Bugzilla's #287436
+    + debian/patches/00_security_287436.dpatch
+    (closes: #308789)
 
- -- Alexis Sukrieh <sukria@sukria.net>  Mon,  9 May 2005 16:33:58 +0200
+ -- Alexis Sukrieh <sukria@sukria.net>  Sat, 11 Jun 2005 15:11:12 +0200
 
 bugzilla (2.18-6) unstable; urgency=low
 

Modified: trunk/bugzilla-2.18/debian/patches/00list
===================================================================
--- trunk/bugzilla-2.18/debian/patches/00list	2005-06-11 13:11:11 UTC (rev 99)
+++ trunk/bugzilla-2.18/debian/patches/00list	2005-06-11 13:36:19 UTC (rev 100)
@@ -6,3 +6,4 @@
 04_cookiepath
 05_webpath
 06_contrib
+07_virtualhosting

Added: trunk/bugzilla-2.18/debian/patches/07_virtualhosting.dpatch
===================================================================
--- trunk/bugzilla-2.18/debian/patches/07_virtualhosting.dpatch	2005-06-11 13:11:11 UTC (rev 99)
+++ trunk/bugzilla-2.18/debian/patches/07_virtualhosting.dpatch	2005-06-11 13:36:19 UTC (rev 100)
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_virtualhosting.dpatch by Yann Dirson <dirson@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: support for multi-site installs (/etc/bugzilla-$X_BUGZILLA_SITE, web/data-$X_BUGZILLA_SITE)
+
+@DPATCH@
+diff -urNad work/Bugzilla/Config.pm /tmp/dpep.C1F6Jf/work/Bugzilla/Config.pm
+--- work/Bugzilla/Config.pm     2005-05-19 17:35:17.000000000 +0200
++++ /tmp/dpep.C1F6Jf/work/Bugzilla/Config.pm    2005-05-19
+17:35:44.000000000 +0200
+@@ -51,12 +51,25 @@
+ # graphs (since the path will be wrong in the HTML). This will be fixed at
+ # some point.
+
++# support for multi-site installation through X_BUGZILLA_SITE variable to
++# be passed by Apache.
++our $xsite = '';
++if (defined $ENV{X_BUGZILLA_SITE}) {
++    $xsite = "$ENV{X_BUGZILLA_SITE}";
++    # untaint (make sure it has no '/' and is overall something sane)
++    if ($xsite =~ m/^(\w[\w\-.]*)$/) {
++        $xsite ="-$1";
++    } else {
++        die "invalid X_BUGZILLA_SITE: $xsite";
++    }
++}
++
+ our $libpath = '/usr/share/bugzilla';
+-our $localconfig = "/etc/bugzilla/localconfig";
+-our $datadir = "/var/lib/bugzilla";
+-our $templatedir = "$libpath/template";
++our $localconfig = "/etc/bugzilla${xsite}/localconfig";
++our $datadir = "$libpath/web/data${xsite}";
++our $templatedir = (-d "$libpath/template${xsite}") ?  "$libpath/template${xsite}" : "$libpath/template";
+ our $webdotdir = "$datadir/webdot";
+-our $params_file = "/etc/bugzilla/params";
++our $params_file = "/etc/bugzilla${xsite}/params";
+
+ # Module stuff
+ @Bugzilla::Config::EXPORT = qw(Param);


Property changes on: trunk/bugzilla-2.18/debian/patches/07_virtualhosting.dpatch
___________________________________________________________________
Name: svn:executable
   + *