This is an automated email from the git hooks/post-receive script.
ntyni pushed a commit to branch master
in repository libapache2-mod-perl2.
commit 714211b2a55fdb56cc71d7f7303637ee8541b80a
Author: Niko Tyni nt...@debian.org
Date: Sun Sep 28 11:04:33 2014 +0300
Update changelog + drop five debian/patches integrated upstream
Imported upstream snapshot from to-be version 2.0.9 trunk, revision 1624218
---
debian/changelog | 10 +++-
debian/patches/340-rewrite-2.4.patch | 20 ---
...N_XS-to-avoid-referencing-perl_module-out.patch | 62 --
...pd-2.4-compatibility-in-lib-Apache2-compa.patch | 39 --
...r-anything-to-the-client-before-it-s-done.patch | 45
...-code-that-breaks-with-GCC-4.9-ftree-dse-.patch | 41 --
debian/patches/series | 5 --
7 files changed, 8 insertions(+), 214 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5130553..cf73481 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-libapache2-mod-perl2 (2.0.9~1604013-3) UNRELEASED; urgency=medium
+libapache2-mod-perl2 (2.0.9~1624218-1) UNRELEASED; urgency=medium
+ [ Salvatore Bonaccorso ]
* Update Vcs-Browser URL to cgit web frontend
- -- Salvatore Bonaccorso car...@debian.org Sat, 16 Aug 2014 09:29:31 +0200
+ [ Niko Tyni ]
+ * Imported upstream snapshot from to-be version 2.0.9 trunk, revision
+1624218
++ remove five patches integrated upstream.
+
+ -- Niko Tyni nt...@debian.org Sun, 28 Sep 2014 11:02:40 +0300
libapache2-mod-perl2 (2.0.9~1604013-2) experimental; urgency=medium
diff --git a/debian/patches/340-rewrite-2.4.patch
b/debian/patches/340-rewrite-2.4.patch
deleted file mode 100644
index 3a21f2c..000
--- a/debian/patches/340-rewrite-2.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: adjust test to mod_rewrite changes in 2.4
-Origin: Gentoo
-Forwarded: no
-Author: Jorge Manuel B. S. Vicetto
-Reviewed-by: gregor herrmann gre...@debian.org
-Last-Update: 2013-06-21
-
a/ModPerl-Registry/t/conf/extra.conf.in
-+++ b/ModPerl-Registry/t/conf/extra.conf.in
-@@ -218,8 +218,8 @@
- IfModule mod_rewrite.c
-
- RewriteEngine On
--RewriteLogLevel 9
--RewriteLog @ServerRoot@/logs/rewrite_log
-+LogLevel rewrite:trace8
-+ErrorLog @ServerRoot@/logs/rewrite_log
- RewriteRule /rewritetest /rewrite_env/env_val.pl?REWRITE_TEST
[E=REWRITE_TEST:GOTCHA,PT,NS,L]
-
- Location /rewrite_env
diff --git
a/debian/patches/400-Define-MP_IN_XS-to-avoid-referencing-perl_module-out.patch
b/debian/patches/400-Define-MP_IN_XS-to-avoid-referencing-perl_module-out.patch
deleted file mode 100644
index e36a046..000
---
a/debian/patches/400-Define-MP_IN_XS-to-avoid-referencing-perl_module-out.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From f63fb4d77dcbd324d5c5ca749bf454bb981aa6d9 Mon Sep 17 00:00:00 2001
-From: Niko Tyni nt...@debian.org
-Date: Mon, 4 Aug 2014 10:32:36 +0300
-Subject: [PATCH 1/3] Define MP_IN_XS to avoid referencing perl_module outside
- of mod_perl
-
-APLOG_USE_MODULE(perl) expands to
-
- extern module perl_module; static int * const aplog_module_index =
(perl_module.module_index);
-
-which makes loading APR.so impossible outside mod_perl unless
-aplog_module_index is optimized away by the compiler.
-This causes mod_perl test suite failures in t/apr-ext at gcc -O0.
-
-See also
- http://svn.apache.org/viewvc?view=revisionrevision=68792
- http://svn.apache.org/viewvc?view=revisionrevision=1410295
-
-Upstream thread at
-
http://mail-archives.apache.org/mod_mbox/perl-dev/201408.mbox/%3C20140807115045.GA6427%40estella.local.invalid%3E
-
-Bug-Debian: https://bugs.debian.org/756989
- xs/APR/APR/Makefile.PL| 7 +++
- xs/APR/PerlIO/Makefile.PL | 3 +++
- 2 files changed, 10 insertions(+)
-
-diff --git a/xs/APR/APR/Makefile.PL b/xs/APR/APR/Makefile.PL
-index 8745a54..d569dde 100644
a/xs/APR/APR/Makefile.PL
-+++ b/xs/APR/APR/Makefile.PL
-@@ -25,6 +25,13 @@ $libs = delete $args{LIBS} if $args{LIBS};
-
- my $build = ModPerl::BuildMM::build_config();
-
-+my $ccopts = $build-ccopts;
-+
-+# avoid referencing perl_module outside of mod_perl
-+$ccopts .= ' -DMP_IN_XS';
-+
-+$args{CCFLAGS} = $ccopts;
-+
- my @apru_link_flags = $build-apru_link_flags;
- $libs .= join ' ', @apru_link_flags if @apru_link_flags;
-
-diff --git a/xs/APR/PerlIO/Makefile.PL b/xs/APR/PerlIO/Makefile.PL
-index 4a8f60d..ca102bb 100644
a/xs/APR/PerlIO/Makefile.PL
-+++ b/xs/APR/PerlIO/Makefile.PL
-@@ -25,6 +25,9 @@ if ($build-has_large_files_conflict) {
- : '';
- }
-
-+# avoid referencing perl_module outside of mod_perl
-+$ccopts .= ' -DMP_IN_XS';
-+
- ModPerl::BuildMM::WriteMakefile(
- NAME = 'APR::PerlIO',
- VERSION_FROM = 'PerlIO.pm',
---
-2.1.0.rc1
-
diff --git
a/debian/patches/410-Restore-httpd-2.4-compatibility-in-lib-Apache2-compa.patch