[openstack-heat] Updated patches from master-patches

[Jeff Peeler]

commit ea53f469e68de4f427069528544f2f07d61f6b10
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Tue Feb 4 16:18:24 2014 -0500

    Updated patches from master-patches
    
    Fixes incomplete m2crypto patch.
    
    Resolves: rhbz#1060904

 0001-Switch-to-using-M2Crypto.patch                |   19 +++++++++++--------
 0002-remove-pbr-runtime-dependency.patch           |    2 +-
 ...ix-adding-heat_stack_user-role-via-v3-API.patch |    2 +-
 openstack-heat.spec                                |    5 ++++-
 4 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/0001-Switch-to-using-M2Crypto.patch b/0001-Switch-to-using-M2Crypto.patch
index 8933e80..461a422 100644
--- a/0001-Switch-to-using-M2Crypto.patch
+++ b/0001-Switch-to-using-M2Crypto.patch
@@ -1,4 +1,4 @@
-From 5d8d9bf6b2cc27551c5356185f83d1fd23c683ee Mon Sep 17 00:00:00 2001
+From f364f77cf33471c295957450e6f9fc157379a046 Mon Sep 17 00:00:00 2001
 From: Jeff Peeler <jpeeler at redhat.com>
 Date: Wed, 8 May 2013 12:27:35 -0400
 Subject: [PATCH] Switch to using M2Crypto
@@ -6,15 +6,15 @@ Subject: [PATCH] Switch to using M2Crypto
 This patch uses M2Crypto instead of PyCrypto to perform encryption
 and decryption of user authentication information.
 ---
- heat/common/crypt.py | 31 ++++++++++++++-----------------
+ heat/common/crypt.py | 32 ++++++++++++++------------------
  requirements.txt     |  2 +-
- 2 files changed, 15 insertions(+), 18 deletions(-)
+ 2 files changed, 15 insertions(+), 19 deletions(-)
 
 diff --git a/heat/common/crypt.py b/heat/common/crypt.py
-index 8d27617..e8e34a8 100644
+index 8d27617..aa5f7ea 100644
 --- a/heat/common/crypt.py
 +++ b/heat/common/crypt.py
-@@ -14,7 +14,9 @@
+@@ -14,10 +14,11 @@
  #    under the License.
  
  import base64
@@ -24,8 +24,11 @@ index 8d27617..e8e34a8 100644
 +
  from oslo.config import cfg
  
- from heat.openstack.common.crypto import utils
-@@ -35,19 +37,12 @@ logger = logging.getLogger(__name__)
+-from heat.openstack.common.crypto import utils
+ from heat.openstack.common import log as logging
+ 
+ 
+@@ -35,19 +36,12 @@ logger = logging.getLogger(__name__)
  def encrypt(auth_info):
      if auth_info is None:
          return None, None
@@ -51,7 +54,7 @@ index 8d27617..e8e34a8 100644
  
  def heat_decrypt(auth_info):
      """Decrypt function for data that has been encrypted using an older
-@@ -61,7 +56,9 @@ def heat_decrypt(auth_info):
+@@ -61,7 +55,9 @@ def heat_decrypt(auth_info):
      if auth_info is None:
          return None
      auth = base64.b64decode(auth_info)
diff --git a/0002-remove-pbr-runtime-dependency.patch b/0002-remove-pbr-runtime-dependency.patch
index 54534d4..abc6a76 100644
--- a/0002-remove-pbr-runtime-dependency.patch
+++ b/0002-remove-pbr-runtime-dependency.patch
@@ -1,4 +1,4 @@
-From 96e8abc7993af02793383d32cffd30040c470b9f Mon Sep 17 00:00:00 2001
+From a70c771694bccebff9cb84248d815879df2ef8e6 Mon Sep 17 00:00:00 2001
 From: Jeff Peeler <jpeeler at redhat.com>
 Date: Mon, 14 Oct 2013 14:30:34 -0400
 Subject: [PATCH] remove pbr runtime dependency
diff --git a/0003-Fix-adding-heat_stack_user-role-via-v3-API.patch b/0003-Fix-adding-heat_stack_user-role-via-v3-API.patch
index bb5f2d2..9862644 100644
--- a/0003-Fix-adding-heat_stack_user-role-via-v3-API.patch
+++ b/0003-Fix-adding-heat_stack_user-role-via-v3-API.patch
@@ -1,4 +1,4 @@
-From 8b896336c97424d34503164aa4cbc569f464bd4f Mon Sep 17 00:00:00 2001
+From 77371dcdebf2fb116f286ac1db21ef24d28c50f5 Mon Sep 17 00:00:00 2001
 From: Steven Hardy <shardy at redhat.com>
 Date: Tue, 21 Jan 2014 14:51:16 +0000
 Subject: [PATCH] Fix adding heat_stack_user role via v3 API
diff --git a/openstack-heat.spec b/openstack-heat.spec
index 0a1312d..72aad90 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -8,7 +8,7 @@
 Name:		openstack-heat
 Summary:	OpenStack Orchestration (heat)
 Version:	2014.1
-Release:	0.4.%{release_letter}%{milestone}%{?dist}
+Release:	0.5.%{release_letter}%{milestone}%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		http://www.openstack.org
@@ -360,6 +360,9 @@ AWS CloudWatch-compatible API to the Heat Engine
 
 
 %changelog
+* Tue Feb  4 2014 Jeff Peeler <jpeeler at redhat.com> - 2014.1-0.5.b2
+- fix heat-manage (rhbz 1060904)
+
 * Mon Jan 27 2014 Jeff Peeler <jpeeler at redhat.com> - 2014.1-0.4.b2
 - update to icehouse-2