summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/ruby/net-ssh-multi/gemspec-don-t-force-the-use-of-gem-private_key.pem.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/ruby/net-ssh-multi/gemspec-don-t-force-the-use-of-gem-private_key.pem.patch')
-rw-r--r--meta-openstack/recipes-devtools/ruby/net-ssh-multi/gemspec-don-t-force-the-use-of-gem-private_key.pem.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/meta-openstack/recipes-devtools/ruby/net-ssh-multi/gemspec-don-t-force-the-use-of-gem-private_key.pem.patch b/meta-openstack/recipes-devtools/ruby/net-ssh-multi/gemspec-don-t-force-the-use-of-gem-private_key.pem.patch
index db78b05..ece0465 100644
--- a/meta-openstack/recipes-devtools/ruby/net-ssh-multi/gemspec-don-t-force-the-use-of-gem-private_key.pem.patch
+++ b/meta-openstack/recipes-devtools/ruby/net-ssh-multi/gemspec-don-t-force-the-use-of-gem-private_key.pem.patch
@@ -1,6 +1,6 @@
1From 2c32d889b64510e1547fa85407beb65c2c3ee89a Mon Sep 17 00:00:00 2001 1From f9bade1e428b924de09228acbd6545ffb3c9c04c Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com> 2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Wed, 14 May 2014 09:21:45 -0400 3Date: Mon, 20 Jul 2015 22:24:10 +0900
4Subject: [PATCH] gemspec: don't force the use of gem-private_key.pem 4Subject: [PATCH] gemspec: don't force the use of gem-private_key.pem
5 5
6This will have security implications but it doesn't affect 6This will have security implications but it doesn't affect
@@ -8,18 +8,19 @@ core functionality and allows the build to complete when
8this certificate is not available. 8this certificate is not available.
9 9
10Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> 10Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
11Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
11--- 12---
12 net-ssh-multi.gemspec | 4 +++- 13 net-ssh-multi.gemspec | 4 +++-
13 1 file changed, 3 insertions(+), 1 deletion(-) 14 1 file changed, 3 insertions(+), 1 deletion(-)
14 15
15diff --git a/net-ssh-multi.gemspec b/net-ssh-multi.gemspec 16diff --git a/net-ssh-multi.gemspec b/net-ssh-multi.gemspec
16index 2232ad1..f595779 100644 17index 5b3bbe7..f499739 100644
17--- a/net-ssh-multi.gemspec 18--- a/net-ssh-multi.gemspec
18+++ b/net-ssh-multi.gemspec 19+++ b/net-ssh-multi.gemspec
19@@ -48,7 +48,9 @@ Gem::Specification.new do |s| 20@@ -48,7 +48,9 @@ Gem::Specification.new do |s|
20 s.require_paths = ["lib"] 21 s.require_paths = ["lib"]
21 s.rubyforge_project = "net-ssh-multi" 22 s.rubyforge_project = "net-ssh-multi"
22 s.rubygems_version = "1.8.25" 23 s.rubygems_version = "1.8.23"
23- s.signing_key = "/mnt/gem/gem-private_key.pem" 24- s.signing_key = "/mnt/gem/gem-private_key.pem"
24+ if File.exists?("/mnt/gem/gem-private_key.pem") 25+ if File.exists?("/mnt/gem/gem-private_key.pem")
25+ s.signing_key = "/mnt/gem/gem-private_key.pem" 26+ s.signing_key = "/mnt/gem/gem-private_key.pem"
@@ -28,5 +29,5 @@ index 2232ad1..f595779 100644
28 29
29 if s.respond_to? :specification_version then 30 if s.respond_to? :specification_version then
30-- 31--
311.8.3.2 321.8.4.2
32 33