From 4c4e2d4e1d78dc1f23a3240372ba1b31f5f35bea Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Tue, 21 Jan 2020 17:59:22 +0800 Subject: [PATCH 1/3] generate.pl: Add patch for Time::Local on perls between 5.26 - 5.30 - https://github.com/Perl/docker-perl/issues/76 - https://github.com/Perl/perl5/issues/17410 For current-supported perls, only 5.28 is affected. --- generate.pl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/generate.pl b/generate.pl index 27c83b18..d4340bb2 100755 --- a/generate.pl +++ b/generate.pl @@ -6,6 +6,8 @@ use Devel::PatchPerl; use LWP::Simple; +use version 0.77; + sub die_with_sample { die <; }; +# fetch Time-Local test patch for fixing failures upon entering year 2020 +my $time_local_patch = get 'https://rt.cpan.org/Public/Ticket/Attachment/1776857/956088/0001-Fix-Time-Local-tests.patch'; + my %builds; # sha256 taken from http://www.cpan.org/authors/id/M/MI/MIYAGAWA/CHECKSUMS @@ -179,6 +184,14 @@ sub die_with_sample { print $fh $patch; } + # Install additional patch for Time::Local on perls between 5.26 to 5.30 + if ( version->parse("v$release->{version}") >= version->parse('v5.26.0') + && version->parse("v$release->{version}") < version->parse('v5.30.0')) + { + open my $fh, '>', "$dir/Fix-Time-Local-tests.patch"; + print $fh $time_local_patch; + } + if (defined $release->{test_parallel} && $release->{test_parallel} eq "no") { $output =~ s/\{\{test\}\}/make test_harness/; } From 5106974c1737a185a898be2bd521880b43382f1e Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Tue, 21 Jan 2020 18:01:57 +0800 Subject: [PATCH 2/3] cpanfile: Add dependency on version pragma Per `perldoc version`, use the 0.77 release and up that provides the `parse` and `declare` methods. --- cpanfile | 1 + 1 file changed, 1 insertion(+) diff --git a/cpanfile b/cpanfile index 7de3599d..b87b691d 100644 --- a/cpanfile +++ b/cpanfile @@ -1,5 +1,6 @@ requires 'Devel::PatchPerl'; requires 'YAML::XS'; +requires 'version', '0.77'; on 'develop' => sub { requires 'Perl::Tidy'; From c650a7d0d01139a4e28ec5ed66d95ccf9518ad97 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Tue, 21 Jan 2020 18:03:03 +0800 Subject: [PATCH 3/3] :gear: Generate patches for Time::Local from 5.26.3 to 5.28.2 --- .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ .../Fix-Time-Local-tests.patch | 67 +++++++++++++++++++ 16 files changed, 1072 insertions(+) create mode 100644 5.026.003-main,threaded-buster/Fix-Time-Local-tests.patch create mode 100644 5.026.003-main,threaded-stretch/Fix-Time-Local-tests.patch create mode 100644 5.026.003-main-buster/Fix-Time-Local-tests.patch create mode 100644 5.026.003-main-stretch/Fix-Time-Local-tests.patch create mode 100644 5.026.003-slim,threaded-buster/Fix-Time-Local-tests.patch create mode 100644 5.026.003-slim,threaded-stretch/Fix-Time-Local-tests.patch create mode 100644 5.026.003-slim-buster/Fix-Time-Local-tests.patch create mode 100644 5.026.003-slim-stretch/Fix-Time-Local-tests.patch create mode 100644 5.028.002-main,threaded-buster/Fix-Time-Local-tests.patch create mode 100644 5.028.002-main,threaded-stretch/Fix-Time-Local-tests.patch create mode 100644 5.028.002-main-buster/Fix-Time-Local-tests.patch create mode 100644 5.028.002-main-stretch/Fix-Time-Local-tests.patch create mode 100644 5.028.002-slim,threaded-buster/Fix-Time-Local-tests.patch create mode 100644 5.028.002-slim,threaded-stretch/Fix-Time-Local-tests.patch create mode 100644 5.028.002-slim-buster/Fix-Time-Local-tests.patch create mode 100644 5.028.002-slim-stretch/Fix-Time-Local-tests.patch diff --git a/5.026.003-main,threaded-buster/Fix-Time-Local-tests.patch b/5.026.003-main,threaded-buster/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.026.003-main,threaded-buster/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.026.003-main,threaded-stretch/Fix-Time-Local-tests.patch b/5.026.003-main,threaded-stretch/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.026.003-main,threaded-stretch/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.026.003-main-buster/Fix-Time-Local-tests.patch b/5.026.003-main-buster/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.026.003-main-buster/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.026.003-main-stretch/Fix-Time-Local-tests.patch b/5.026.003-main-stretch/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.026.003-main-stretch/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.026.003-slim,threaded-buster/Fix-Time-Local-tests.patch b/5.026.003-slim,threaded-buster/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.026.003-slim,threaded-buster/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.026.003-slim,threaded-stretch/Fix-Time-Local-tests.patch b/5.026.003-slim,threaded-stretch/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.026.003-slim,threaded-stretch/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.026.003-slim-buster/Fix-Time-Local-tests.patch b/5.026.003-slim-buster/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.026.003-slim-buster/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.026.003-slim-stretch/Fix-Time-Local-tests.patch b/5.026.003-slim-stretch/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.026.003-slim-stretch/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.028.002-main,threaded-buster/Fix-Time-Local-tests.patch b/5.028.002-main,threaded-buster/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.028.002-main,threaded-buster/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.028.002-main,threaded-stretch/Fix-Time-Local-tests.patch b/5.028.002-main,threaded-stretch/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.028.002-main,threaded-stretch/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.028.002-main-buster/Fix-Time-Local-tests.patch b/5.028.002-main-buster/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.028.002-main-buster/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.028.002-main-stretch/Fix-Time-Local-tests.patch b/5.028.002-main-stretch/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.028.002-main-stretch/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.028.002-slim,threaded-buster/Fix-Time-Local-tests.patch b/5.028.002-slim,threaded-buster/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.028.002-slim,threaded-buster/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.028.002-slim,threaded-stretch/Fix-Time-Local-tests.patch b/5.028.002-slim,threaded-stretch/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.028.002-slim,threaded-stretch/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.028.002-slim-buster/Fix-Time-Local-tests.patch b/5.028.002-slim-buster/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.028.002-slim-buster/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 + diff --git a/5.028.002-slim-stretch/Fix-Time-Local-tests.patch b/5.028.002-slim-stretch/Fix-Time-Local-tests.patch new file mode 100644 index 00000000..a2253f96 --- /dev/null +++ b/5.028.002-slim-stretch/Fix-Time-Local-tests.patch @@ -0,0 +1,67 @@ +From c4c733988fd2012cf517c021bb31ec13097b2d48 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 16 Mar 2018 11:44:01 +0100 +Subject: [PATCH] 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 +--- + 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 634139695f..e28c6d2129 100644 +--- a/cpan/Time-Local/t/Local.t ++++ b/cpan/Time-Local/t/Local.t +@@ -96,7 +96,7 @@ SKIP: { + + # 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); +@@ -111,7 +111,7 @@ SKIP: { + + # 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); +@@ -128,7 +128,6 @@ SKIP: { + + for (@bad_time) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; +- $year -= 1900; + $mon--; + + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; +@@ -138,19 +137,19 @@ for (@bad_time) { + + { + is( +- timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, ++ 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 ), ++ 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 ), ++ 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' + ); +-- +2.13.6 +