aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi xin <lixin.fnst@cn.fujitsu.com>2015-07-27 10:31:00 +0800
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-07-27 09:56:53 -0400
commit4bf0559c6adc50141d352a2a64d1ca3edb508d20 (patch)
treed939dd88f718abd6146bde9d170ab6673f02dcc8
parentacbb0155a163a4b7ca2aed557a3a860d27a22c5f (diff)
downloadmeta-cloud-services-4bf0559c6adc50141d352a2a64d1ca3edb508d20.tar.gz
meta-cloud-services-4bf0559c6adc50141d352a2a64d1ca3edb508d20.tar.bz2
meta-cloud-services-4bf0559c6adc50141d352a2a64d1ca3edb508d20.zip
net-ssh-multi: upgrade 1.2.0 -> 1.2.1
update gemspec-don-t-force-the-use-of-gem-private_key.pem.patch, since net-ssh-multi.gemspec content has been changed. Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack/recipes-devtools/ruby/net-ssh-multi/gemspec-don-t-force-the-use-of-gem-private_key.pem.patch13
-rw-r--r--meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb4
2 files changed, 9 insertions, 8 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 @@
-From 2c32d889b64510e1547fa85407beb65c2c3ee89a Mon Sep 17 00:00:00 2001
-From: Mark Asselstine <mark.asselstine@windriver.com>
-Date: Wed, 14 May 2014 09:21:45 -0400
+From f9bade1e428b924de09228acbd6545ffb3c9c04c Mon Sep 17 00:00:00 2001
+From: Li xin <lixin.fnst@cn.fujitsu.com>
+Date: Mon, 20 Jul 2015 22:24:10 +0900
Subject: [PATCH] gemspec: don't force the use of gem-private_key.pem
This will have security implications but it doesn't affect
@@ -8,18 +8,19 @@ core functionality and allows the build to complete when
this certificate is not available.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
+Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
---
net-ssh-multi.gemspec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net-ssh-multi.gemspec b/net-ssh-multi.gemspec
-index 2232ad1..f595779 100644
+index 5b3bbe7..f499739 100644
--- a/net-ssh-multi.gemspec
+++ b/net-ssh-multi.gemspec
@@ -48,7 +48,9 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]
s.rubyforge_project = "net-ssh-multi"
- s.rubygems_version = "1.8.25"
+ s.rubygems_version = "1.8.23"
- s.signing_key = "/mnt/gem/gem-private_key.pem"
+ if File.exists?("/mnt/gem/gem-private_key.pem")
+ s.signing_key = "/mnt/gem/gem-private_key.pem"
@@ -28,5 +29,5 @@ index 2232ad1..f595779 100644
if s.respond_to? :specification_version then
--
-1.8.3.2
+1.8.4.2
diff --git a/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb b/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb
index 86f2807..7da0566 100644
--- a/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb
@@ -13,9 +13,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6c99c0cc0901fbc3607fe997f9898d69"
PR = "r0"
-BPV = "1.2.0"
+BPV = "1.2.1"
PV = "${BPV}"
-SRCREV = "b659f2884b2c9abdbe3bbf3c844937a0799ed5ac"
+SRCREV = "5b668d5ef34102c9ac159a8f21c889fdc7f99f1b"
S = "${WORKDIR}/git"