Bug#949838: stretch-pu: package perl/5.24.1-3+deb9u5

[Niko Tyni]

Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org at packages.debian.org
Usertags: pu

Hi, I'd like to fix src:perl #915209 (FTBFS in 2020) in stretch with
the attached debdiff. This is a build time test-only change with no run
time effects.

IIRC source only uploads are OK for stretch, is that correct?

Please let me know if it's OK to upload. Thanks for your work!

Changes:
 perl (5.24.1-3+deb9u6) stretch; urgency=medium
 .
   * Add backported Time-Local patch by Bernhard M. Wiedemann fixing test
     failures from the year 2020 onwards. Thanks to Dean Hamstead.
     (Closes: #915209)

-- System Information:
Debian Release: bullseye/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 5.3.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=fi_FI.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-------------- next part --------------
diff -Nru perl-5.24.1/debian/changelog perl-5.24.1/debian/changelog
--- perl-5.24.1/debian/changelog	2018-11-29 13:11:57.000000000 +0200
+++ perl-5.24.1/debian/changelog	2020-01-25 19:54:54.000000000 +0200
@@ -1,3 +1,11 @@
+perl (5.24.1-3+deb9u6) stretch; urgency=medium
+
+  * Add backported Time-Local patch by Bernhard M. Wiedemann fixing test
+    failures from the year 2020 onwards. Thanks to Dean Hamstead.
+    (Closes: #915209)
+
+ -- Niko Tyni <ntyni at debian.org>  Sat, 25 Jan 2020 19:54:54 +0200
+
 perl (5.24.1-3+deb9u5) stretch-security; urgency=high
 
   * [SECURITY] CVE-2018-18311: Integer overflow leading to buffer
diff -Nru perl-5.24.1/debian/patches/fixes/time-local-2020.diff perl-5.24.1/debian/patches/fixes/time-local-2020.diff
--- perl-5.24.1/debian/patches/fixes/time-local-2020.diff	1970-01-01 02:00:00.000000000 +0200
+++ perl-5.24.1/debian/patches/fixes/time-local-2020.diff	2020-01-25 19:53:26.000000000 +0200
@@ -0,0 +1,66 @@
+From fa594ebedfe64ff2ea2101e07618daeaa9d6e0eb Mon Sep 17 00:00:00 2001
+From: "Bernhard M. Wiedemann" <bwiedemann at suse.de>
+Date: Fri, 16 Mar 2018 11:44:01 +0100
+Subject: Fix Time::Local tests
+
+in 2020, year 70 changes its meaning to 2070
+so we do what man Time::Local recommends and use 4-digit years
+
+(Backported for Debian 5.24 by Dean Hamstead)
+
+Origin: backport, https://rt.cpan.org/Ticket/Attachment/1776857/956088/0001-Fix-Time-Local-tests.patch
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=124787
+Bug-Debian: https://bugs.debian.org/915209
+Patch-Name: fixes/time-local-2020.diff
+---
+ cpan/Time-Local/t/Local.t | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a2d..0a852a0f4 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
diff -Nru perl-5.24.1/debian/patches/series perl-5.24.1/debian/patches/series
--- perl-5.24.1/debian/patches/series	2018-11-21 17:39:51.000000000 +0200
+++ perl-5.24.1/debian/patches/series	2020-01-25 19:53:26.000000000 +0200
@@ -83,3 +83,4 @@
 fixes/CVE-2018-18312.diff
 fixes/CVE-2018-18313.diff
 fixes/CVE-2018-18314.diff
+fixes/time-local-2020.diff