[DRE-commits] [SCM] ruby-excon.git branch, master, updated. debian/0.13.4-1-8-g7e8f880

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit 469b42288b4b4b796e79abcb454ced2415acde20
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu May 16 20:55:24 2013 +0530

    refresh patch

diff --git a/debian/patches/01_use_ca-certificates.patch b/debian/patches/01_use_ca-certificates.patch
index 4bd4c76..de3685f 100644
--- a/debian/patches/01_use_ca-certificates.patch
+++ b/debian/patches/01_use_ca-certificates.patch
@@ -1,15 +1,16 @@
 Description: Use SSL certificates from ca-certificates package
 Author: Laurent Bigonville <bigon at debian.org>
 Forwarded: not-needed
+Last-Updated: 2013-05-16
 
 --- a/lib/excon/constants.rb
 +++ b/lib/excon/constants.rb
-@@ -12,7 +12,7 @@
-   end
+@@ -2,7 +2,7 @@
  
-   unless const_defined?(:DEFAULT_CA_FILE)
--    DEFAULT_CA_FILE = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "data", "cacert.pem"))
-+    DEFAULT_CA_FILE = '/etc/ssl/certs/ca-certificates.crt'
-   end
+   CR_NL = "\r\n"
+ 
+-  DEFAULT_CA_FILE = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "data", "cacert.pem"))
++  DEFAULT_CA_FILE = '/etc/ssl/certs/ca-certificates.crt'
+ 
+   DEFAULT_CHUNK_SIZE = 1048576 # 1 megabyte
  
-   unless const_defined?(:DEFAULT_RETRY_LIMIT)

-- 
ruby-excon.git