[libapache2-mod-perl2] 02/03: Update changelog + drop five debian/patches integrated upstream
Niko Tyni
ntyni at moszumanska.debian.org
Sun Sep 28 08:49:47 UTC 2014
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 <ntyni at 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 <carnil at 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 <ntyni at 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..0000000
--- 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 <gregoa at 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..0000000
--- 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 <ntyni at 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=revision&revision=68792
- http://svn.apache.org/viewvc?view=revision&revision=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 b/debian/patches/410-Restore-httpd-2.4-compatibility-in-lib-Apache2-compa.patch
deleted file mode 100644
index 236baf2..0000000
--- a/debian/patches/410-Restore-httpd-2.4-compatibility-in-lib-Apache2-compa.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f1f1b1de72ee8be062bf6fa28410feb023c5efc2 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Thu, 7 Aug 2014 00:18:23 +0300
-Subject: [PATCH 2/3] Restore httpd-2.4 compatibility in lib/Apache2/compat.pm
-
-This fixes t/compat/conn_rec.t. failures with Apache 2.4,
-broken with r1497279.
-
-Apache2::compat is supposed to provide mod_perl 1.0 backward
-compatibility, so we want to offer remote_addr() there even with
-Apache 2.4.
-
-Upstream thread at
- http://mail-archives.apache.org/mod_mbox/perl-dev/201408.mbox/%3C20140807113247.GA30569%40estella.local.invalid%3E
----
- lib/Apache2/compat.pm | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/lib/Apache2/compat.pm b/lib/Apache2/compat.pm
-index e7e2c0f..9c3eccd 100644
---- a/lib/Apache2/compat.pm
-+++ b/lib/Apache2/compat.pm
-@@ -150,7 +150,12 @@ EOI
- require Apache2::Connection;
- require APR::SockAddr;
- require Socket;
-- my $orig_sub = *Apache2::Connection::remote_addr{CODE};
-+ my $orig_sub;
-+ if (defined *Apache2::Connection::client_addr{CODE}) { # httpd-2.4
-+ $orig_sub = *Apache2::Connection::client_addr{CODE};
-+ } else { # httpd-2.2
-+ $orig_sub = *Apache2::Connection::remote_addr{CODE};
-+ }
- *Apache2::Connection::remote_addr = sub {
- my $c = shift;
- if (@_) {
---
-2.1.0.rc1
-
diff --git a/debian/patches/430-Don-t-answer-anything-to-the-client-before-it-s-done.patch b/debian/patches/430-Don-t-answer-anything-to-the-client-before-it-s-done.patch
deleted file mode 100644
index 2fdd502..0000000
--- a/debian/patches/430-Don-t-answer-anything-to-the-client-before-it-s-done.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 26723f0d2f0f9fbaf42cbb46aed6ebd1f5ffbe8b Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Fri, 8 Aug 2014 17:22:33 +0000
-Subject: [PATCH 1/2] Don't answer anything to the client before it's done
- sending the POST data
-
-LWP::Protocol::http sends long POST requests with several write() calls.
-If it gets a response with a full HTTP header (up to the two newlines)
-before it's done with the later write() calls sending the actual POST data,
-it will stop writing. This leads to a deadlock and a test failure after
-timeout.
-
-Upstream thread at
- http://mail-archives.apache.org/mod_mbox/perl-dev/201408.mbox/%3C20140809104131.GA3670@estella.local.invalid%3E
-
-Bug-Debian: https://bugs.debian.org/697682
----
- t/response/TestApache/read3.pm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/response/TestApache/read3.pm b/t/response/TestApache/read3.pm
-index 8ad9f26..2994093 100644
---- a/t/response/TestApache/read3.pm
-+++ b/t/response/TestApache/read3.pm
-@@ -20,8 +20,6 @@ my $expected = "foobar"x2000;
- sub handler {
- my $r = shift;
-
-- plan $r, tests => 1;
--
- # test to read data up to end of file is signaled
- my $data = '';
- my $where = 0;
-@@ -31,6 +29,8 @@ sub handler {
- $where += $len;
- } while ($len > 0);
-
-+ plan $r, tests => 1;
-+
- ok t_cmp($data, $expected, "reading up to end of file");
-
- Apache2::Const::OK;
---
-2.1.0.rc1
-
diff --git a/debian/patches/440-Fix-invalid-code-that-breaks-with-GCC-4.9-ftree-dse-.patch b/debian/patches/440-Fix-invalid-code-that-breaks-with-GCC-4.9-ftree-dse-.patch
deleted file mode 100644
index 3059e6e..0000000
--- a/debian/patches/440-Fix-invalid-code-that-breaks-with-GCC-4.9-ftree-dse-.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8c5e3984155dd3c32f627a0bfe0e9e67e7ed873a Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni at debian.org>
-Date: Sat, 9 Aug 2014 16:42:49 +0300
-Subject: [PATCH] Fix invalid code that breaks with GCC 4.9 -ftree-dse
- optimization
-
-This fixes SIGSEGVs at the start of the test suite when built with
-GCC-4.9 at -O2 (which includes -ftree-dse).
-
-Quoting Richard Biener in https://gcc.gnu.org/PR62035 :
-
-> so 'sv' is declared inside the 'else' but you make its address escape
-> through the 'svp' variable declared in the outer block.
-
-Bug-Debian: http://bugs.debian.org/754901
----
- src/modules/perl/modperl_env.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/modules/perl/modperl_env.c b/src/modules/perl/modperl_env.c
-index 769fd2c..c1a276b 100644
---- a/src/modules/perl/modperl_env.c
-+++ b/src/modules/perl/modperl_env.c
-@@ -37,12 +37,13 @@ static unsigned long modperl_interp_address(pTHX)
- #define MP_ENV_HV_STORE(hv, key, val) STMT_START { \
- I32 klen = strlen(key); \
- SV **svp = hv_fetch(hv, key, klen, FALSE); \
-+ SV *sv; \
- \
- if (svp) { \
- sv_setpv(*svp, val); \
- } \
- else { \
-- SV *sv = newSVpv(val, 0); \
-+ sv = newSVpv(val, 0); \
- (void)hv_store(hv, key, klen, sv, FALSE); \
- modperl_envelem_tie(sv, key, klen); \
- svp = &sv; \
---
-2.1.0.rc1
-
diff --git a/debian/patches/series b/debian/patches/series
index 2d72205..18891ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,12 +10,7 @@ avoid-db-linkage.patch
220_fix-bad-whatis-entry.patch
260_fix_pipelined_response_deadlock.patch
#330-mod_authz_core.patch
-340-rewrite-2.4.patch
350-ap-test-apache24-define.patch
360-conditional-linux-pid-module.patch
380-Fix-reload.t-as-per-r1565579.-Reported-in-CPAN-RT-96.patch
-400-Define-MP_IN_XS-to-avoid-referencing-perl_module-out.patch
-410-Restore-httpd-2.4-compatibility-in-lib-Apache2-compa.patch
420-Mark-failing-tests-in-t-perl-ithreads3.t-as-TODO.patch
-430-Don-t-answer-anything-to-the-client-before-it-s-done.patch
-440-Fix-invalid-code-that-breaks-with-GCC-4.9-ftree-dse-.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libapache2-mod-perl2.git
More information about the Pkg-perl-cvs-commits
mailing list