r52373 - in /branches/lenny/libapache-dbi-perl/debian: changelog patches/backport_1.08-fix-startup.patch patches/series

[dmn at users.alioth.debian.org]

Author: dmn
Date: Tue Feb  9 11:01:33 2010
New Revision: 52373

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=52373
Log:
* Backport fix for loading of Apache::DBI via startup files from 1.08 to lenny

  + add backport_1.08-fix-startup.patch
  + Closes: #568534 -- Apache::DBI fails to load in startup scripts

Added:
    branches/lenny/libapache-dbi-perl/debian/patches/backport_1.08-fix-startup.patch
Modified:
    branches/lenny/libapache-dbi-perl/debian/changelog
    branches/lenny/libapache-dbi-perl/debian/patches/series

Modified: branches/lenny/libapache-dbi-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/lenny/libapache-dbi-perl/debian/changelog?rev=52373&op=diff
==============================================================================
--- branches/lenny/libapache-dbi-perl/debian/changelog (original)
+++ branches/lenny/libapache-dbi-perl/debian/changelog Tue Feb  9 11:01:33 2010
@@ -1,3 +1,11 @@
+libapache-dbi-perl (1.07-1+lenny1) stable; urgency=low
+
+  * Backport fix for loading of Apache::DBI via startup files from 1.08.
+    + add backport_1.08-fix-startup.patch
+    + Closes: #568534 -- Apache::DBI fails to load in startup scripts
+
+ -- Damyan Ivanov <dmn at debian.org>  Tue, 09 Feb 2010 12:48:05 +0200
+
 libapache-dbi-perl (1.07-1) unstable; urgency=low
 
   * New upstream release.

Added: branches/lenny/libapache-dbi-perl/debian/patches/backport_1.08-fix-startup.patch
URL: http://svn.debian.org/wsvn/pkg-perl/branches/lenny/libapache-dbi-perl/debian/patches/backport_1.08-fix-startup.patch?rev=52373&op=file
==============================================================================
--- branches/lenny/libapache-dbi-perl/debian/patches/backport_1.08-fix-startup.patch (added)
+++ branches/lenny/libapache-dbi-perl/debian/patches/backport_1.08-fix-startup.patch Tue Feb  9 11:01:33 2010
@@ -1,0 +1,17 @@
+# Description: backport fix for loading from startup.pl from 1.08
+# Origin: upstream, http://search.cpan.org/diff?from=Apache-DBI-1.07&to=Apache-DBI-1.08
+# Bug: https://rt.cpan.org/Public/Bug/Display.html?id=36346
+# Bug-Debian: http://bugs.debian.org/568534
+--- a/lib/Apache/DBI.pm
++++ b/lib/Apache/DBI.pm
+@@ -141,7 +141,9 @@ sub connect {
+     if (!$Rollback{$Idx}) {
+         my $r;
+         if (MP2) {
+-            $r = Apache2::RequestUtil->request;
++            # We may not actually be in a request, but in <Perl> (or
++            # equivalent such as startup.pl), in which case this would die.
++            eval { $r = Apache2::RequestUtil->request };
+         }
+         elsif (Apache->can('push_handlers')) {
+             $r = 'Apache';

Modified: branches/lenny/libapache-dbi-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/branches/lenny/libapache-dbi-perl/debian/patches/series?rev=52373&op=diff
==============================================================================
--- branches/lenny/libapache-dbi-perl/debian/patches/series (original)
+++ branches/lenny/libapache-dbi-perl/debian/patches/series Tue Feb  9 11:01:33 2010
@@ -1,1 +1,2 @@
 debian-perl-path.patch
+backport_1.08-fix-startup.patch