Merge ~vpa1977/ubuntu/+source/jruby:jruby-ftbfs into ubuntu/+source/jruby:ubuntu/devel

[Vladimir Petko]

This MR addresses jruby build and autopkgtest issues.

ppa: ppa:vpa1977/plusone [1]

Changes:
 - copy POM files so that maven-install-plugin could update them
 - mark mri-extra, spec-ruby, mri-stdlib as flaky
 - d/p/jruby-8081-invert-o-nonblock-flag.patch: apply upstream patch
   to fix fcntl call O_NONBLOCK semantics (it was inverted)

Testing:
 - build in ppa with -proposed enabled[2]
 - rebuild jruby against itself[3]
 - autopkgtests
  - jruby/9.4.5.0+ds-1ubuntu1~ppa3
    + ✅ jruby on noble for amd64 @ 26.02.24 21:52:17 Log️ 🗒️ [4]
    + ✅ jruby on noble for armhf @ 26.02.24 20:17:06 Log️ 🗒️ [5]
    + ✅ jruby on noble for i386 @ 26.02.24 20:15:19 Log️ 🗒️ [6]
    + ✅ jruby on noble for ppc64el @ 26.02.24 20:18:34 Log️ 🗒️ [7]
    + ✅ jruby on noble for s390x @ 26.02.24 20:14:51 Log️ 🗒️ [8]

arm64 timed out, but not considered a regression.

 - test setting pipes to blocking (see comment)

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone/+packages
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone/+sourcepub/15818671/+listing-archive-extra
[3] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone-rebuild/+build/27821466
[4] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/noble/amd64/j/jruby/20240226_215217_e9afd@/log.gz
[5] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/noble/armhf/j/jruby/20240226_201706_7dfaf@/log.gz
[6] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/noble/i386/j/jruby/20240226_201519_b2258@/log.gz
[7] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/noble/ppc64el/j/jruby/20240226_201834_c5095@/log.gz
[8] https://autopkgtest.ubuntu.com/results/autopkgtest-noble-vpa1977-plusone/noble/s390x/j/jruby/20240226_201451_1aacb@/log.gz

[Vladimir Petko (vpa1977)]

captureRuby.rb
---
require 'open3'
require 'fcntl'

if defined? JRUBY_VERSION
  puts "JRuby #{JRUBY_VERSION}, Java #{java.lang.System.getProperty('java.version')}"
else
  puts "CRuby #{RUBY_VERSION}"
end

read, write = IO.pipe
flags = write.fcntl(Fcntl::F_GETFL)
# set nonblocking flag so that ruby knows about it
write.fcntl(Fcntl::F_SETFL, flags | (Fcntl::O_NONBLOCK)) # actually clears
# clear nonblocking flag
write.fcntl(Fcntl::F_SETFL, flags & (~Fcntl::O_NONBLOCK)) # set nonblock flag

pid = spawn("./printFlags.py", :out => write)

write.close
puts "Manual spawn: #{read.read}"
Process.wait pid
---

printFlags.py
------
#!/usr/bin/env python3

import fcntl
import os
import sys

def decode_flags(flags):
    flags_to_check = {
        "O_RDONLY": os.O_RDONLY,
        "O_WRONLY": os.O_WRONLY,
        "O_RDWR": os.O_RDWR,
        "O_APPEND": os.O_APPEND,
        "O_NONBLOCK": os.O_NONBLOCK,
    }

    result = []
    for name, flag in flags_to_check.items():
        if flags & flag:
            result.append(name)
            flags &= ~flag

    if flags:
        result.append(str(flags))

    return "+".join(result)

stdout_io_flags = fcntl.fcntl(sys.stdout.fileno(), fcntl.F_GETFL)
print(f"stdout io flags: {stdout_io_flags} == {decode_flags(stdout_io_flags)}")
----

$jruby capturePython.rb
JRuby 9.4.5.0, Java 21.0.2
Manual spawn: stdout io flags: 1 == O_WRONLY

The output shows that the flag was successfully cleared.

[Pushkar Kulkarni (pushkarnk)]

review: Approve

[Vladimir Petko (vpa1977)]

Uploaded, thank you for review!!!

diff --git a/debian/changelog b/debian/changelog
index 7b51e87..e8434d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+jruby (9.4.5.0+ds-1ubuntu1) noble; urgency=medium
+
+  * d/rules: copy jruby pom files so that they can by updated by
+    maven-install-plugin. Fixes ftbfs (LP: #2054942).
+  * d/t/control: mark mri-extra, spec-ruby, mri-stdlib as flaky. See
+    launchpad bug 2054943.
+  * d/p/jruby-8081-invert-o-nonblock-flag.patch: apply upstream patch
+    to fix fcntl call. This allows workaround for launchpad
+    bug 2054943.
+
+ -- Vladimir Petko <[e-mail]>  Mon, 26 Feb 2024 11:55:18 +1300
+
 jruby (9.4.5.0+ds-1) unstable; urgency=medium
 
   * Rebuild for unstable.
diff --git a/debian/control b/debian/control
index 21e0097..2ba7e82 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: jruby
 Section: ruby
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders:
  Thomas Goirand <[e-mail]>,
  Jérôme Charaoui <[e-mail]>,
diff --git a/debian/patches/0014-jruby-8081-invert-o-nonblock-flag.patch b/debian/patches/0014-jruby-8081-invert-o-nonblock-flag.patch
 new file mode 100644
index 0000000..f6c99e8
--- /dev/null
+++ b/debian/patches/0014-jruby-8081-invert-o-nonblock-flag.patch
@@ -0,0 +1,26 @@
+Description: Invert this logic to match O_NONBLOCK flag
+ The blocking behaviour was opposite of what O_NONBLOCK flag
+ indicates.
+Author: Charles Oliver Nutter <[e-mail]>
+Origin: upstream, https://github.com/jruby/jruby/commit/40a43760fddccdc9b5ca636680fc75a08d6a0d49
+Bug: https://github.com/jruby/jruby/issues/8081
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/jruby/+bug/2054943
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1064786
+Applied-Upstream: commit, 40a43760fddccdc9b5ca636680fc75a08d6a0d49
+Last-Update: 2024-02-26
+diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
+index 115c259279..144660fe82 100644
+--- a/core/src/main/java/org/jruby/RubyIO.java
++++ b/core/src/main/java/org/jruby/RubyIO.java
+@@ -2619,9 +2619,9 @@ public class RubyIO extends RubyObject implements IOEncodable, Closeable, Flusha
+             return runtime.newFixnum(close_on_exec_p(context).isTrue() ? FD_CLOEXEC : 0);
+         } else if (realCmd == Fcntl.F_SETFL.intValue()) {
+             if ((nArg & OpenFlags.O_NONBLOCK.intValue()) != 0) {
+-                fptr.setBlocking(runtime, true);
+-            } else {
+                 fptr.setBlocking(runtime, false);
++            } else {
++                fptr.setBlocking(runtime, true);
+             }
+
+             if ((nArg & OpenFlags.O_CLOEXEC.intValue()) != 0) {
diff --git a/debian/patches/series b/debian/patches/series
index dedc44d..ec9db73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0012-Fix-test-failures-related-to-Module-PTY.patch
 0013-Work-around-JarResourceTest-failure.patch
 Update-to-use-non-expired-certificates.patch
+0014-jruby-8081-invert-o-nonblock-flag.patch
diff --git a/debian/rules b/debian/rules
index 7f9bd55..112c7ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,12 @@ execute_after_dh_auto_configure:
 	mv rubygems debian/maven-repo
 	# backup upstream generated poms
 	$(foreach p,. lib core shaded,cp ${p}/pom.xml ${p}/pom.xml.bak;)
+	# copy jruby poms rather than links, because the build will try to patch them
+	for p in jruby jruby-parent jruby-base jruby-core jruby-artifacts ; do \
+		rm debian/maven-repo/org/jruby/$$p/* ;\
+		mkdir debian/maven-repo/org/jruby/$$p/debian ; \
+		cp /usr/share/maven-repo/org/jruby/$$p/debian/* debian/maven-repo/org/jruby/$$p/debian/ ;\
+	done
 
 override_dh_auto_build:
 	dh_auto_build -- -Djruby.revision=$(DEB_VERSION) -Pmain,complete,dist
diff --git a/debian/tests/control b/debian/tests/control
index 5d26b4d..4fa7fdb 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -112,7 +112,7 @@ Depends:
  ruby-rspec,
  ruby-test-unit,
  @,
-Restrictions: allow-stderr
+Restrictions: allow-stderr, flaky
 Architecture: amd64, arm64
 
 Tests: mri-core
@@ -140,7 +140,7 @@ Depends:
  ruby-rspec,
  ruby-test-unit,
  @,
-Restrictions: allow-stderr
+Restrictions: allow-stderr, flaky
 Architecture: amd64, arm64
 
 Tests: mri-stdlib
@@ -154,5 +154,5 @@ Depends:
  ruby-rspec,
  ruby-test-unit,
  @,
-Restrictions: allow-stderr
+Restrictions: allow-stderr, flaky
 Architecture: amd64, arm64