1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
|
Description: Remove openssl lib hack
Author: Jérôme Charaoui <jerome@riseup.net>
Date: Fri, 15 Aug 2025 17:03:11 -0400
Forwarded: not-needed
Origin: https://github.com/jruby/jruby/commit/bb5788517ae92c04b2a2aa5329c18b1793c60bd8
Index: jruby/lib/pom.rb
===================================================================
--- jruby.orig/lib/pom.rb
+++ jruby/lib/pom.rb
@@ -225,21 +225,6 @@ project 'JRuby Lib Setup' do
FileUtils.mkdir_p( default_specs )
- # have an empty openssl.rb so we do not run in trouble with not having
- # jopenssl which is part of the default gems
- lib_dir = File.join( target, 'lib' )
- openssl = File.join( lib_dir, 'openssl.rb' )
- FileUtils.mkdir_p( lib_dir )
- FileUtils.touch( openssl )
- $LOAD_PATH.unshift lib_dir
-
- # since the bouncy castle .jars are version-ed (e.g. bcprov-jdk15on-1.47)
- # make sure we cleanup before adding the ones from the jruby-openssl.gem:
- Dir.glob( File.join( lib_dir, "bc{prov,pkix}*.jar" ) ).each do |f|
- # use this instead of FileUtils.rm_f - issue #1698
- File.delete( f ) if File.exists?( f )
- end
-
# now we can require the rubygems staff
require 'rubygems/installer'
require 'rubygems/package'
|