Louis-Philippe Véronneau pushed to branch master at Debian Java Maintainers / jruby
Commits: 3282a5af by Louis-Philippe Véronneau at 2021-01-01T14:53:29-05:00 add fileutils to the copied libs, as it's also needed - - - - - a39ac050 by Louis-Philippe Véronneau at 2021-01-01T15:07:32-05:00 Fix subpar changelog entries - - - - - ffd10bfe by Louis-Philippe Véronneau at 2021-01-01T15:07:48-05:00 d/patches: delete 0007 and don't add /usr/lib/ruby/vendor_ruby to the jruby LOAD_PATH anymore. (Closes: #977979, #977981) - - - - - 08397e8b by Louis-Philippe Véronneau at 2021-01-01T15:08:51-05:00 d/control: update to dh13. - - - - - 6 changed files: - + debian/NEWS - debian/changelog - debian/control - − debian/patches/0007-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch - debian/patches/series - debian/rules Changes: ===================================== debian/NEWS ===================================== @@ -0,0 +1,10 @@ +jruby (9.2.14.0-1) unstable; urgency=medium + + Since jruby 9.2.14 only targets ruby2.5 compatbility and since Debian now + packages ruby2.7-compatible gems, support for loading ruby libraries from + /usr/lib/ruby/vendor_ruby has been removed from this version of jruby. + . + This change might introduce breakage if you depended on this feature. See + BTS #977981 for more details. + + -- Louis-Philippe Véronneau <[email protected]> Fri, 01 Jan 2021 15:00:04 -0500 ===================================== debian/changelog ===================================== @@ -5,16 +5,19 @@ jruby (9.2.14.0-1) UNRELEASED; urgency=medium [ Louis-Philippe Véronneau ] * Add new dependencies required and replace javax.annotation-api by jakarta.annotation.api. - * Updated 0004-Add-missing-maven-artifacts-pom-files.patch with the next - pom.xml files. - * Added 0018 to disable maven truezip plugin. - * Added 0019 to disable maven checksum plugin. - * Refactored 0001 into 0020 to truly disable polyglot maven. + * d/patches: Updated 0004-Add-missing-maven-artifacts-pom-files.patch with + the next pom.xml files. + * d/patches: Added 0018 to disable maven truezip plugin. + * d/patches: Added 0019 to disable maven checksum plugin. + * d/patches: Refactored 0001 into 0020 to truly disable polyglot maven.. * d/control: remove build conflict with open-infrastructure-locales-c.utf-8, as it has been removed from unstable. * d/rules: fix where ruby2.7 libs are copied from for the testsuite. (Closes: #976477) - * d/rules: remote get-orig-source. + * d/rules: remove get-orig-source target. + * d/patches: delete 0007 and don't add /usr/lib/ruby/vendor_ruby to the + jruby LOAD_PATH anymore. (Closes: #977979, #977981) + * d/control: update to dh13. [ Thomas Goirand ] * New upstream release. ===================================== debian/control ===================================== @@ -6,7 +6,7 @@ Uploaders: Miguel Landaeta <[email protected]>, Build-Depends: ant-optional, - debhelper-compat (= 12), + debhelper-compat (= 13), default-jdk, jruby-openssl, junit4, ===================================== debian/patches/0007-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch deleted ===================================== @@ -1,82 +0,0 @@ -Description: Add /usr/lib/ruby/vendor_ruby to default LOAD_PATH -Author: Miguel Landaeta <[email protected]> -Bug-Debian: https://bugs.debian.org/663342 -Forwarded: no -Last-Update: 2020-12-28 - -Index: jruby/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java -=================================================================== ---- jruby.orig/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java -+++ jruby/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java -@@ -61,6 +61,8 @@ public class RbConfigLibrary implements - private static final String RUBY_DRAGONFLYBSD = "dragonflybsd"; - private static final String RUBY_AIX = "aix"; - -+ private static final String MRI_VENDOR_LIBDIR = "/usr/lib/ruby/vendor_ruby"; -+ - private static String normalizedHome; - - /** This is a map from Java's "friendly" OS names to those used by Ruby */ -@@ -182,6 +184,10 @@ public class RbConfigLibrary implements - return newFile(getRubyLibDir(runtime), "vendor_ruby").getPath(); - } - -+ public static String getMRIVendorLibDir(Ruby runtime) { -+ return SafePropertyAccessor.getProperty("debian.mri.vendor.libdir", MRI_VENDOR_LIBDIR); -+ } -+ - public static String getVendorLibDir(Ruby runtime) { - return getVendorDir(runtime); - } -@@ -302,6 +308,7 @@ public class RbConfigLibrary implements - String rubyLibDir = getRubyLibDir(runtime); - String archDir = getArchDir(runtime); - String vendorDir = getVendorDir(runtime); -+ String vendorMRILibDir = getMRIVendorLibDir(runtime); - String vendorLibDir = getVendorLibDir(runtime); - String vendorArchDir = getVendorArchDir(runtime); - String siteDir = getSiteDir(runtime); -@@ -318,6 +325,7 @@ public class RbConfigLibrary implements - setConfig(context, CONFIG, "vendorlibdir", vendorLibDir); - setConfig(context, CONFIG, "vendorarchdir", vendorArchDir); - } -+ setConfig(context, CONFIG, "mri_vendor_libdir", vendorMRILibDir); - setConfig(context, CONFIG, "sitedir", siteDir); - setConfig(context, CONFIG, "sitelibdir", siteLibDir); - setConfig(context, CONFIG, "sitearchdir", siteArchDir); -Index: jruby/core/src/main/java/org/jruby/runtime/load/LoadService.java -=================================================================== ---- jruby.orig/core/src/main/java/org/jruby/runtime/load/LoadService.java -+++ jruby/core/src/main/java/org/jruby/runtime/load/LoadService.java -@@ -73,6 +73,7 @@ import org.jruby.runtime.ThreadContext; - import org.jruby.runtime.builtin.IRubyObject; - import org.jruby.util.FileResource; - import org.jruby.util.JRubyFile; -+import org.jruby.util.SafePropertyAccessor; - import org.jruby.util.collections.StringArraySet; - import org.jruby.util.log.Logger; - import org.jruby.util.log.LoggerFactory; -@@ -254,6 +255,11 @@ public class LoadService { - addPath(RbConfigLibrary.getRubyLibDir(runtime)); - } - -+ // Allow jruby to load libraries installed in the system -+ if (SafePropertyAccessor.getBoolean("debian.include.mri_vendor_libdir_in_load_path", false)) { -+ addPath(RbConfigLibrary.getMRIVendorLibDir(runtime)); -+ } -+ - } catch(SecurityException ignore) {} - addPaths(runtime.getInstanceConfig().getExtraLoadPaths()); - } -Index: jruby/bin/jruby.bash -=================================================================== ---- jruby.orig/bin/jruby.bash -+++ jruby/bin/jruby.bash -@@ -429,6 +429,7 @@ fi - jvm_command+=("-Djruby.home=$JRUBY_HOME" \ - "-Djruby.lib=$JRUBY_HOME/lib" "-Djruby.script=jruby" \ - "-Djruby.shell=$JRUBY_SHELL" \ -+ "-Ddebian.include.mri_vendor_libdir_in_load_path=true" \ - "$java_class" "$@") - - add_log ===================================== debian/patches/series ===================================== @@ -1,7 +1,6 @@ 0004-Add-missing-maven-artifacts-pom-files.patch 0005-Disable-jnr-ffi-native-usage.patch 0006-Disable-maven-jruby-jars-artifact.patch -0007-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch 0008-Configure-unit-tests-to-run-at-build-time.patch #0010-Exclude-mri-tests-failing-in-debian.patch 0011-Disable-failed-tests-in-sbuild.patch ===================================== debian/rules ===================================== @@ -67,7 +67,7 @@ prepare-tests: ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) # this just copies some needed gems and their dependencies to the # lib directory, so tests can load all their needed dependencies - cd ./lib/ruby/stdlib/ && for gem in psych json; do \ + cd ./lib/ruby/stdlib/ && for gem in psych json fileutils; do \ cp -a /usr/lib/ruby/2.7.0/$$gem* ./ ; \ done cd ./lib/ruby/stdlib/ && cp -a \ View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/8da4573ed1283acad4ef137b8e90be3e9252e9cb...08397e8b3e2d5f0300ed42f16c74444144f33538 -- View it on GitLab: https://salsa.debian.org/java-team/jruby/-/compare/8da4573ed1283acad4ef137b8e90be3e9252e9cb...08397e8b3e2d5f0300ed42f16c74444144f33538 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
