[DRE-commits] [ruby-aws-sdk] 04/08: Add patches to fix some hardcoded paths

[David Suárez]

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

deiv-guest pushed a commit to branch master
in repository ruby-aws-sdk.

commit bf6df02db0ce823d448991b6832ce6c20ae5b7cb
Author: David Suárez <david.sephirot at gmail.com>
Date:   Sun Jun 15 21:44:06 2014 +0200

    Add patches to fix some hardcoded paths
    
     - 'use-correct-path-for-autoload'
     - 'use-correct-path-for-bundled-certificate'
---
 debian/patches/series                                 |  2 ++
 debian/patches/use-correct-path-for-autoload          | 19 +++++++++++++++++++
 .../patches/use-correct-path-for-bundled-certificate  | 16 ++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..244817f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+use-correct-path-for-autoload
+use-correct-path-for-bundled-certificate
diff --git a/debian/patches/use-correct-path-for-autoload b/debian/patches/use-correct-path-for-autoload
new file mode 100644
index 0000000..9a69190
--- /dev/null
+++ b/debian/patches/use-correct-path-for-autoload
@@ -0,0 +1,19 @@
+Description: Use the correct path to autoload libs
+
+Author: David Suárez <david.sephirot at gmail.com>
+Last-Update: 2014-06-15
+
+--- a/lib/aws/core.rb
++++ b/lib/aws/core.rb
+@@ -147,9 +147,9 @@ module AWS
+   ].inject({}) { |h,svc| h[svc.class_name] = svc; h }
+ 
+   # @api private
+-  ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
++  ROOT = File.expand_path(File.join(File.dirname(__FILE__))) #, '..', '..'))
+ 
+-  SRC = ROOT + '/lib/aws'
++  SRC = ROOT #+ '/vendor_ruby/aws'
+ 
+   autoload :Errors, "#{SRC}/errors"
+   autoload :Record, "#{SRC}/record"
diff --git a/debian/patches/use-correct-path-for-bundled-certificate b/debian/patches/use-correct-path-for-bundled-certificate
new file mode 100644
index 0000000..444f502
--- /dev/null
+++ b/debian/patches/use-correct-path-for-bundled-certificate
@@ -0,0 +1,16 @@
+Description: Use the correct path to load the blunded certificate
+
+Author: David Suárez <david.sephirot at gmail.com>
+Last-Update: 2014-06-15
+
+--- ruby-aws-sdk-1.43.2.orig/lib/aws/core/configuration.rb
++++ ruby-aws-sdk-1.43.2/lib/aws/core/configuration.rb
+@@ -525,7 +525,7 @@ module AWS
+       add_option :ssl_verify_peer, true, :boolean => true
+ 
+       add_option :ssl_ca_file,
+-        File.expand_path(File.dirname(__FILE__) + "/../../../ca-bundle.crt")
++        File.expand_path(File.dirname(__FILE__) + "/../ca-bundle.crt")
+ 
+       add_option :ssl_ca_path
+ 

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