Package: src:ruby2.3
Version: 2.3.5-1
Tags: patch sid
Severity: important

please find attached some symbols updates and ignoring some test results:

 - the explicit_bzero symbol is part of glibc 2.26, so marking it as
   optional.
 - there are other symbols available on 64bit archs, however I
   only checked on arm64, ppc64el and s390x.
 - the TestFileUtils.rb and TestProcess.rb are apparently LP specific,
   the buildd user calling adduser --quiet buildd sbuild,lxd
 - I only see the TestFloat.rb and TestIO_Console.rb failures on i386.


diff -Nru ruby2.3-2.3.5/debian/changelog ruby2.3-2.3.5/debian/changelog
--- ruby2.3-2.3.5/debian/changelog	2017-11-14 14:06:39.000000000 +0100
+++ ruby2.3-2.3.5/debian/changelog	2017-11-15 14:16:49.000000000 +0100
@@ -1,3 +1,10 @@
+ruby2.3 (2.3.5-1ubuntu4) bionic; urgency=medium
+
+  * Ignore two test failures.
+  * Mark a symbol as optional.
+
+ -- Matthias Klose <[email protected]>  Wed, 15 Nov 2017 14:16:49 +0100
+
 ruby2.3 (2.3.5-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru ruby2.3-2.3.5/debian/libruby2.3.symbols ruby2.3-2.3.5/debian/libruby2.3.symbols
--- ruby2.3-2.3.5/debian/libruby2.3.symbols	2017-11-14 14:06:39.000000000 +0100
+++ ruby2.3-2.3.5/debian/libruby2.3.symbols	2017-11-15 14:16:49.000000000 +0100
@@ -23,7 +23,7 @@
  dln_find_exe_r@Base 2.3.0~preview2
  dln_find_file_r@Base 2.3.0~preview2
  dln_load@Base 2.3.0~preview2
- explicit_bzero@Base 2.3.0~preview2
+ (optional)explicit_bzero@Base 2.3.0~preview2
  nucomp_canonicalization@Base 2.3.0~preview2
  nurat_canonicalization@Base 2.3.0~preview2
  onig_add_end_call@Base 2.3.0~preview2
@@ -651,10 +651,10 @@
  rb_find_file_ext@Base 2.3.0~preview2
  rb_find_file_ext_safe@Base 2.3.0~preview2
  rb_find_file_safe@Base 2.3.0~preview2
- (arch=amd64 kfreebsd-amd64 ia64 s390x)rb_fix2int@Base 2.3.0~preview2
+ (arch=amd64 kfreebsd-amd64 arm64 ia64 ppc64el s390x)rb_fix2int@Base 2.3.0~preview2
  rb_fix2short@Base 2.3.0~preview2
  rb_fix2str@Base 2.3.0~preview2
- (arch=amd64 kfreebsd-amd64 ia64 s390x)rb_fix2uint@Base 2.3.0~preview2
+ (arch=amd64 kfreebsd-amd64 arm64 ia64 ppc64el s390x)rb_fix2uint@Base 2.3.0~preview2
  rb_fix2ushort@Base 2.3.0~preview2
  rb_float_new@Base 2.3.0~preview2
  rb_float_new_in_heap@Base 2.3.0~preview2
@@ -971,11 +971,11 @@
  rb_notimplement@Base 2.3.0~preview2
  rb_num2dbl@Base 2.3.0~preview2
  rb_num2fix@Base 2.3.0~preview2
- (arch=amd64)rb_num2int@Base 2.3.0~preview2
+ (arch=amd64 arm64 ppc64el s390x)rb_num2int@Base 2.3.0~preview2
  rb_num2ll@Base 2.3.0~preview2
  rb_num2long@Base 2.3.0~preview2
  rb_num2short@Base 2.3.0~preview2
- (arch=amd64)rb_num2uint@Base 2.3.0~preview2
+ (arch=amd64 arm64 ppc64el s390x)rb_num2uint@Base 2.3.0~preview2
  rb_num2ull@Base 2.3.0~preview2
  rb_num2ulong@Base 2.3.0~preview2
  rb_num2ushort@Base 2.3.0~preview2
@@ -1030,7 +1030,7 @@
  rb_objspace_marked_object_p@Base 2.3.0~preview2
  rb_objspace_reachable_objects_from@Base 2.3.0~preview2
  rb_objspace_reachable_objects_from_root@Base 2.3.0~preview2
- (arch=amd64)rb_out_of_int@Base 2.3.0~preview2
+ (arch=amd64 arm64 ppc64el s390x)rb_out_of_int@Base 2.3.0~preview2
  rb_output_fs@Base 2.3.0~preview2
  rb_output_rs@Base 2.3.0~preview2
  rb_p@Base 2.3.0~preview2
diff -Nru ruby2.3-2.3.5/debian/patches/0011-Whitelist-classes-and-symbols-that-are-in-Gem-spec-Y.patch ruby2.3-2.3.5/debian/patches/0011-Whitelist-classes-and-symbols-that-are-in-Gem-spec-Y.patch
--- ruby2.3-2.3.5/debian/patches/0011-Whitelist-classes-and-symbols-that-are-in-Gem-spec-Y.patch	2017-11-14 14:06:39.000000000 +0100
+++ ruby2.3-2.3.5/debian/patches/0011-Whitelist-classes-and-symbols-that-are-in-Gem-spec-Y.patch	2017-11-15 14:16:49.000000000 +0100
@@ -23,11 +23,11 @@
  6 files changed, 54 insertions(+), 5 deletions(-)
  create mode 100644 lib/rubygems/safe_yaml.rb
 
-diff --git a/lib/rubygems.rb b/lib/rubygems.rb
-index 9c0219c..3528a15 100644
+Index: b/lib/rubygems.rb
+===================================================================
 --- a/lib/rubygems.rb
 +++ b/lib/rubygems.rb
-@@ -602,7 +602,7 @@ def self.load_yaml
+@@ -602,7 +602,7 @@ module Gem
  
      unless test_syck
        begin
@@ -36,7 +36,7 @@
        rescue Gem::LoadError
          # It's OK if the user does not have the psych gem installed.  We will
          # attempt to require the stdlib version
-@@ -626,6 +626,7 @@ def self.load_yaml
+@@ -626,6 +626,7 @@ module Gem
      end
  
      require 'yaml'
@@ -44,11 +44,11 @@
  
      # If we're supposed to be using syck, then we may have to force
      # activate it via the YAML::ENGINE API.
-diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
-index de90cbf..2bcd830 100644
+Index: b/lib/rubygems/config_file.rb
+===================================================================
 --- a/lib/rubygems/config_file.rb
 +++ b/lib/rubygems/config_file.rb
-@@ -332,7 +332,7 @@ def load_file(filename)
+@@ -332,7 +332,7 @@ if you believe they were disclosed to a
      return {} unless filename and File.exist? filename
  
      begin
@@ -57,11 +57,11 @@
        unless content.kind_of? Hash
          warn "Failed to load #{filename} because it doesn't contain valid YAML hash"
          return {}
-diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb
-index 0d9adba..ab49ea2 100644
+Index: b/lib/rubygems/package.rb
+===================================================================
 --- a/lib/rubygems/package.rb
 +++ b/lib/rubygems/package.rb
-@@ -466,7 +466,7 @@ def read_checksums gem
+@@ -466,7 +466,7 @@ EOM
  
      @checksums = gem.seek 'checksums.yaml.gz' do |entry|
        Zlib::GzipReader.wrap entry do |gz_io|
@@ -70,11 +70,11 @@
        end
      end
    end
-diff --git a/lib/rubygems/package/old.rb b/lib/rubygems/package/old.rb
-index 5e722ba..071f714 100644
+Index: b/lib/rubygems/package/old.rb
+===================================================================
 --- a/lib/rubygems/package/old.rb
 +++ b/lib/rubygems/package/old.rb
-@@ -101,7 +101,7 @@ def file_list io # :nodoc:
+@@ -101,7 +101,7 @@ class Gem::Package::Old < Gem::Package
        header << line
      end
  
@@ -83,9 +83,8 @@
    end
  
    ##
-diff --git a/lib/rubygems/safe_yaml.rb b/lib/rubygems/safe_yaml.rb
-new file mode 100644
-index 0000000..b98cfaa
+Index: b/lib/rubygems/safe_yaml.rb
+===================================================================
 --- /dev/null
 +++ b/lib/rubygems/safe_yaml.rb
 @@ -0,0 +1,48 @@
@@ -137,11 +136,11 @@
 +    end
 +  end
 +end
-diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
-index 2519b96..748b336 100644
+Index: b/lib/rubygems/specification.rb
+===================================================================
 --- a/lib/rubygems/specification.rb
 +++ b/lib/rubygems/specification.rb
-@@ -1101,7 +1101,7 @@ def self.from_yaml(input)
+@@ -1101,7 +1101,7 @@ class Gem::Specification < Gem::BasicSpe
      Gem.load_yaml
  
      input = normalize_yaml_input input
diff -Nru ruby2.3-2.3.5/debian/patches/0090-Exclude-tests-that-fail-on-Ubuntu-builds.patch ruby2.3-2.3.5/debian/patches/0090-Exclude-tests-that-fail-on-Ubuntu-builds.patch
--- ruby2.3-2.3.5/debian/patches/0090-Exclude-tests-that-fail-on-Ubuntu-builds.patch	1970-01-01 01:00:00.000000000 +0100
+++ ruby2.3-2.3.5/debian/patches/0090-Exclude-tests-that-fail-on-Ubuntu-builds.patch	2017-11-15 14:16:49.000000000 +0100
@@ -0,0 +1,30 @@
+Index: b/test/excludes/TestFileUtils.rb
+===================================================================
+--- /dev/null
++++ b/test/excludes/TestFileUtils.rb
+@@ -0,0 +1 @@
++exclude :test_chown, "fails on Launchpad builders"
+Index: b/test/excludes/TestProcess.rb
+===================================================================
+--- a/test/excludes/TestProcess.rb
++++ b/test/excludes/TestProcess.rb
+@@ -3,3 +3,5 @@
+ # may point to an issue in the Array implementation.
+ # https://bugs.ruby-lang.org/issues/12500
+ exclude :test_aspawn_too_long_path, "RAM and time consuming test"
++# Ubuntu buildds
++exclude :test_execopts_gid, "fails on Launchpad builders"
+Index: b/test/excludes/TestFloat.rb
+===================================================================
+--- /dev/null
++++ b/test/excludes/TestFloat.rb
+@@ -0,0 +1 @@
++exclude :test_round_with_precision, "fails on Launchpad builders (i386)"
+Index: b/test/excludes/TestIO_Console.rb
+===================================================================
+--- a/test/excludes/TestIO_Console.rb
++++ b/test/excludes/TestIO_Console.rb
+@@ -1,2 +1,3 @@
+ # frozen_string_literal: false
+ exclude(:test_getpass, 'not portable')
++exclude :test_ioflush2, "fails on Launchpad builders (i386)"
diff -Nru ruby2.3-2.3.5/debian/patches/series ruby2.3-2.3.5/debian/patches/series
--- ruby2.3-2.3.5/debian/patches/series	2017-11-14 14:06:39.000000000 +0100
+++ ruby2.3-2.3.5/debian/patches/series	2017-11-15 12:36:49.000000000 +0100
@@ -9,3 +9,4 @@
 0009-rdoc-set-gzip-timestamp-on-compressed-javascript-to-.patch
 0010-Make-Date-in-gemspec-reproducible.patch
 0011-Whitelist-classes-and-symbols-that-are-in-Gem-spec-Y.patch
+0090-Exclude-tests-that-fail-on-Ubuntu-builds.patch

Reply via email to