Merge ~lucaskanashiro/ubuntu/+source/ruby2.7:fix-ftbfs into ubuntu/+source/ruby2.7:ubuntu/devel

[Lucas Kanashiro]

Fix FTBFS with glibc 2.32. Backported a couple of upstream patches which fix the build failure.

Here is a PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/groovy-ruby2.7

autopkgtest is happy:

autopkgtest [16:48:13]: @@@@@@@@@@@@@@@@@@@@ summary
run-all PASS
bundled-gems PASS
builtin-extensions PASS
rubyconfig PASS

[Sergio Durigan Junior (sergiodj)]

I'm reviewing this one.

[Sergio Durigan Junior (sergiodj)]

* Changelog:
  - [-] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [-] update-maintainer has been run

* Actual changes:
  - [-] no upstream changes to consider
  - [-] no further upstream version to consider
  - [√] debian changes look safe

* Build/Test:
  - [√] build is ok
  - [√] verified PPA package installs/uninstalls
  - [√] autopkgtest against the PPA package passes
  - [√] sanity checks test fine

The changes themselves look relatively fine, although I'm not a Ruby expert. I found it interesting that the first patch mentioned musl, even though we're fixing a problem due to a recent glibc :-).

I have a few small requests regarding the patches, but otherwise the MP is good to go IMO. For this reason, I'm marking it as Approved. Thanks!

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the review Sergio. I found upstream bug reports related to those patches and added them to the respective headers.

[Lucas Kanashiro (lucaskanashiro)]

Waiting for FFe approval.

[Lucas Kanashiro (lucaskanashiro)]

Turned out a FFe is not needed in this case. Uploaded:

$ git push pkg upload/2.7.1-3ubuntu1
Enumerating objects: 17, done.
Counting objects: 100% (17/17), done.
Delta compression using up to 8 threads
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 4.08 KiB | 2.04 MiB/s, done.
Total 12 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/ruby2.7
 * [new tag] upload/2.7.1-3ubuntu1 -> upload/2.7.1-3ubuntu1

$ dput ubuntu ../ruby2.7_2.7.1-3ubuntu1_source.changes
Checking signature on .changes
gpg: ../ruby2.7_2.7.1-3ubuntu1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../ruby2.7_2.7.1-3ubuntu1.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ruby2.7_2.7.1-3ubuntu1.dsc: done.
  Uploading ruby2.7_2.7.1-3ubuntu1.debian.tar.xz: done.
  Uploading ruby2.7_2.7.1-3ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index cfe37a4..95a7a47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby2.7 (2.7.1-3ubuntu1) groovy; urgency=medium
+
+  * Backport upstream patches to fix FTBFS with glibc 2.32 (LP: #1897895)
+    - d/p/0010-brace-the-fact-that-lchmod-2-can-EOPNOTSUPP.patch
+    - d/p/0011-Moved-not-implemented-method-tests-Bug-16662.patch
+
+ -- Lucas Kanashiro <[e-mail]>  Tue, 29 Sep 2020 16:07:54 -0300
+
 ruby2.7 (2.7.1-3build1) groovy; urgency=medium
 
   * No-change rebuild against libffi8ubuntu1
diff --git a/debian/patches/0010-brace-the-fact-that-lchmod-2-can-EOPNOTSUPP.patch b/debian/patches/0010-brace-the-fact-that-lchmod-2-can-EOPNOTSUPP.patch
new file mode 100644
index 0000000..262d2c8
--- /dev/null
+++ b/debian/patches/0010-brace-the-fact-that-lchmod-2-can-EOPNOTSUPP.patch
@@ -0,0 +1,96 @@
+From a19228f878d955eaf2cce086bcf53f46fdf894b9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?=
+ <[e-mail]>
+Date: Thu, 23 Jan 2020 15:33:42 +0900
+Subject: [PATCH] brace the fact that lchmod(2) can EOPNOTSUPP
+
+Musl libc has this function as a tiny wrapper of fchmodat(3posix).  On
+the other hand Linux kernel does not support changing modes of a symlink.
+The operation always fails with EOPNOTSUPP.  This fchmodat behaviour is
+defined in POSIX.  We have to take care of such exceptions.
+
+Origin: upstream, https://github.com/ruby/ruby/commit/a19228f878
+Bug-Upstream: https://bugs.ruby-lang.org/issues/16979
+Reviewed-By: Lucas Kanashiro <[e-mail]>
+
+---
+ lib/fileutils.rb               |  3 ++-
+ test/pathname/test_pathname.rb |  2 +-
+ test/ruby/test_notimp.rb       | 19 ++++++++++++-------
+ 3 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/lib/fileutils.rb b/lib/fileutils.rb
+index a7ad65ae5e..04788e26ca 100644
+--- a/lib/fileutils.rb
++++ b/lib/fileutils.rb
+@@ -1345,6 +1345,7 @@ def chmod(mode)
+       else
+         File.chmod mode, path()
+       end
++    rescue Errno::EOPNOTSUPP
+     end
+ 
+     def chown(uid, gid)
+@@ -1439,7 +1440,7 @@ def copy_metadata(path)
+       if st.symlink?
+         begin
+           File.lchmod mode, path
+-        rescue NotImplementedError
++        rescue NotImplementedError, Errno::EOPNOTSUPP
+         end
+       else
+         File.chmod mode, path
+diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb
+index 792510bdfb..2ce32a6c12 100644
+--- a/test/pathname/test_pathname.rb
++++ b/test/pathname/test_pathname.rb
+@@ -818,7 +818,7 @@ def test_lchmod
+       old = path.lstat.mode
+       begin
+         path.lchmod(0444)
+-      rescue NotImplementedError
++      rescue NotImplementedError, Errno::EOPNOTSUPP
+         next
+       end
+       assert_equal(0444, path.lstat.mode & 0777)
+diff --git a/test/ruby/test_notimp.rb b/test/ruby/test_notimp.rb
+index b069154cfc..e13db692b5 100644
+--- a/test/ruby/test_notimp.rb
++++ b/test/ruby/test_notimp.rb
+@@ -13,11 +13,11 @@ def test_respond_to_fork
+ 
+   def test_respond_to_lchmod
+     assert_include(File.methods, :lchmod)
+-    if /linux/ =~ RUBY_PLATFORM
+-      assert_equal(false, File.respond_to?(:lchmod))
+-    end
+-    if /freebsd/ =~ RUBY_PLATFORM
++    case RUBY_PLATFORM
++    when /freebsd/, /linux-musl/
+       assert_equal(true, File.respond_to?(:lchmod))
++    when /linux/
++      assert_equal(false, File.respond_to?(:lchmod))
+     end
+   end
+ 
+@@ -57,9 +57,14 @@ def test_call_lchmod
+         File.open(f, "w") {}
+         File.symlink f, g
+         newmode = 0444
+-        File.lchmod newmode, "#{d}/g"
+-        snew = File.lstat(g)
+-        assert_equal(newmode, snew.mode & 0777)
++        begin
++          File.lchmod newmode, "#{d}/g"
++        rescue Errno::EOPNOTSUPP
++          skip $!
++        else
++          snew = File.lstat(g)
++          assert_equal(newmode, snew.mode & 0777)
++        end
+       }
+     end
+   end
+-- 
+2.25.1
+
diff --git a/debian/patches/0011-Moved-not-implemented-method-tests-Bug-16662.patch b/debian/patches/0011-Moved-not-implemented-method-tests-Bug-16662.patch
new file mode 100644
index 0000000..e7f778d
--- /dev/null
+++ b/debian/patches/0011-Moved-not-implemented-method-tests-Bug-16662.patch
@@ -0,0 +1,139 @@
+From 72c02aa4b79731c7f25c9267f74b347f1946c704 Mon Sep 17 00:00:00 2001
+From: Nobuyoshi Nakada <[e-mail]>
+Date: Fri, 28 Feb 2020 21:15:37 +0900
+Subject: [PATCH] Moved not-implemented method tests [Bug #16662]
+
+Test not-implemented method with the dedicated methods, instead of
+platform dependent features.
+
+Origin: upstream, https://github.com/ruby/ruby/commit/72c02aa4b79
+Bug-Upstream: https://bugs.ruby-lang.org/issues/16662
+Reviewed-By: Lucas Kanashiro <[e-mail]>
+
+---
+ test/-ext-/test_notimplement.rb |  7 +++
+ test/ruby/test_notimp.rb        | 90 ---------------------------------
+ 2 files changed, 7 insertions(+), 90 deletions(-)
+ delete mode 100644 test/ruby/test_notimp.rb
+
+diff --git a/test/-ext-/test_notimplement.rb b/test/-ext-/test_notimplement.rb
+index 92a2fd22b8..038b507b73 100644
+--- a/test/-ext-/test_notimplement.rb
++++ b/test/-ext-/test_notimplement.rb
+@@ -13,10 +13,17 @@ def test_funcall_notimplement
+   end
+ 
+   def test_respond_to
++    assert_include(Bug.methods(false), :notimplement)
++    assert_include(Bug::NotImplement.instance_methods(false), :notimplement)
+     assert_not_respond_to(Bug, :notimplement)
+     assert_not_respond_to(Bug::NotImplement.new, :notimplement)
+   end
+ 
++  def test_method_inspect_notimplement
++    assert_match(/not-implemented/, Bug.method(:notimplement).inspect)
++    assert_match(/not-implemented/, Bug::NotImplement.instance_method(:notimplement).inspect)
++  end
++
+   def test_not_method_defined
+     assert !Bug::NotImplement.method_defined?(:notimplement)
+     assert !Bug::NotImplement.method_defined?(:notimplement, true)
+diff --git a/test/ruby/test_notimp.rb b/test/ruby/test_notimp.rb
+deleted file mode 100644
+index e13db692b5..0000000000
+--- a/test/ruby/test_notimp.rb
++++ /dev/null
+@@ -1,90 +0,0 @@
+-# frozen_string_literal: false
+-require 'test/unit'
+-require 'timeout'
+-require 'tmpdir'
+-
+-class TestNotImplement < Test::Unit::TestCase
+-  def test_respond_to_fork
+-    assert_include(Process.methods, :fork)
+-    if /linux/ =~ RUBY_PLATFORM
+-      assert_equal(true, Process.respond_to?(:fork))
+-    end
+-  end
+-
+-  def test_respond_to_lchmod
+-    assert_include(File.methods, :lchmod)
+-    case RUBY_PLATFORM
+-    when /freebsd/, /linux-musl/
+-      assert_equal(true, File.respond_to?(:lchmod))
+-    when /linux/
+-      assert_equal(false, File.respond_to?(:lchmod))
+-    end
+-  end
+-
+-  def test_call_fork
+-    GC.start
+-    pid = nil
+-    ps =
+-      case RUBY_PLATFORM
+-      when /linux/ # assume Linux Distribution uses procps
+-        proc {`ps -eLf #{pid}`}
+-      when /freebsd/
+-        proc {`ps -lH #{pid}`}
+-      when /darwin/
+-        proc {`ps -lM #{pid}`}
+-      else
+-        proc {`ps -l #{pid}`}
+-      end
+-    assert_nothing_raised(Timeout::Error, ps) do
+-      EnvUtil.timeout(20) {
+-        pid = fork {}
+-        Process.wait pid
+-        pid = nil
+-      }
+-    end
+-  ensure
+-    if pid
+-      Process.kill(:KILL, pid)
+-      Process.wait pid
+-    end
+-  end if Process.respond_to?(:fork)
+-
+-  def test_call_lchmod
+-    if File.respond_to?(:lchmod)
+-      Dir.mktmpdir {|d|
+-        f = "#{d}/f"
+-        g = "#{d}/g"
+-        File.open(f, "w") {}
+-        File.symlink f, g
+-        newmode = 0444
+-        begin
+-          File.lchmod newmode, "#{d}/g"
+-        rescue Errno::EOPNOTSUPP
+-          skip $!
+-        else
+-          snew = File.lstat(g)
+-          assert_equal(newmode, snew.mode & 0777)
+-        end
+-      }
+-    end
+-  end
+-
+-  def test_method_inspect_fork
+-    m = Process.method(:fork)
+-    if Process.respond_to?(:fork)
+-      assert_not_match(/not-implemented/, m.inspect)
+-    else
+-      assert_match(/not-implemented/, m.inspect)
+-    end
+-  end
+-
+-  def test_method_inspect_lchmod
+-    m = File.method(:lchmod)
+-    if File.respond_to?(:lchmod)
+-      assert_not_match(/not-implemented/, m.inspect)
+-    else
+-      assert_match(/not-implemented/, m.inspect)
+-    end
+-  end
+-
+-end
+-- 
+2.25.1
+
diff --git a/debian/patches/series b/debian/patches/series
index f56e37e..2f0d167 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,6 @@
 0007-Port-to-kfreebsd-amd64.patch
 0008-Fix-priority-order-of-paths-in-I-option.patch
 0009-Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch
+# glibc 2.32 fixes
+0010-brace-the-fact-that-lchmod-2-can-EOPNOTSUPP.patch
+0011-Moved-not-implemented-method-tests-Bug-16662.patch