[jruby] 01/01: Add dependencies on jruby-openssl

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch jruby-openssl
in repository jruby.

commit d7cd8d601b94debf7a8adce8cd2bbcabc4f6f8ab
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sun Jun 28 17:00:45 2015 -0300

    Add dependencies on jruby-openssl
---
 debian/changelog                                   |  5 ++-
 debian/control                                     |  3 +-
 .../0005-Disable-openssl-usage-in-tests.patch      | 46 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       | 13 +++++-
 5 files changed, 18 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ec9415..5604d08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 jruby (1.7.20.1-3) UNRELEASED; urgency=medium
 
   * Add missing dependencies for jruby binary package. (Closes: #771694).
+  * Provide full cryptographic support:
+    - Add Recommends on jruby. (Closes: #743746).
+    - Add Build-Depends on jruby-openssl for unit tests during build-time.
 
- -- Miguel Landaeta <nomadium at debian.org>  Sun, 28 Jun 2015 16:51:24 -0300
+ -- Miguel Landaeta <nomadium at debian.org>  Sun, 28 Jun 2015 16:58:37 -0300
 
 jruby (1.7.20.1-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 704d9e9..c94a954 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders: Miguel Landaeta <nomadium at debian.org>,
 Build-Depends: ant-optional,
                bnd,
                debhelper (>= 9~),
+               jruby-openssl,
                junit4,
                libasm4-java,
                libbsf-java,
@@ -86,7 +87,7 @@ Depends: default-jre | java6-runtime,
          nailgun (>= 0.9.1~),
          libyecht-java (>= 1.0~),
          ${misc:Depends}
-Recommends: ri
+Recommends: ri, jruby-openssl
 Description: 100% pure-Java implementation of Ruby
  JRuby is a high performance, stable, fully threaded Java implementation
  of the Ruby programming language.
diff --git a/debian/patches/0005-Disable-openssl-usage-in-tests.patch b/debian/patches/0005-Disable-openssl-usage-in-tests.patch
deleted file mode 100644
index 239a90a..0000000
--- a/debian/patches/0005-Disable-openssl-usage-in-tests.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Miguel Landaeta <nomadium at debian.org>
-Date: Sat, 30 May 2015 12:57:27 -0300
-Subject: Disable definitions depending on jruby-openssl since is not packaged yet
-Forwarded: no
-
-diff --git a/spec/ruby/core/marshal/fixtures/marshal_data.rb b/spec/ruby/core/marshal/fixtures/marshal_data.rb
-index c665e1d..3533d80 100644
---- a/spec/ruby/core/marshal/fixtures/marshal_data.rb
-+++ b/spec/ruby/core/marshal/fixtures/marshal_data.rb
-@@ -126,21 +126,21 @@ end
- class UserString < String
- end
- 
--require 'openssl'
--
--class UserData < OpenSSL::X509::Name
--  alias _dump_data to_a
--
--  def _load_data entries
--    entries.each do |entry|
--      add_entry(*entry)
--    end
--  end
--end
--
--class UserDataUnloadable < UserData
--  undef _load_data
--end
-+#require 'openssl'
-+#
-+#class UserData < OpenSSL::X509::Name
-+#  alias _dump_data to_a
-+#
-+#  def _load_data entries
-+#    entries.each do |entry|
-+#      add_entry(*entry)
-+#    end
-+#  end
-+#end
-+
-+#class UserDataUnloadable < UserData
-+#  undef _load_data
-+#end
- 
- module Meths
-   def meths_method() end
diff --git a/debian/patches/series b/debian/patches/series
index 6ed794b..2070d07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 0001-Fix-shebang-lines.patch
 0003-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch
 0004-Use-debian-versions-for-plugins-in-pom-test.patch
-0005-Disable-openssl-usage-in-tests.patch
 0006-Allow-rdoc-to-run-without-gems.patch
 #0007-Enable-mri19-test-suite.patch
 0008-Disable-some-failing-user-tests-in-pbuilder.patch
diff --git a/debian/rules b/debian/rules
index d1a474a..ba67639 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,11 +53,22 @@ override_dh_auto_install:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	# setup links to jruby-openssl library, so tests relying on that can work
+	for file in /usr/share/jruby/lib/ruby/shared/*ssl* \
+	/usr/share/jruby/lib/ruby/shared/*org*; do \
+		ln -s $$file ./lib/ruby/shared ; \
+	done
+
 	$(DEB_MAVEN_INVOKE) -Ptest test
 	./bin/jruby spec/mspec/bin/mspec ci
-	# enable it when jruby-openssl and minitest-excludes are available in the archive
+	# enable it when minitest-excludes is available in the archive
 	#./bin/jruby -S ./bin/rake test:mri19
 	#./bin/jruby -S ./bin/rake test:extended
+
+	# remove links to jruby-openssl library
+	for file in ./lib/ruby/shared/*ssl* ./lib/ruby/shared/*org*; do \
+		unlink $$file ; \
+	done
 endif
 
 get-orig-source:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git