[DRE-commits] [rubygems-integration] 01/02: Use SSL certs from ca-certificates

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository rubygems-integration.

commit c1696e664c6d1736b8595e384cc8c3595bc544f2
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Fri Sep 5 02:37:20 2014 +0200

    Use SSL certs from ca-certificates
---
 debian/changelog                          | 5 +++++
 debian/control                            | 2 +-
 lib/rubygems/defaults/operating_system.rb | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f188047..527c4d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 rubygems-integration (1.8) UNRELEASED; urgency=medium
 
+  [ Antonio Terceiro ]
   * Improve smoke tests in debian/tests/package-list.
     .
     Test a gem that comes together with the interpreter, one arch:all and one
     arch:any
 
+  [ Christian Hofstaedtler ]
+  * Advise rubygems to load SSL certificates from the ca-certificates
+    provided list. (Closes: #689074)
+
  -- Antonio Terceiro <terceiro at debian.org>  Wed, 30 Apr 2014 11:11:12 -0300
 
 rubygems-integration (1.7) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index ca78a75..9f8fb3b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ XS-Testsuite: autopkgtest
 
 Package: rubygems-integration
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ca-certificates
 Suggests: bundler
 Multi-Arch: foreign
 Description: integration of Debian Ruby packages with Rubygems
diff --git a/lib/rubygems/defaults/operating_system.rb b/lib/rubygems/defaults/operating_system.rb
index b443c85..799a220 100644
--- a/lib/rubygems/defaults/operating_system.rb
+++ b/lib/rubygems/defaults/operating_system.rb
@@ -1,6 +1,9 @@
 unless ENV['DEBIAN_DISABLE_RUBYGEMS_INTEGRATION']
 
 class << Gem
+  OPERATING_SYSTEM_DEFAULTS = {
+    :ssl_ca_cert => '/etc/ssl/certs/ca-certificates.crt'
+  }
 
   alias :upstream_default_dir :default_dir
   def default_dir

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rubygems-integration.git