Package: ruby2.5 Version: 2.5.1-6 Severity: serious Tags: patch Justification: fails to build from source (but built successfully in the past) User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu disco ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following: * 0012-test-time-tzdata-2018f.patch: Adjust tz tests for new tzdata. Due to changes in past timestamps in tzdata 2018f, ruby2.5's testsuite fails. I've included a cherrypick of the upstream commit that fixes this. It probably makes sense to fix #911717 (missing build-dep on tzdata) at the same time. ... Adam -- System Information: Debian Release: buster/sid APT prefers disco APT policy: (500, 'disco') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.18.0-10-lowlatency (SMP w/4 CPU cores; PREEMPT) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_CA:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
diff -Nru ruby2.5-2.5.1/debian/control ruby2.5-2.5.1/debian/control --- ruby2.5-2.5.1/debian/control 2018-09-23 12:43:14.000000000 -0600 +++ ruby2.5-2.5.1/debian/control 2018-11-04 15:38:57.000000000 -0700 @@ -1,8 +1,7 @@ Source: ruby2.5 Section: ruby Priority: optional -Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> -XSBC-Original-Maintainer: Debian Ruby Team <pkg-ruby-extras-maintain...@lists.alioth.debian.org> +Maintainer: Debian Ruby Team <pkg-ruby-extras-maintain...@lists.alioth.debian.org> Uploaders: Antonio Terceiro <terce...@debian.org>, Chris Hofstaedtler <z...@debian.org> Build-Depends: bison, diff -Nru ruby2.5-2.5.1/debian/patches/0012-test-time-tzdata-2018f.patch ruby2.5-2.5.1/debian/patches/0012-test-time-tzdata-2018f.patch --- ruby2.5-2.5.1/debian/patches/0012-test-time-tzdata-2018f.patch 1969-12-31 17:00:00.000000000 -0700 +++ ruby2.5-2.5.1/debian/patches/0012-test-time-tzdata-2018f.patch 2018-11-04 15:38:57.000000000 -0700 @@ -0,0 +1,38 @@ +Description: Cherrypick fix for tzdata 2018f +Author: Adam Conrad <adcon...@ubuntu.com> +Origin: https://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_time_tz.rb?r1=65296&r2=65365 +Forwarded: not-needed +Last-Update: 2018-11-04 + +--- trunk/test/ruby/test_time_tz.rb 2018/10/22 01:25:29 65296 ++++ trunk/test/ruby/test_time_tz.rb 2018/10/26 01:47:09 65365 +@@ -88,7 +88,9 @@ + has_lisbon_tz &&= have_tz_offset?("Europe/Lisbon") + CORRECT_TOKYO_DST_1951 = with_tz("Asia/Tokyo") { + if Time.local(1951, 5, 6, 12, 0, 0).dst? # noon, DST +- Time.local(1951, 5, 6, 1, 0, 0).dst? # DST with fixed tzdata ++ if Time.local(1951, 5, 6, 1, 0, 0).dst? # DST with fixed tzdata ++ Time.local(1951, 9, 8, 23, 0, 0).dst? ? "2018f" : "2018e" ++ end + end + } + +@@ -388,12 +390,16 @@ + Asia/Singapore Thu Dec 31 16:29:59 1981 UTC = Thu Dec 31 23:59:59 1981 SGT isdst=0 gmtoff=27000 + Asia/Singapore Thu Dec 31 16:30:00 1981 UTC = Fri Jan 1 00:30:00 1982 SGT isdst=0 gmtoff=28800 + End +- gen_zdump_test CORRECT_TOKYO_DST_1951 ? <<'End' : <<'End' ++ gen_zdump_test CORRECT_TOKYO_DST_1951 ? <<'End' + (CORRECT_TOKYO_DST_1951 < "2018f" ? <<'2018e' : <<'2018f') : <<'End' + Asia/Tokyo Sat May 5 14:59:59 1951 UTC = Sat May 5 23:59:59 1951 JST isdst=0 gmtoff=32400 + Asia/Tokyo Sat May 5 15:00:00 1951 UTC = Sun May 6 01:00:00 1951 JDT isdst=1 gmtoff=36000 ++End + Asia/Tokyo Sat Sep 8 13:59:59 1951 UTC = Sat Sep 8 23:59:59 1951 JDT isdst=1 gmtoff=36000 + Asia/Tokyo Sat Sep 8 14:00:00 1951 UTC = Sat Sep 8 23:00:00 1951 JST isdst=0 gmtoff=32400 +-End ++2018e ++Asia/Tokyo Sat Sep 8 14:59:59 1951 UTC = Sun Sep 9 00:59:59 1951 JDT isdst=1 gmtoff=36000 ++Asia/Tokyo Sat Sep 8 15:00:00 1951 UTC = Sun Sep 9 00:00:00 1951 JST isdst=0 gmtoff=32400 ++2018f + Asia/Tokyo Sat May 5 16:59:59 1951 UTC = Sun May 6 01:59:59 1951 JST isdst=0 gmtoff=32400 + Asia/Tokyo Sat May 5 17:00:00 1951 UTC = Sun May 6 03:00:00 1951 JDT isdst=1 gmtoff=36000 + Asia/Tokyo Fri Sep 7 15:59:59 1951 UTC = Sat Sep 8 01:59:59 1951 JDT isdst=1 gmtoff=36000 diff -Nru ruby2.5-2.5.1/debian/patches/series ruby2.5-2.5.1/debian/patches/series --- ruby2.5-2.5.1/debian/patches/series 2018-11-04 01:39:53.000000000 -0700 +++ ruby2.5-2.5.1/debian/patches/series 2018-11-04 15:38:57.000000000 -0700 @@ -19,3 +19,4 @@ rubygems-2388.patch 0010-test-test_pair-fix-deadlock-in-test_connect_accept_n.patch 0011-test-use-larger-keys-for-SSL-tests.patch +0012-test-time-tzdata-2018f.patch