This is an automated email from the git hooks/post-receive script. ntyni pushed a commit to branch ntyni/perl520 in repository libapache2-mod-perl2.
commit d143699f5eacfdb40720a58802365f5b66eaad9c Author: Niko Tyni <nt...@debian.org> Date: Wed Jul 16 21:06:58 2014 +0300 Add two upstream patches fixing test suite problems with Perl 5.20. (Closes: #750240) --- debian/changelog | 3 +- .../370-Fix-t-directive-perlloadmodule2.t.patch | 32 ++++++++++++++++++++++ ...t-as-per-r1565579.-Reported-in-CPAN-RT-96.patch | 28 +++++++++++++++++++ debian/patches/series | 2 ++ 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cc6636e..85c22b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libapache2-mod-perl2 (2.0.8+httpd24-r1449661-8) UNRELEASED; urgency=medium - * + * Add two upstream patches fixing test suite problems with Perl 5.20. + (Closes: #750240) -- Niko Tyni <nt...@debian.org> Tue, 15 Jul 2014 20:57:59 +0300 diff --git a/debian/patches/370-Fix-t-directive-perlloadmodule2.t.patch b/debian/patches/370-Fix-t-directive-perlloadmodule2.t.patch new file mode 100644 index 0000000..e8a0a7c --- /dev/null +++ b/debian/patches/370-Fix-t-directive-perlloadmodule2.t.patch @@ -0,0 +1,32 @@ +From 79588dbfc9ff0830d86ba6347b947ecd76e8a981 Mon Sep 17 00:00:00 2001 +From: Niko Tyni <nt...@debian.org> +Date: Sun, 29 Jun 2014 12:08:15 +0300 +Subject: [PATCH 1/2] Fix t/directive/perlloadmodule2.t + +The third test (for $url/subdir) was failing because the absence of +an argument ($url?...) caused a warning that $r->arg was undefined in +perlloadmodule2.pm, and the "use warnings FATAL => 'all';" line saw to +it that the server returned 500/Internal Server Error in this case. + +Author: Steve Hay <steve.m....@googlemail.com> +Origin: upstream, http://svn.apache.org/viewvc?view=revision&revision=1565579 +--- + t/response/TestDirective/perlloadmodule2.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/response/TestDirective/perlloadmodule2.pm b/t/response/TestDirective/perlloadmodule2.pm +index 7c24be3..bab91ce 100644 +--- a/t/response/TestDirective/perlloadmodule2.pm ++++ b/t/response/TestDirective/perlloadmodule2.pm +@@ -82,7 +82,7 @@ sub handler : method { + + my $s = $r->server; + +- if ($r->args eq 'srv') { ++ if (defined $r->args and $r->args eq 'srv') { + my $srv_cfg = $self->get_config($s); + $r->print("srv: @{ $srv_cfg->{MyMergeTest}||[] }"); + } +-- +2.0.1 + diff --git a/debian/patches/380-Fix-reload.t-as-per-r1565579.-Reported-in-CPAN-RT-96.patch b/debian/patches/380-Fix-reload.t-as-per-r1565579.-Reported-in-CPAN-RT-96.patch new file mode 100644 index 0000000..b3a5c8e --- /dev/null +++ b/debian/patches/380-Fix-reload.t-as-per-r1565579.-Reported-in-CPAN-RT-96.patch @@ -0,0 +1,28 @@ +From e2dba731a20ae4866c2a10e42282f8b25993383e Mon Sep 17 00:00:00 2001 +From: Niko Tyni <nt...@debian.org> +Date: Tue, 15 Jul 2014 21:20:06 +0300 +Subject: [PATCH 2/2] Fix reload.t as per r1565579. Reported in CPAN RT#96656. + +Author: Steve Hay <steve.m....@googlemail.com> +Origin: upstream, http://svn.apache.org/viewvc?view=revision&revision=1605020 +Bug: https://rt.cpan.org/Public/Bug/Display.html?id=96656 +--- + Apache-Reload/t/lib/Apache2/TestReload.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Apache-Reload/t/lib/Apache2/TestReload.pm b/Apache-Reload/t/lib/Apache2/TestReload.pm +index 65f0f04..aa4215f 100644 +--- a/Apache-Reload/t/lib/Apache2/TestReload.pm ++++ b/Apache-Reload/t/lib/Apache2/TestReload.pm +@@ -15,7 +15,7 @@ our $pass = 0; + sub handler { + my $r = shift; + $pass++; +- if ($r->args eq 'last') { ++ if (defined $r->args and $r->args eq 'last') { + Apache2::Reload->unregister_module($package); + ModPerl::Util::unload_package($package); + $pass = 0; +-- +2.0.1 + diff --git a/debian/patches/series b/debian/patches/series index 87c88d9..7a54d44 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -18,3 +18,5 @@ avoid-db-linkage.patch 340-rewrite-2.4.patch 350-ap-test-apache24-define.patch 360-conditional-linux-pid-module.patch +370-Fix-t-directive-perlloadmodule2.t.patch +380-Fix-reload.t-as-per-r1565579.-Reported-in-CPAN-RT-96.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libapache2-mod-perl2.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits