Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
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.
Thanks,
Dominic.
-- System Information:
Debian Release: 9.9
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 4.9.0-9-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8),
LANGUAGE=en_GB:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
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/debian/configure-regen.diff
perl-5.28.1/debian/patches/debian/configure-regen.diff
--- perl-5.28.1/debian/patches/debian/configure-regen.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/configure-regen.diff 2019-06-07
11:44:46.000000000 +0100
@@ -10,7 +10,7 @@
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Configure b/Configure
-index 3be9f05b7..437b8afc5 100755
+index 3be9f05b7d..437b8afc57 100755
--- a/Configure
+++ b/Configure
@@ -1483,8 +1483,7 @@ archname=''
diff -Nru perl-5.28.1/debian/patches/debian/cpan_definstalldirs.diff
perl-5.28.1/debian/patches/debian/cpan_definstalldirs.diff
--- perl-5.28.1/debian/patches/debian/cpan_definstalldirs.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/cpan_definstalldirs.diff 2019-06-07
11:44:46.000000000 +0100
@@ -14,7 +14,7 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
-index 49fa8ab7b..cdf1dc220 100644
+index 49fa8ab7b9..cdf1dc220d 100644
--- a/cpan/CPAN/lib/CPAN/FirstTime.pm
+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
@@ -1033,7 +1033,7 @@ sub init {
diff -Nru perl-5.28.1/debian/patches/debian/cpan-missing-site-dirs.diff
perl-5.28.1/debian/patches/debian/cpan-missing-site-dirs.diff
--- perl-5.28.1/debian/patches/debian/cpan-missing-site-dirs.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/cpan-missing-site-dirs.diff
2019-06-07 11:44:46.000000000 +0100
@@ -18,7 +18,7 @@
1 file changed, 27 insertions(+), 4 deletions(-)
diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
-index cdf1dc220..bdb7899bb 100644
+index cdf1dc220d..bdb7899bb9 100644
--- a/cpan/CPAN/lib/CPAN/FirstTime.pm
+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
@@ -2067,11 +2067,34 @@ sub _print_urllist {
diff -Nru perl-5.28.1/debian/patches/debian/db_file_ver.diff
perl-5.28.1/debian/patches/debian/db_file_ver.diff
--- perl-5.28.1/debian/patches/debian/db_file_ver.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/db_file_ver.diff 2019-06-07
11:44:46.000000000 +0100
@@ -13,7 +13,7 @@
1 file changed, 2 insertions(+)
diff --git a/cpan/DB_File/version.c b/cpan/DB_File/version.c
-index e01f6f6fa..544e6ee8f 100644
+index e01f6f6fa3..544e6ee8fb 100644
--- a/cpan/DB_File/version.c
+++ b/cpan/DB_File/version.c
@@ -48,6 +48,7 @@ __getBerkeleyDBInfo()
diff -Nru perl-5.28.1/debian/patches/debian/deprecate-with-apt.diff
perl-5.28.1/debian/patches/debian/deprecate-with-apt.diff
--- perl-5.28.1/debian/patches/debian/deprecate-with-apt.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/deprecate-with-apt.diff 2019-06-07
11:44:46.000000000 +0100
@@ -10,7 +10,7 @@
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/lib/deprecate.pm b/lib/deprecate.pm
-index 47bc11253..01d48fa6c 100644
+index 47bc11253e..01d48fa6cc 100644
--- a/lib/deprecate.pm
+++ b/lib/deprecate.pm
@@ -7,6 +7,16 @@ our $VERSION = 0.03;
diff -Nru perl-5.28.1/debian/patches/debian/disable-stack-check.diff
perl-5.28.1/debian/patches/debian/disable-stack-check.diff
--- perl-5.28.1/debian/patches/debian/disable-stack-check.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/disable-stack-check.diff 2019-06-07
11:44:46.000000000 +0100
@@ -21,7 +21,7 @@
2 files changed, 6 insertions(+)
diff --git a/dump.c b/dump.c
-index 227eb996e..4e1c594ce 100644
+index 227eb996ee..4e1c594ce8 100644
--- a/dump.c
+++ b/dump.c
@@ -2500,6 +2500,8 @@ Perl_runops_debug(pTHX)
@@ -42,7 +42,7 @@
if (PL_debug) {
ENTER;
diff --git a/pp_hot.c b/pp_hot.c
-index 56e3cbe6e..f4e1ae726 100644
+index 56e3cbe6e1..f4e1ae726d 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -5232,6 +5232,8 @@ PP(pp_entersub)
diff -Nru perl-5.28.1/debian/patches/debian/doc_info.diff
perl-5.28.1/debian/patches/debian/doc_info.diff
--- perl-5.28.1/debian/patches/debian/doc_info.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/doc_info.diff 2019-06-07
11:44:46.000000000 +0100
@@ -11,7 +11,7 @@
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/pod/perl.pod b/pod/perl.pod
-index fbbb952b6..bc0f531f8 100644
+index fbbb952b6b..bc0f531f86 100644
--- a/pod/perl.pod
+++ b/pod/perl.pod
@@ -295,8 +295,16 @@ aux h2ph h2xs perlbug pl2pm pod2html pod2man splain xsubpp
diff -Nru perl-5.28.1/debian/patches/debian/enc2xs_inc.diff
perl-5.28.1/debian/patches/debian/enc2xs_inc.diff
--- perl-5.28.1/debian/patches/debian/enc2xs_inc.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/enc2xs_inc.diff 2019-06-07
11:44:46.000000000 +0100
@@ -17,7 +17,7 @@
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
-index 619b64b75..050c863ef 100644
+index 619b64b757..050c863ef9 100644
--- a/cpan/Encode/bin/enc2xs
+++ b/cpan/Encode/bin/enc2xs
@@ -1013,11 +1013,11 @@ use vars qw(
@@ -53,7 +53,7 @@
for my $enc ( sort keys %LocalMod ) {
$_ModLines .=
diff --git a/t/porting/customized.t b/t/porting/customized.t
-index d425e5b77..d906a8255 100644
+index d425e5b775..d906a82553 100644
--- a/t/porting/customized.t
+++ b/t/porting/customized.t
@@ -108,8 +108,11 @@ foreach my $module ( sort keys %Modules ) {
diff -Nru perl-5.28.1/debian/patches/debian/errno_ver.diff
perl-5.28.1/debian/patches/debian/errno_ver.diff
--- perl-5.28.1/debian/patches/debian/errno_ver.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/errno_ver.diff 2019-06-07
11:44:46.000000000 +0100
@@ -16,7 +16,7 @@
1 file changed, 16 deletions(-)
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
-index d565f31b2..6a0031f0f 100644
+index d565f31b2f..6a0031f0f7 100644
--- a/ext/Errno/Errno_pm.PL
+++ b/ext/Errno/Errno_pm.PL
@@ -288,22 +288,6 @@ package Errno;
diff -Nru perl-5.28.1/debian/patches/debian/extutils_set_libperl_path.diff
perl-5.28.1/debian/patches/debian/extutils_set_libperl_path.diff
--- perl-5.28.1/debian/patches/debian/extutils_set_libperl_path.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/extutils_set_libperl_path.diff
2019-06-07 11:44:46.000000000 +0100
@@ -12,7 +12,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index dbb8651a9..780e390cd 100644
+index dbb8651a9f..780e390cd9 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -2564,7 +2564,7 @@ MAP_PRELIBS = $Config{perllibs} $Config{cryptlib}
diff -Nru perl-5.28.1/debian/patches/debian/fakeroot.diff
perl-5.28.1/debian/patches/debian/fakeroot.diff
--- perl-5.28.1/debian/patches/debian/fakeroot.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/fakeroot.diff 2019-06-07
11:44:46.000000000 +0100
@@ -16,7 +16,7 @@
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Makefile.SH b/Makefile.SH
-index 519700929..48151bce6 100755
+index 5197009290..48151bce65 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -48,10 +48,7 @@ case "$useshrplib" in
diff -Nru perl-5.28.1/debian/patches/debian/find_html2text.diff
perl-5.28.1/debian/patches/debian/find_html2text.diff
--- perl-5.28.1/debian/patches/debian/find_html2text.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/find_html2text.diff 2019-06-07
11:44:46.000000000 +0100
@@ -21,7 +21,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cpan/CPAN/lib/CPAN/Distribution.pm
b/cpan/CPAN/lib/CPAN/Distribution.pm
-index 72101afc7..9f896584d 100644
+index 72101afc7b..9f896584d1 100644
--- a/cpan/CPAN/lib/CPAN/Distribution.pm
+++ b/cpan/CPAN/lib/CPAN/Distribution.pm
@@ -4149,7 +4149,7 @@ sub _display_url {
diff -Nru perl-5.28.1/debian/patches/debian/gdbm-fatal.diff
perl-5.28.1/debian/patches/debian/gdbm-fatal.diff
--- perl-5.28.1/debian/patches/debian/gdbm-fatal.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/gdbm-fatal.diff 2019-06-07
11:44:46.000000000 +0100
@@ -11,7 +11,7 @@
1 file changed, 3 insertions(+)
diff --git a/ext/GDBM_File/t/fatal.t b/ext/GDBM_File/t/fatal.t
-index 0e426d4db..3df6878f8 100644
+index 0e426d4dbc..3df6878f8c 100644
--- a/ext/GDBM_File/t/fatal.t
+++ b/ext/GDBM_File/t/fatal.t
@@ -12,6 +12,9 @@ BEGIN {
diff -Nru
perl-5.28.1/debian/patches/debian/hppa_opmini_optimize_workaround.diff
perl-5.28.1/debian/patches/debian/hppa_opmini_optimize_workaround.diff
--- perl-5.28.1/debian/patches/debian/hppa_opmini_optimize_workaround.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/hppa_opmini_optimize_workaround.diff
2019-06-07 11:44:46.000000000 +0100
@@ -14,7 +14,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cflags.SH b/cflags.SH
-index 3e4526ff8..c8231e64e 100755
+index 3e4526ff8f..c8231e64e8 100755
--- a/cflags.SH
+++ b/cflags.SH
@@ -497,7 +497,7 @@ for file do
diff -Nru perl-5.28.1/debian/patches/debian/hppa_op_optimize_workaround.diff
perl-5.28.1/debian/patches/debian/hppa_op_optimize_workaround.diff
--- perl-5.28.1/debian/patches/debian/hppa_op_optimize_workaround.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/hppa_op_optimize_workaround.diff
2019-06-07 11:44:46.000000000 +0100
@@ -16,7 +16,7 @@
1 file changed, 6 insertions(+)
diff --git a/cflags.SH b/cflags.SH
-index e60742fed..3e4526ff8 100755
+index e60742fed1..3e4526ff8f 100755
--- a/cflags.SH
+++ b/cflags.SH
@@ -497,6 +497,12 @@ for file do
diff -Nru perl-5.28.1/debian/patches/debian/hurd-softupdates.diff
perl-5.28.1/debian/patches/debian/hurd-softupdates.diff
--- perl-5.28.1/debian/patches/debian/hurd-softupdates.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/hurd-softupdates.diff 2019-06-07
11:44:46.000000000 +0100
@@ -13,7 +13,7 @@
1 file changed, 1 insertion(+)
diff --git a/t/op/stat.t b/t/op/stat.t
-index 8dcb3d3fd..aa16fe739 100644
+index 8dcb3d3fd5..aa16fe7399 100644
--- a/t/op/stat.t
+++ b/t/op/stat.t
@@ -100,6 +100,7 @@ print FOO "Now is the time for all good men to come to.\n";
diff -Nru perl-5.28.1/debian/patches/debian/installman-utf8.diff
perl-5.28.1/debian/patches/debian/installman-utf8.diff
--- perl-5.28.1/debian/patches/debian/installman-utf8.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/installman-utf8.diff 2019-06-07
11:44:46.000000000 +0100
@@ -15,7 +15,7 @@
1 file changed, 1 insertion(+)
diff --git a/installman b/installman
-index 0154be4d6..fff0ff04a 100755
+index 0154be4d68..fff0ff04a7 100755
--- a/installman
+++ b/installman
@@ -161,6 +161,7 @@ sub pod2man {
diff -Nru perl-5.28.1/debian/patches/debian/instmodsh_doc.diff
perl-5.28.1/debian/patches/debian/instmodsh_doc.diff
--- perl-5.28.1/debian/patches/debian/instmodsh_doc.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/instmodsh_doc.diff 2019-06-07
11:44:46.000000000 +0100
@@ -9,7 +9,7 @@
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/cpan/ExtUtils-MakeMaker/bin/instmodsh
b/cpan/ExtUtils-MakeMaker/bin/instmodsh
-index ab0f9d1ff..b3b109f47 100644
+index ab0f9d1ffe..b3b109f475 100644
--- a/cpan/ExtUtils-MakeMaker/bin/instmodsh
+++ b/cpan/ExtUtils-MakeMaker/bin/instmodsh
@@ -19,9 +19,11 @@ instmodsh - A shell to examine installed modules
diff -Nru perl-5.28.1/debian/patches/debian/kfreebsd-softupdates.diff
perl-5.28.1/debian/patches/debian/kfreebsd-softupdates.diff
--- perl-5.28.1/debian/patches/debian/kfreebsd-softupdates.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/kfreebsd-softupdates.diff 2019-06-07
11:44:46.000000000 +0100
@@ -16,7 +16,7 @@
1 file changed, 1 insertion(+)
diff --git a/t/op/stat.t b/t/op/stat.t
-index 905eb85fd..8dcb3d3fd 100644
+index 905eb85fd4..8dcb3d3fd5 100644
--- a/t/op/stat.t
+++ b/t/op/stat.t
@@ -99,6 +99,7 @@ sleep 3 if $funky_FAT_timestamps;
diff -Nru perl-5.28.1/debian/patches/debian/ld_run_path.diff
perl-5.28.1/debian/patches/debian/ld_run_path.diff
--- perl-5.28.1/debian/patches/debian/ld_run_path.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/ld_run_path.diff 2019-06-07
11:44:46.000000000 +0100
@@ -9,7 +9,7 @@
1 file changed, 2 insertions(+)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
-index a6da85586..fb849b21c 100644
+index a6da855862..fb849b21ca 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
@@ -62,6 +62,8 @@ sub _unix_os2_ext {
diff -Nru perl-5.28.1/debian/patches/debian/libnet_config_path.diff
perl-5.28.1/debian/patches/debian/libnet_config_path.diff
--- perl-5.28.1/debian/patches/debian/libnet_config_path.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/libnet_config_path.diff 2019-06-07
11:44:46.000000000 +0100
@@ -10,7 +10,7 @@
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/cpan/libnet/lib/Net/Config.pm b/cpan/libnet/lib/Net/Config.pm
-index 4f822a40a..4b3978113 100644
+index 4f822a40a4..4b39781134 100644
--- a/cpan/libnet/lib/Net/Config.pm
+++ b/cpan/libnet/lib/Net/Config.pm
@@ -72,9 +72,8 @@ my %nc = (
diff -Nru perl-5.28.1/debian/patches/debian/libperl_embed_doc.diff
perl-5.28.1/debian/patches/debian/libperl_embed_doc.diff
--- perl-5.28.1/debian/patches/debian/libperl_embed_doc.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/libperl_embed_doc.diff 2019-06-07
11:44:46.000000000 +0100
@@ -11,7 +11,7 @@
1 file changed, 3 insertions(+)
diff --git a/lib/ExtUtils/Embed.pm b/lib/ExtUtils/Embed.pm
-index e75e41f8c..985c35345 100644
+index e75e41f8c4..985c353457 100644
--- a/lib/ExtUtils/Embed.pm
+++ b/lib/ExtUtils/Embed.pm
@@ -293,6 +293,9 @@ and extensions in your C/C++ applications.
diff -Nru perl-5.28.1/debian/patches/debian/makemaker-manext.diff
perl-5.28.1/debian/patches/debian/makemaker-manext.diff
--- perl-5.28.1/debian/patches/debian/makemaker-manext.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/makemaker-manext.diff 2019-06-07
11:44:46.000000000 +0100
@@ -15,7 +15,7 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
-index 1a3893c30..8bb0ef2ee 100644
+index 1a3893c30b..8bb0ef2ee9 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
@@ -1090,8 +1090,8 @@ END
diff -Nru perl-5.28.1/debian/patches/debian/makemaker-pasthru.diff
perl-5.28.1/debian/patches/debian/makemaker-pasthru.diff
--- perl-5.28.1/debian/patches/debian/makemaker-pasthru.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/makemaker-pasthru.diff 2019-06-07
11:44:46.000000000 +0100
@@ -16,7 +16,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 4977baa15..bb41b274b 100644
+index 4977baa15d..bb41b274b3 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -2955,7 +2955,7 @@ sub pasthru {
diff -Nru perl-5.28.1/debian/patches/debian/mod_paths.diff
perl-5.28.1/debian/patches/debian/mod_paths.diff
--- perl-5.28.1/debian/patches/debian/mod_paths.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/mod_paths.diff 2019-06-07
11:44:46.000000000 +0100
@@ -24,7 +24,7 @@
1 file changed, 58 insertions(+)
diff --git a/perl.c b/perl.c
-index e6dfa8dc0..c7828e69c 100644
+index e6dfa8dc05..c7828e69ce 100644
--- a/perl.c
+++ b/perl.c
@@ -4674,6 +4674,10 @@ S_init_perllib(pTHX)
diff -Nru perl-5.28.1/debian/patches/debian/no_packlist_perllocal.diff
perl-5.28.1/debian/patches/debian/no_packlist_perllocal.diff
--- perl-5.28.1/debian/patches/debian/no_packlist_perllocal.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/no_packlist_perllocal.diff
2019-06-07 11:44:46.000000000 +0100
@@ -9,7 +9,7 @@
1 file changed, 3 insertions(+), 32 deletions(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 780e390cd..4977baa15 100644
+index 780e390cd9..4977baa15d 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -2232,11 +2232,6 @@ pure_perl_install :: all
diff -Nru perl-5.28.1/debian/patches/debian/patchlevel.diff
perl-5.28.1/debian/patches/debian/patchlevel.diff
--- perl-5.28.1/debian/patches/debian/patchlevel.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/patchlevel.diff 2019-06-07
11:44:46.000000000 +0100
@@ -15,7 +15,7 @@
1 file changed, 3 insertions(+)
diff --git a/patchlevel.h b/patchlevel.h
-index a5ca94bcc..d126b0df1 100644
+index a5ca94bcc0..d126b0df1f 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -137,6 +137,9 @@ static const char * const local_patches[] = {
diff -Nru perl-5.28.1/debian/patches/debian/perl5db-x-terminal-emulator.patch
perl-5.28.1/debian/patches/debian/perl5db-x-terminal-emulator.patch
--- perl-5.28.1/debian/patches/debian/perl5db-x-terminal-emulator.patch
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/perl5db-x-terminal-emulator.patch
2019-06-07 11:44:46.000000000 +0100
@@ -15,7 +15,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/perl5db.pl b/lib/perl5db.pl
-index ecc49a814..6eb03d7c1 100644
+index ecc49a814d..6eb03d7c11 100644
--- a/lib/perl5db.pl
+++ b/lib/perl5db.pl
@@ -6987,7 +6987,7 @@ properly set up.
diff -Nru perl-5.28.1/debian/patches/debian/perlbug-editor.diff
perl-5.28.1/debian/patches/debian/perlbug-editor.diff
--- perl-5.28.1/debian/patches/debian/perlbug-editor.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/perlbug-editor.diff 2019-06-07
11:44:46.000000000 +0100
@@ -10,7 +10,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/perlbug.PL b/utils/perlbug.PL
-index d1eb1e04a..4555d0449 100644
+index d1eb1e04a8..4555d04494 100644
--- a/utils/perlbug.PL
+++ b/utils/perlbug.PL
@@ -272,7 +272,7 @@ sub Init {
diff -Nru perl-5.28.1/debian/patches/debian/perldoc-pager.diff
perl-5.28.1/debian/patches/debian/perldoc-pager.diff
--- perl-5.28.1/debian/patches/debian/perldoc-pager.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/perldoc-pager.diff 2019-06-07
11:44:46.000000000 +0100
@@ -14,7 +14,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
-index 9501d6310..a5aedf630 100644
+index 9501d6310e..a5aedf6302 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
@@ -32,7 +32,7 @@ sub pager_configuration {
diff -Nru perl-5.28.1/debian/patches/debian/perlivp.diff
perl-5.28.1/debian/patches/debian/perlivp.diff
--- perl-5.28.1/debian/patches/debian/perlivp.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/perlivp.diff 2019-06-07
11:44:46.000000000 +0100
@@ -26,7 +26,7 @@
1 file changed, 1 insertion(+)
diff --git a/utils/perlivp.PL b/utils/perlivp.PL
-index 50d187a54..bd8091c54 100644
+index 50d187a544..bd8091c548 100644
--- a/utils/perlivp.PL
+++ b/utils/perlivp.PL
@@ -155,6 +155,7 @@ my $INC_total = 0;
diff -Nru perl-5.28.1/debian/patches/debian/prune_libs.diff
perl-5.28.1/debian/patches/debian/prune_libs.diff
--- perl-5.28.1/debian/patches/debian/prune_libs.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/prune_libs.diff 2019-06-07
11:44:46.000000000 +0100
@@ -17,7 +17,7 @@
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/regen-configure/U/modified/Myinit.U
b/regen-configure/U/modified/Myinit.U
-index 0e3155aec..e1d58c207 100644
+index 0e3155aecd..e1d58c2077 100644
--- a/regen-configure/U/modified/Myinit.U
+++ b/regen-configure/U/modified/Myinit.U
@@ -32,8 +32,7 @@
@@ -31,7 +31,7 @@
: This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
diff --git a/regen-configure/U/perl/End.U b/regen-configure/U/perl/End.U
-index 352071422..9716623ae 100644
+index 352071422f..9716623ae0 100644
--- a/regen-configure/U/perl/End.U
+++ b/regen-configure/U/perl/End.U
@@ -37,7 +37,7 @@ sunos*X4*)
diff -Nru perl-5.28.1/debian/patches/debian/sh4_op_optimize_workaround.diff
perl-5.28.1/debian/patches/debian/sh4_op_optimize_workaround.diff
--- perl-5.28.1/debian/patches/debian/sh4_op_optimize_workaround.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/sh4_op_optimize_workaround.diff
2019-06-07 11:44:46.000000000 +0100
@@ -14,7 +14,7 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cflags.SH b/cflags.SH
-index c8231e64e..3bb0c3e93 100755
+index c8231e64e8..3bb0c3e937 100755
--- a/cflags.SH
+++ b/cflags.SH
@@ -497,9 +497,9 @@ for file do
diff -Nru perl-5.28.1/debian/patches/debian/squelch-locale-warnings.diff
perl-5.28.1/debian/patches/debian/squelch-locale-warnings.diff
--- perl-5.28.1/debian/patches/debian/squelch-locale-warnings.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/squelch-locale-warnings.diff
2019-06-07 11:44:46.000000000 +0100
@@ -20,7 +20,7 @@
2 files changed, 11 insertions(+)
diff --git a/locale.c b/locale.c
-index 765334047..aedd7da0c 100644
+index 7653340477..aedd7da0c5 100644
--- a/locale.c
+++ b/locale.c
@@ -3142,6 +3142,9 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
@@ -34,7 +34,7 @@
|| (
/* disallow with "" or "0" */
diff --git a/pod/perllocale.pod b/pod/perllocale.pod
-index a32f72c88..e12b81cc4 100644
+index a32f72c88e..e12b81cc4c 100644
--- a/pod/perllocale.pod
+++ b/pod/perllocale.pod
@@ -1293,6 +1293,14 @@ B<NOTE>: C<PERL_BADLANG> only gives you a way to hide
the warning message.
diff -Nru perl-5.28.1/debian/patches/debian/writable_site_dirs.diff
perl-5.28.1/debian/patches/debian/writable_site_dirs.diff
--- perl-5.28.1/debian/patches/debian/writable_site_dirs.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/debian/writable_site_dirs.diff 2019-06-07
11:44:46.000000000 +0100
@@ -11,7 +11,7 @@
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 274e35c6f..dbb8651a9 100644
+index 274e35c6fc..dbb8651a9f 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -2249,7 +2249,7 @@ q{ "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
diff -Nru perl-5.28.1/debian/patches/fixes/autodie-scope.diff
perl-5.28.1/debian/patches/fixes/autodie-scope.diff
--- perl-5.28.1/debian/patches/fixes/autodie-scope.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/autodie-scope.diff 2019-06-07
11:44:46.000000000 +0100
@@ -23,7 +23,7 @@
create mode 100755 cpan/autodie/t/no-default.t
diff --git a/cpan/autodie/lib/Fatal.pm b/cpan/autodie/lib/Fatal.pm
-index 16e174347..2058abdab 100644
+index 16e1743474..2058abdab0 100644
--- a/cpan/autodie/lib/Fatal.pm
+++ b/cpan/autodie/lib/Fatal.pm
@@ -580,7 +580,12 @@ sub unimport {
@@ -42,7 +42,7 @@
}
diff --git a/cpan/autodie/t/no-all.t b/cpan/autodie/t/no-all.t
new file mode 100755
-index 000000000..1a503f68b
+index 0000000000..1a503f68be
--- /dev/null
+++ b/cpan/autodie/t/no-all.t
@@ -0,0 +1,22 @@
@@ -70,7 +70,7 @@
+1;
diff --git a/cpan/autodie/t/no-default.t b/cpan/autodie/t/no-default.t
new file mode 100755
-index 000000000..44d2acf27
+index 0000000000..44d2acf27a
--- /dev/null
+++ b/cpan/autodie/t/no-default.t
@@ -0,0 +1,23 @@
diff -Nru perl-5.28.1/debian/patches/fixes/caretx-fallback.diff
perl-5.28.1/debian/patches/fixes/caretx-fallback.diff
--- perl-5.28.1/debian/patches/fixes/caretx-fallback.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/caretx-fallback.diff 2019-06-07
11:44:46.000000000 +0100
@@ -12,7 +12,7 @@
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/caretx.c b/caretx.c
-index d758f730d..247708de8 100644
+index d758f730de..247708de8c 100644
--- a/caretx.c
+++ b/caretx.c
@@ -56,7 +56,19 @@ Perl_set_caret_X(pTHX) {
diff -Nru perl-5.28.1/debian/patches/fixes/cpan_web_link.diff
perl-5.28.1/debian/patches/fixes/cpan_web_link.diff
--- perl-5.28.1/debian/patches/fixes/cpan_web_link.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/cpan_web_link.diff 2019-06-07
11:44:46.000000000 +0100
@@ -11,7 +11,7 @@
1 file changed, 3 insertions(+)
diff --git a/cpan/CPAN/lib/CPAN.pm b/cpan/CPAN/lib/CPAN.pm
-index 1f69119e5..c472effe1 100644
+index 1f69119e5f..c472effe18 100644
--- a/cpan/CPAN/lib/CPAN.pm
+++ b/cpan/CPAN/lib/CPAN.pm
@@ -3990,6 +3990,9 @@ your operating system) then typing C<cpan> in a console
window will
diff -Nru perl-5.28.1/debian/patches/fixes/document_makemaker_ccflags.diff
perl-5.28.1/debian/patches/fixes/document_makemaker_ccflags.diff
--- perl-5.28.1/debian/patches/fixes/document_makemaker_ccflags.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/document_makemaker_ccflags.diff
2019-06-07 11:44:46.000000000 +0100
@@ -15,7 +15,7 @@
1 file changed, 4 insertions(+)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
-index 90d9eac49..81bdc9664 100644
+index 90d9eac49c..81bdc96649 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
@@ -1838,6 +1838,10 @@ currently used by MakeMaker but may be handy in
Makefile.PLs.
diff -Nru perl-5.28.1/debian/patches/fixes/errno-include-path.diff
perl-5.28.1/debian/patches/fixes/errno-include-path.diff
--- perl-5.28.1/debian/patches/fixes/errno-include-path.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/errno-include-path.diff 2019-06-07
11:44:46.000000000 +0100
@@ -25,7 +25,7 @@
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
-index 6a0031f0f..9d1454c96 100644
+index 6a0031f0f7..9d1454c96a 100644
--- a/ext/Errno/Errno_pm.PL
+++ b/ext/Errno/Errno_pm.PL
@@ -2,7 +2,7 @@ use ExtUtils::MakeMaker;
diff -Nru perl-5.28.1/debian/patches/fixes/eumm-usrmerge.diff
perl-5.28.1/debian/patches/fixes/eumm-usrmerge.diff
--- perl-5.28.1/debian/patches/fixes/eumm-usrmerge.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/eumm-usrmerge.diff 2019-06-07
11:44:46.000000000 +0100
@@ -21,7 +21,7 @@
3 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index bb41b274b..2e33d0a8a 100644
+index bb41b274b3..2e33d0a8ae 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -1243,8 +1243,8 @@ sub _fixin_replace_shebang {
@@ -61,7 +61,7 @@
# Figure out how to invoke interpreter on this machine.
diff --git a/cpan/ExtUtils-MakeMaker/t/fixin.t
b/cpan/ExtUtils-MakeMaker/t/fixin.t
-index 061e45624..872b023c5 100644
+index 061e456247..872b023c55 100644
--- a/cpan/ExtUtils-MakeMaker/t/fixin.t
+++ b/cpan/ExtUtils-MakeMaker/t/fixin.t
@@ -9,7 +9,7 @@ BEGIN {
@@ -109,7 +109,7 @@
+ );
+}
diff --git a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm
b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm
-index 3d093fcfb..cfe49e546 100644
+index 3d093fcfbd..cfe49e5465 100644
--- a/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm
+++ b/cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/BFD.pm
@@ -53,6 +53,9 @@ program - this is a program
diff -Nru perl-5.28.1/debian/patches/fixes/fix-manifest-failures.diff
perl-5.28.1/debian/patches/fixes/fix-manifest-failures.diff
--- perl-5.28.1/debian/patches/fixes/fix-manifest-failures.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/fix-manifest-failures.diff 2019-06-07
11:44:46.000000000 +0100
@@ -18,7 +18,7 @@
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/t/test.pl b/t/test.pl
-index 868911ce3..4d9af221b 100644
+index 868911ce39..4d9af221b9 100644
--- a/t/test.pl
+++ b/t/test.pl
@@ -199,7 +199,9 @@ sub find_git_or_skip {
diff -Nru perl-5.28.1/debian/patches/fixes/getopt-long-4.diff
perl-5.28.1/debian/patches/fixes/getopt-long-4.diff
--- perl-5.28.1/debian/patches/fixes/getopt-long-4.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/getopt-long-4.diff 2019-06-07
11:44:46.000000000 +0100
@@ -12,7 +12,7 @@
1 file changed, 6 insertions(+)
diff --git a/cpan/Getopt-Long/lib/Getopt/Long.pm
b/cpan/Getopt-Long/lib/Getopt/Long.pm
-index 664c8b63c..e4e3026db 100644
+index 664c8b63c9..e4e3026db6 100644
--- a/cpan/Getopt-Long/lib/Getopt/Long.pm
+++ b/cpan/Getopt-Long/lib/Getopt/Long.pm
@@ -1123,6 +1123,12 @@ sub FindOption ($$$$$) {
diff -Nru perl-5.28.1/debian/patches/fixes/inplace-editing-bugfix/part1.diff
perl-5.28.1/debian/patches/fixes/inplace-editing-bugfix/part1.diff
--- perl-5.28.1/debian/patches/fixes/inplace-editing-bugfix/part1.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/inplace-editing-bugfix/part1.diff
2019-06-07 11:44:46.000000000 +0100
@@ -14,7 +14,7 @@
4 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/doio.c b/doio.c
-index 309326b27..39f0c42e7 100644
+index 309326b27a..39f0c42e7e 100644
--- a/doio.c
+++ b/doio.c
@@ -1526,31 +1526,14 @@ S_dir_unchanged(pTHX_ const char *orig_pv, MAGIC *mg) {
@@ -96,7 +96,7 @@
}
else {
diff --git a/embed.fnc b/embed.fnc
-index 454a380e4..e762fe1ee 100644
+index 454a380e4c..e762fe1eec 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -440,6 +440,7 @@ p |bool|do_exec3 |NN const char *incmd|int fd|int
do_report
@@ -108,7 +108,7 @@
#if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
: Defined in doio.c, used only in pp_sys.c
diff --git a/embed.h b/embed.h
-index fb93ebc1c..a5416a114 100644
+index fb93ebc1cb..a5416a1148 100644
--- a/embed.h
+++ b/embed.h
@@ -1746,6 +1746,7 @@
@@ -120,7 +120,7 @@
#define ingroup(a,b) S_ingroup(aTHX_ a,b)
#define openn_cleanup(a,b,c,d,e,f,g,h,i,j,k,l,m) S_openn_cleanup(aTHX_
a,b,c,d,e,f,g,h,i,j,k,l,m)
diff --git a/proto.h b/proto.h
-index c91141b9e..66bb29b13 100644
+index c91141b9e8..66bb29b132 100644
--- a/proto.h
+++ b/proto.h
@@ -4723,6 +4723,9 @@ STATIC void S_deb_stack_n(pTHX_ SV** stack_base,
I32 stack_min, I32 stack_max, I
diff -Nru perl-5.28.1/debian/patches/fixes/inplace-editing-bugfix/part2.diff
perl-5.28.1/debian/patches/fixes/inplace-editing-bugfix/part2.diff
--- perl-5.28.1/debian/patches/fixes/inplace-editing-bugfix/part2.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/inplace-editing-bugfix/part2.diff
2019-06-07 11:44:46.000000000 +0100
@@ -12,7 +12,7 @@
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/t/io/inplace.t b/t/io/inplace.t
-index 98159e06b..ac50f1ab7 100644
+index 98159e06bf..ac50f1ab77 100644
--- a/t/io/inplace.t
+++ b/t/io/inplace.t
@@ -5,7 +5,7 @@ require './test.pl';
diff -Nru perl-5.28.1/debian/patches/fixes/inplace-editing-bugfix/part3.diff
perl-5.28.1/debian/patches/fixes/inplace-editing-bugfix/part3.diff
--- perl-5.28.1/debian/patches/fixes/inplace-editing-bugfix/part3.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/inplace-editing-bugfix/part3.diff
2019-06-07 11:44:46.000000000 +0100
@@ -31,7 +31,7 @@
3 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/doio.c b/doio.c
-index 39f0c42e7..f8be31c84 100644
+index 39f0c42e7e..f8be31c84a 100644
--- a/doio.c
+++ b/doio.c
@@ -1173,34 +1173,39 @@ S_argvout_free(pTHX_ SV *io, MAGIC *mg) {
@@ -95,7 +95,7 @@
}
#ifdef ARGV_USE_ATFUNCTIONS
diff --git a/t/io/inplace.t b/t/io/inplace.t
-index ac50f1ab7..0403cd925 100644
+index ac50f1ab77..0403cd9250 100644
--- a/t/io/inplace.t
+++ b/t/io/inplace.t
@@ -96,7 +96,7 @@ SKIP:
@@ -108,7 +108,7 @@
our $file = tempfile() ;
diff --git a/t/run/switches.t b/t/run/switches.t
-index 7ccef1e06..594cad6e7 100644
+index 7ccef1e063..594cad6e7f 100644
--- a/t/run/switches.t
+++ b/t/run/switches.t
@@ -429,7 +429,7 @@ __EOF__
diff -Nru perl-5.28.1/debian/patches/fixes/kfreebsd-renameat.diff
perl-5.28.1/debian/patches/fixes/kfreebsd-renameat.diff
--- perl-5.28.1/debian/patches/fixes/kfreebsd-renameat.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/kfreebsd-renameat.diff 2019-06-07
11:44:46.000000000 +0100
@@ -12,7 +12,7 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doio.c b/doio.c
-index 16daf9fd1..309326b27 100644
+index 16daf9fd11..309326b27a 100644
--- a/doio.c
+++ b/doio.c
@@ -1461,7 +1461,7 @@ Perl_nextargv(pTHX_ GV *gv, bool nomagicopen)
diff -Nru perl-5.28.1/debian/patches/fixes/math_complex_doc_angle_units.diff
perl-5.28.1/debian/patches/fixes/math_complex_doc_angle_units.diff
--- perl-5.28.1/debian/patches/fixes/math_complex_doc_angle_units.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/math_complex_doc_angle_units.diff
2019-06-07 11:44:46.000000000 +0100
@@ -11,7 +11,7 @@
1 file changed, 5 insertions(+)
diff --git a/cpan/Math-Complex/lib/Math/Trig.pm
b/cpan/Math-Complex/lib/Math/Trig.pm
-index acad31ff4..bc7ac780e 100644
+index acad31ff49..bc7ac780e9 100644
--- a/cpan/Math-Complex/lib/Math/Trig.pm
+++ b/cpan/Math-Complex/lib/Math/Trig.pm
@@ -263,6 +263,11 @@ core Perl which defines only the C<sin()> and C<cos()>.
The constant
diff -Nru perl-5.28.1/debian/patches/fixes/math_complex_doc_great_circle.diff
perl-5.28.1/debian/patches/fixes/math_complex_doc_great_circle.diff
--- perl-5.28.1/debian/patches/fixes/math_complex_doc_great_circle.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/math_complex_doc_great_circle.diff
2019-06-07 11:44:46.000000000 +0100
@@ -11,7 +11,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cpan/Math-Complex/lib/Math/Trig.pm
b/cpan/Math-Complex/lib/Math/Trig.pm
-index 1d9612a41..efc2ff80a 100644
+index 1d9612a41c..efc2ff80ac 100644
--- a/cpan/Math-Complex/lib/Math/Trig.pm
+++ b/cpan/Math-Complex/lib/Math/Trig.pm
@@ -608,7 +608,7 @@ or the midpoint if you know the end points:
diff -Nru perl-5.28.1/debian/patches/fixes/math_complex_doc_see_also.diff
perl-5.28.1/debian/patches/fixes/math_complex_doc_see_also.diff
--- perl-5.28.1/debian/patches/fixes/math_complex_doc_see_also.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/math_complex_doc_see_also.diff
2019-06-07 11:44:46.000000000 +0100
@@ -11,7 +11,7 @@
1 file changed, 2 insertions(+)
diff --git a/cpan/Math-Complex/lib/Math/Trig.pm
b/cpan/Math-Complex/lib/Math/Trig.pm
-index efc2ff80a..acad31ff4 100644
+index efc2ff80ac..acad31ff49 100644
--- a/cpan/Math-Complex/lib/Math/Trig.pm
+++ b/cpan/Math-Complex/lib/Math/Trig.pm
@@ -743,6 +743,8 @@ an answer instead of giving a fatal runtime error.
diff -Nru perl-5.28.1/debian/patches/fixes/memoize-pod.diff
perl-5.28.1/debian/patches/fixes/memoize-pod.diff
--- perl-5.28.1/debian/patches/fixes/memoize-pod.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/memoize-pod.diff 2019-06-07
11:44:46.000000000 +0100
@@ -11,7 +11,7 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cpan/Memoize/Memoize.pm b/cpan/Memoize/Memoize.pm
-index f4e6522d4..2f28b361f 100644
+index f4e6522d48..2f28b361f8 100644
--- a/cpan/Memoize/Memoize.pm
+++ b/cpan/Memoize/Memoize.pm
@@ -752,6 +752,8 @@ cache that was populated by the first call.
C<complicated> ends up
diff -Nru perl-5.28.1/debian/patches/fixes/memoize_storable_nstore.diff
perl-5.28.1/debian/patches/fixes/memoize_storable_nstore.diff
--- perl-5.28.1/debian/patches/fixes/memoize_storable_nstore.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/memoize_storable_nstore.diff
2019-06-07 11:44:46.000000000 +0100
@@ -53,7 +53,7 @@
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/cpan/Memoize/Memoize/Storable.pm
b/cpan/Memoize/Memoize/Storable.pm
-index 131479729..87876f227 100644
+index 1314797297..87876f227e 100644
--- a/cpan/Memoize/Memoize/Storable.pm
+++ b/cpan/Memoize/Memoize/Storable.pm
@@ -55,7 +55,7 @@ sub DESTROY {
@@ -66,7 +66,7 @@
} else {
Storable::store($self->{H}, $self->{FILENAME});
diff --git a/cpan/Memoize/t/tie_storable.t b/cpan/Memoize/t/tie_storable.t
-index de3b8dc26..a62423850 100644
+index de3b8dc26b..a62423850e 100644
--- a/cpan/Memoize/t/tie_storable.t
+++ b/cpan/Memoize/t/tie_storable.t
@@ -31,18 +31,34 @@ if ($@) {
diff -Nru perl-5.28.1/debian/patches/fixes/pipe-open-bugfix/part1.diff
perl-5.28.1/debian/patches/fixes/pipe-open-bugfix/part1.diff
--- perl-5.28.1/debian/patches/fixes/pipe-open-bugfix/part1.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/pipe-open-bugfix/part1.diff
2019-06-07 11:44:46.000000000 +0100
@@ -23,7 +23,7 @@
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/util.c b/util.c
-index 842cc953e..17dfda9bc 100644
+index 842cc953e2..17dfda9bc7 100644
--- a/util.c
+++ b/util.c
@@ -2441,8 +2441,10 @@ Perl_my_popen(pTHX_ const char *cmd, const char *mode)
diff -Nru perl-5.28.1/debian/patches/fixes/pipe-open-bugfix/part2.diff
perl-5.28.1/debian/patches/fixes/pipe-open-bugfix/part2.diff
--- perl-5.28.1/debian/patches/fixes/pipe-open-bugfix/part2.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/pipe-open-bugfix/part2.diff
2019-06-07 11:44:46.000000000 +0100
@@ -15,7 +15,7 @@
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/util.c b/util.c
-index 17dfda9bc..25b5c6601 100644
+index 17dfda9bc7..25b5c6601e 100644
--- a/util.c
+++ b/util.c
@@ -2302,8 +2302,10 @@ Perl_my_popen_list(pTHX_ const char *mode, int n, SV
**args)
diff -Nru perl-5.28.1/debian/patches/fixes/posix-mbrlen.diff
perl-5.28.1/debian/patches/fixes/posix-mbrlen.diff
--- perl-5.28.1/debian/patches/fixes/posix-mbrlen.diff 2019-03-31
12:42:43.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/posix-mbrlen.diff 2019-06-07
11:44:46.000000000 +0100
@@ -53,7 +53,7 @@
create mode 100644 ext/POSIX/t/mb.t
diff --git a/MANIFEST b/MANIFEST
-index fcf3455b2..aa5e9b16b 100644
+index fcf3455b2e..aa5e9b16bd 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -4233,6 +4233,7 @@ ext/POSIX/POSIX.xs POSIX extension
external subroutines
@@ -65,7 +65,7 @@
ext/POSIX/t/sigaction.t See if POSIX::sigaction works
ext/POSIX/t/sigset.t See if POSIX::SigSet works
diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs
-index 749730584..395025a86 100644
+index 7497305841..395025a868 100644
--- a/ext/POSIX/POSIX.xs
+++ b/ext/POSIX/POSIX.xs
@@ -3318,7 +3318,7 @@ mblen(s, n)
@@ -79,7 +79,7 @@
RETVAL = mblen(s, n);
diff --git a/ext/POSIX/t/mb.t b/ext/POSIX/t/mb.t
new file mode 100644
-index 000000000..961edf6cf
+index 0000000000..961edf6cf2
--- /dev/null
+++ b/ext/POSIX/t/mb.t
@@ -0,0 +1,47 @@
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/fixes/respect_umask.diff
perl-5.28.1/debian/patches/fixes/respect_umask.diff
--- perl-5.28.1/debian/patches/fixes/respect_umask.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/respect_umask.diff 2019-06-07
11:44:46.000000000 +0100
@@ -13,7 +13,7 @@
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
b/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
-index 047c00714..cd7e4f234 100644
+index 047c007145..cd7e4f234c 100644
--- a/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
+++ b/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
@@ -463,7 +463,7 @@ sub _can_write_dir {
@@ -88,7 +88,7 @@
if ($need_filtering) {
run_filter($pm_filter, $from, $to);
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index fe53be12e..274e35c6f 100644
+index fe53be12ef..274e35c6fc 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -2229,7 +2229,7 @@ doc__install : doc_site_install
diff -Nru
perl-5.28.1/debian/patches/fixes/storable-probing/disable-probing.diff
perl-5.28.1/debian/patches/fixes/storable-probing/disable-probing.diff
--- perl-5.28.1/debian/patches/fixes/storable-probing/disable-probing.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/storable-probing/disable-probing.diff
2019-06-07 11:44:46.000000000 +0100
@@ -22,7 +22,7 @@
8 files changed, 31 insertions(+), 164 deletions(-)
diff --git a/Makefile.SH b/Makefile.SH
-index 48151bce6..084924dab 100755
+index 48151bce65..084924dab5 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -173,15 +173,11 @@ esac
@@ -77,7 +77,7 @@
flags="--$name";
flags=`echo $flags | sed -e 's/--all//'`
diff --git a/dist/Storable/Makefile.PL b/dist/Storable/Makefile.PL
-index 69efc8294..60af5d256 100644
+index 69efc82944..60af5d256a 100644
--- a/dist/Storable/Makefile.PL
+++ b/dist/Storable/Makefile.PL
@@ -12,15 +12,7 @@ use Config;
@@ -144,7 +144,7 @@
'
all :: Storable.pm
diff --git a/dist/Storable/__Storable__.pm b/dist/Storable/__Storable__.pm
-index 71c669daa..e5a655ecd 100644
+index 71c669daaf..e5a655ecda 100644
--- a/dist/Storable/__Storable__.pm
+++ b/dist/Storable/__Storable__.pm
@@ -32,8 +32,6 @@ our $VERSION = '3.08';
@@ -193,7 +193,7 @@
modifying C<$Storable::recursion_limit> and
C<$Storable::recursion_limit_hash> respectively. Either can be set to
diff --git a/dist/Storable/stacksize b/dist/Storable/stacksize
-index 14e073973..f93eccce1 100644
+index 14e0739734..f93eccce1a 100644
--- a/dist/Storable/stacksize
+++ b/dist/Storable/stacksize
@@ -1,21 +1,17 @@
@@ -370,7 +370,7 @@
- or die "Failed to close $fn: $!\n";
}
diff --git a/dist/Storable/t/recurse.t b/dist/Storable/t/recurse.t
-index 63fde90fd..b5967a072 100644
+index 63fde90fdf..b5967a072c 100644
--- a/dist/Storable/t/recurse.t
+++ b/dist/Storable/t/recurse.t
@@ -318,9 +318,11 @@ is($refcount_ok, 1, "check refcount");
@@ -387,7 +387,7 @@
my $t;
print "# max depth ", MAX_DEPTH, "\n";
diff --git a/win32/GNUmakefile b/win32/GNUmakefile
-index 05193a1f2..afc18ec8a 100644
+index 05193a1f2d..afc18ec8a4 100644
--- a/win32/GNUmakefile
+++ b/win32/GNUmakefile
@@ -1168,7 +1168,7 @@ CFG_VARS = \
@@ -417,7 +417,7 @@
# be running in parallel like UNIDATAFILES, this target a placeholder for the
# future
diff --git a/win32/Makefile b/win32/Makefile
-index 1e245f712..a4776dd22 100644
+index 1e245f7128..a4776dd227 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -939,7 +939,7 @@ CFG_VARS = \
@@ -452,7 +452,7 @@
-del /f $(LIBDIR)\Win32CORE.pm
-del /f $(LIBDIR)\Win32API\File.pm
diff --git a/win32/makefile.mk b/win32/makefile.mk
-index a6072a95a..15b148d15 100644
+index a6072a95a6..15b148d155 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1139,7 +1139,7 @@ CFG_VARS = \
diff -Nru perl-5.28.1/debian/patches/fixes/storable-probing/prereq1.diff
perl-5.28.1/debian/patches/fixes/storable-probing/prereq1.diff
--- perl-5.28.1/debian/patches/fixes/storable-probing/prereq1.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/storable-probing/prereq1.diff
2019-06-07 11:44:46.000000000 +0100
@@ -12,7 +12,7 @@
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dist/Storable/Makefile.PL b/dist/Storable/Makefile.PL
-index 697750566..4f0213277 100644
+index 697750566d..4f02132776 100644
--- a/dist/Storable/Makefile.PL
+++ b/dist/Storable/Makefile.PL
@@ -14,10 +14,12 @@ use File::Spec;
diff -Nru perl-5.28.1/debian/patches/fixes/storable-probing/prereq2.diff
perl-5.28.1/debian/patches/fixes/storable-probing/prereq2.diff
--- perl-5.28.1/debian/patches/fixes/storable-probing/prereq2.diff
2019-03-31 12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/storable-probing/prereq2.diff
2019-06-07 11:44:46.000000000 +0100
@@ -12,7 +12,7 @@
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/dist/Storable/Makefile.PL b/dist/Storable/Makefile.PL
-index 4f0213277..69efc8294 100644
+index 4f02132776..69efc82944 100644
--- a/dist/Storable/Makefile.PL
+++ b/dist/Storable/Makefile.PL
@@ -92,11 +92,18 @@ sub depend {
@@ -36,7 +36,7 @@
release : dist
git tag \$(VERSION)
diff --git a/dist/Storable/stacksize b/dist/Storable/stacksize
-index 7abd3a84c..14e073973 100644
+index 7abd3a84cc..14e0739734 100644
--- a/dist/Storable/stacksize
+++ b/dist/Storable/stacksize
@@ -7,6 +7,9 @@ use Cwd;
diff -Nru perl-5.28.1/debian/patches/fixes/storable-recursion.diff
perl-5.28.1/debian/patches/fixes/storable-recursion.diff
--- perl-5.28.1/debian/patches/fixes/storable-recursion.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/storable-recursion.diff 2019-06-07
11:44:46.000000000 +0100
@@ -54,7 +54,7 @@
2 files changed, 77 insertions(+), 37 deletions(-)
diff --git a/dist/Storable/Storable.xs b/dist/Storable/Storable.xs
-index 6a90e2481..f6df32b12 100644
+index 6a90e24814..f6df32b121 100644
--- a/dist/Storable/Storable.xs
+++ b/dist/Storable/Storable.xs
@@ -418,6 +418,24 @@ typedef struct stcxt {
@@ -259,7 +259,7 @@
--cxt->recur_depth;
}
diff --git a/dist/Storable/t/recurse.t b/dist/Storable/t/recurse.t
-index fa8be0b37..63fde90fd 100644
+index fa8be0b374..63fde90fdf 100644
--- a/dist/Storable/t/recurse.t
+++ b/dist/Storable/t/recurse.t
@@ -20,7 +20,7 @@ use Storable qw(freeze thaw dclone);
diff -Nru perl-5.28.1/debian/patches/fixes/time-local-2020.diff
perl-5.28.1/debian/patches/fixes/time-local-2020.diff
--- perl-5.28.1/debian/patches/fixes/time-local-2020.diff 2019-03-31
12:42:41.000000000 +0100
+++ perl-5.28.1/debian/patches/fixes/time-local-2020.diff 2019-06-07
11:44:46.000000000 +0100
@@ -15,7 +15,7 @@
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
-index 634139695..e28c6d212 100644
+index 634139695f..e28c6d2129 100644
--- a/cpan/Time-Local/t/Local.t
+++ b/cpan/Time-Local/t/Local.t
@@ -96,7 +96,7 @@ SKIP: {
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
