Dear stable release managers, Please approve the upload of libapache-dbi-perl 1.07-1+lenny1 to stable.
It fixes #568534[1] -- fails to load in startup scripts
[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568534
The fix is to steal the relevant hunk from the upstream diff between
1.07 (in lenny) and 1.08 (in sid). The full upstream diff is available
at [2]. The backport_1.08-fix-startup.patch contains only the last
hunk (all else is cosmetics).
[2] http://search.cpan.org/diff?from=Apache-DBI-1.07&to=Apache-DBI-1.08
Debdiff, backport_1.08-fix-startup.patch and interdiff attached.
Thank you for your time.
File lists identical (after any substitutions)
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-176-] {+172+}
Version: [-1.07-1-] {+1.07-1+lenny1+}
# 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';
diff -u libapache-dbi-perl-1.07/debian/changelog libapache-dbi-perl-1.07/debian/changelog --- libapache-dbi-perl-1.07/debian/changelog +++ libapache-dbi-perl-1.07/debian/changelog @@ -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 <d...@debian.org> Tue, 09 Feb 2010 12:48:05 +0200 + libapache-dbi-perl (1.07-1) unstable; urgency=low * New upstream release. diff -u libapache-dbi-perl-1.07/debian/patches/series libapache-dbi-perl-1.07/debian/patches/series --- libapache-dbi-perl-1.07/debian/patches/series +++ libapache-dbi-perl-1.07/debian/patches/series @@ -1,0 +2 @@ +backport_1.08-fix-startup.patch only in patch2: unchanged: --- libapache-dbi-perl-1.07.orig/debian/patches/backport_1.08-fix-startup.patch +++ libapache-dbi-perl-1.07/debian/patches/backport_1.08-fix-startup.patch @@ -0,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';
signature.asc
Description: Digital signature
