[openstack-nova/f18] Updated to Folsom stable release 2 (fixes CVE-2012-5625)

[Pádraig Brady]

commit 9d10981bef10f6a6f1f47904a56de9ebdffa9def
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Dec 14 16:44:23 2012 +0000

    Updated to Folsom stable release 2 (fixes CVE-2012-5625)

 .gitignore                                         |    1 +
 ...e-don-t-access-the-net-when-building-docs.patch |    6 ++--
 0002-Fix-rpc-control_exchange-regression.patch     |   34 --------------------
 openstack-nova.spec                                |   11 +++---
 sources                                            |    2 +-
 5 files changed, 11 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7401162..f45e596 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /nova-2012.2~rc1.tar.gz
 /nova-2012.2.tar.gz
 /nova-2012.2.1.tar.gz
+/nova-2012.2.2.tar.gz
diff --git a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
index d0774ba..e57f2b3 100644
--- a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,4 +1,4 @@
-From 6df77db42621ceeae2e9f164416f959b49c89f63 Mon Sep 17 00:00:00 2001
+From 52b355a7622a2d4d5e4d8554edaa77866ab2fdff Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Fri, 6 Jan 2012 12:16:34 +0000
 Subject: [PATCH] Ensure we don't access the net when building docs
@@ -7,8 +7,8 @@ Subject: [PATCH] Ensure we don't access the net when building docs
 
 Change-Id: I9d02fb4053a8106672aded1614a2850e21603eb2
 ---
- doc/source/conf.py | 1 -
- 1 file changed, 1 deletion(-)
+ doc/source/conf.py |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
 index 7f77cc5..62b273e 100644
diff --git a/openstack-nova.spec b/openstack-nova.spec
index dba63a3..a732fd7 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -1,8 +1,8 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:             openstack-nova
-Version:          2012.2.1
-Release:          3%{?dist}
+Version:          2012.2.2
+Release:          1%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -32,10 +32,9 @@ Source22:         nova-ifc-template
 Source24:         nova-sudoers
 
 #
-# patches_base=2012.2.1
+# patches_base=2012.2.2
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-Patch0002: 0002-Fix-rpc-control_exchange-regression.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -339,7 +338,6 @@ This package contains documentation files for nova.
 %setup -q -n nova-%{version}
 
 %patch0001 -p1
-%patch0002 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -744,6 +742,9 @@ fi
 %endif
 
 %changelog
+* Fri Dec 14 2012 Pádraig Brady <pbrady at redhat.com> - 2012.2.2-1
+- Update to folsom stable release 2 (fixes CVE-2012-5625)
+
 * Thu Dec 06 2012 Nikola Đipanov <ndipanov at redhat.com> - 2012.2.1-3
 - signing_dir renamed from incorrect signing_dirname in default nova.conf
 
diff --git a/sources b/sources
index 5ebe885..d81b807 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02a96d9bda05e03e8ac9bcef27e27f20  nova-2012.2.1.tar.gz
+2d57c953a6a17bbfe294870c343ffba2  nova-2012.2.2.tar.gz