On Fri, Jun 07, 2019 at 07:22:46PM +0200, Paul Gevers wrote:
> Control: tags -1 moreinfo
>
> On 07-06-2019 12:56, Dominic Hargreaves wrote:
> > Please pre-approve perl 5.28.1-7 which fixes a FTBFS in some environments.
> > This doesn't meet the letter of the hard freeze policy, hence requesting
> > pre-approval before upload.
>
> Hi Dominic,
>
> You're debdiff is very annoying to read because all the patches were
> updated for no reason.
The reason is a limitation in tooling and I have filed a bug about that:
<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=930121> so hopefully
that will be applied and this will eventually no longer be a problem.
> Only the git tag changed. Can you please filter
> that out, or way better, not introduce those unnecessary changes?
Sure. I had meant to do this already, but rather ran out of patience
earlier, sorry about that.
It is not practical to eliminate the noise from the commit, but here is
a filtered patch for your review.
Thanks,
Dominic.
diff -Nru perl-5.28.1/debian/changelog perl-5.28.1/debian/changelog
--- perl-5.28.1/debian/changelog 2019-03-31 12:51:22.000000000 +0100
+++ perl-5.28.1/debian/changelog 2019-06-07 11:47:24.000000000 +0100
@@ -1,3 +1,9 @@
+perl (5.28.1-7) unstable; urgency=medium
+
+ * Fix FTBFS with some sbuild configurations (Closes: #930095)
+
+ -- Dominic Hargreaves <d...@earth.li> Fri, 07 Jun 2019 10:47:24 +0000
+
perl (5.28.1-6) unstable; urgency=medium
* Fix NDBM autopkgtests by recreating necessary hardlinks at test time
diff -Nru perl-5.28.1/debian/patches/fixes/posix-mb-sbuild-fix.diff perl-5.28.1/debian/patches/fixes/posix-mb-sbuild-fix.diff
--- perl-5.28.1/debian/patches/fixes/posix-mb-sbuild-fix.diff 1970-01-01 01:00:00.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/posix-mb-sbuild-fix.diff 2019-06-07 11:44:46.000000000 +0100
@@ -0,0 +1,38 @@
+From 80f1d636f821d9c46273929c0a8280994d647be6 Mon Sep 17 00:00:00 2001
+From: Dominic Hargreaves <d...@earth.li>
+Date: Thu, 6 Jun 2019 21:02:25 +0100
+Subject: Fix edge case test failure in ext/POSIX/t/mb.t
+
+This new test fails in an environment where LANG is set to one thing and
+LC_ALL is set to another, and where LANG is set to a locale which is
+not installed in the environment in question.
+
+Such a test environment is arguably broken, but appears in common
+chroot setups such as Debian's sbuild tool where LANG is inherited from
+the parent environment, and LC_ALL is used to override it.
+
+Patch-Name: fixes/posix-mb-sbuild-fix.diff
+---
+ ext/POSIX/t/mb.t | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/ext/POSIX/t/mb.t b/ext/POSIX/t/mb.t
+index 961edf6cf2..bd2cdf91d1 100644
+--- a/ext/POSIX/t/mb.t
++++ b/ext/POSIX/t/mb.t
+@@ -33,9 +33,13 @@ SKIP: {
+ my $utf8_locale = find_utf8_ctype_locale();
+ skip("no utf8 locale available", 2) unless $utf8_locale;
+
++ # Here we need to influence LC_CTYPE, but it's not enough to just
++ # set this because LC_ALL could override it. It's also not enough
++ # to delete LC_ALL because it could be used to override other
++ # variables such as LANG in the underlying test environment.
++ # Continue to set LC_CTYPE just in case...
+ local $ENV{LC_CTYPE} = $utf8_locale;
+- local $ENV{LC_ALL};
+- delete $ENV{LC_ALL};
++ local $ENV{LC_ALL} = $utf8_locale;
+
+ fresh_perl_is(
+ 'use POSIX; print &POSIX::mblen("\x{c3}\x{28}", &POSIX::MB_CUR_MAX)',
diff -Nru perl-5.28.1/debian/patches/series perl-5.28.1/debian/patches/series
--- perl-5.28.1/debian/patches/series 2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/series 2019-06-07 11:44:46.000000000 +0100
@@ -59,3 +59,4 @@
fixes/storable-probing/disable-probing.diff
debian/perlbug-editor.diff
fixes/posix-mbrlen.diff
+fixes/posix-mb-sbuild-fix.diff
