Bug#964397: buster-pu: package libembperl-perl/2.5.0-12+deb10u1
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
As part of a security fix the changed Apache output was backported,
the #941926 fix for libembperl-perl is needed to fix the resulting
FTBFS due to test failure.
diff -Nru libembperl-perl-2.5.0/debian/changelog libembperl-perl-2.5.0/debian/changelog
--- libembperl-perl-2.5.0/debian/changelog 2018-06-28 03:08:58.000000000 +0300
+++ libembperl-perl-2.5.0/debian/changelog 2020-07-06 19:58:46.000000000 +0300
@@ -1,3 +1,11 @@
+libembperl-perl (2.5.0-12+deb10u1) buster; urgency=medium
+
+ * Non-maintainer upload.
+ * Update debian/patches/apache2.4-compat.patch to work with Apache
+ 2.4.40+ error pages. (Closes: #941926)
+
+ -- Adrian Bunk <bunk@debian.org> Mon, 06 Jul 2020 19:58:46 +0300
+
libembperl-perl (2.5.0-12) unstable; urgency=medium
[ Damyan Ivanov ]
diff -Nru libembperl-perl-2.5.0/debian/patches/apache2.4-compat.patch libembperl-perl-2.5.0/debian/patches/apache2.4-compat.patch
--- libembperl-perl-2.5.0/debian/patches/apache2.4-compat.patch 2016-05-09 19:51:58.000000000 +0300
+++ libembperl-perl-2.5.0/debian/patches/apache2.4-compat.patch 2020-07-06 19:58:43.000000000 +0300
@@ -1,7 +1,7 @@
From bcce23a15de55a39478f83a7923d8a89f681cc19 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni@debian.org>
Date: Tue, 29 Jul 2014 14:34:35 +0300
-Subject: [PATCH] Adapt to an Apache 2.4.10 error page change
+Subject: [PATCH] Adapt to an Apache 2.4.10 + 2.4.40 error page change
The "Forbidden" error page was slightly changed by Apache commit
@@ -10,22 +10,34 @@
breaking the EmbperlObject/epobase.htm test. The fix works
with both the old and the new page format.
+
+Some years and versions later:
+Apache changed the output again (in 2.4.40):
+ https://github.com/apache/httpd/commit/c0ce3a729218279a6b4b03aab7a71bb8ae9d6259
+
+Update the patch to hopefully work with all versions.
+
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/756382
+ https://bugs.debian.org/941926
+Reviewed-by: gregor herrmann <gregoa@debian.org>
+Last-Update: 2019-10-07
+
---
test/cmp/epobase.htm | 1 +
1 file changed, 1 insertion(+)
-diff --git a/test/cmp/epobase.htm b/test/cmp/epobase.htm
-index ba29386..9d0269c 100644
--- a/test/cmp/epobase.htm
+++ b/test/cmp/epobase.htm
-@@ -5,6 +5,7 @@
+@@ -3,8 +3,9 @@
+ <TITLE>403 Forbidden</TITLE>
+ </HEAD><BODY>
<H1>Forbidden</H1>
- ^.*?You don't have permission to access /embperl/EmbperlObject/epobase.htm
- ^on this server
+-^.*?You don't have permission to access /embperl/EmbperlObject/epobase.htm
+-^on this server
++^.*?You don't have permission to access (/embperl/EmbperlObject/epobase.htm|this resource)
++^-on this server
+^-</p>
</BODY></HTML>
---
-2.0.1
-
Reply to: