[eucalyptus/f18] Update to 3.2.2 (CVE-2012-4067, CVE-2013-2296)

[Andy Grimm]

commit 080cccc95989e1ca98f0ed828b95b19ba3490309
Author: Andy Grimm <agrimm at gmail.com>
Date:   Tue Apr 16 16:40:03 2013 -0400

    Update to 3.2.2 (CVE-2012-4067, CVE-2013-2296)

 .gitignore                 |    2 +
 eucalyptus-EUCA-5306.patch |  105 --------------------------------------------
 eucalyptus.spec            |   24 +++++-----
 sources                    |    4 +-
 4 files changed, 16 insertions(+), 119 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 710f3b2..e25f260 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 /eucalyptus-3.2.0git5ab72572-generated.tgz
 /eucalyptus-3.2.1-generated.tgz
 /eucalyptus-3.2.1.tar.gz
+/eucalyptus-3.2.2.tar.gz
+/eucalyptus-3.2.2-generated.tgz
diff --git a/eucalyptus.spec b/eucalyptus.spec
index 601bc26..5d6305b 100644
--- a/eucalyptus.spec
+++ b/eucalyptus.spec
@@ -4,7 +4,8 @@
 %global eucadatadir       %{_datadir}/%{name}
 %global eucajavalibdir    %{_datadir}/%{name}
 %global helperdir         %{_datadir}/%{name}
-# %global gittag            5ab72572
+# %global gittag            546b6288
+%global tar_suffix        ""
 %global with_axis2v14     0
 %global _hardened_build   1
 %global __provides_exclude_from ^%{_libdir}/%{name}/.*.so$
@@ -13,8 +14,8 @@
 
 Summary:       Elastic Utility Computing Architecture
 Name:          eucalyptus
-Version:       3.2.1
-Release:       2%{?dist}
+Version:       3.2.2
+Release:       1%{?dist}
 License:       GPLv3 and (GPLv3 and ASL 2.0) and (GPLv3 and BSD)
 URL:           http://www.eucalyptus.com
 Group:         Applications/System
@@ -109,7 +110,7 @@ Requires(pre):  %{_sbindir}/groupadd
 Requires(pre):  %{_sbindir}/useradd
 Requires(post): %{_sbindir}/euca_conf
 
-Source0:       http://downloads.eucalyptus.com/releases/eucalyptus/3.2/source/eucalyptus-3.2.1.tar.gz
+Source0:       http://downloads.eucalyptus.com/software/eucalyptus/3.2/source/eucalyptus-3.2.2.tar.gz
 # A version of WSDL2C.sh that respects standard classpaths
 Source1:       euca-WSDL2C.sh
 Source2:       eucalyptus-jarlinks.txt
@@ -208,12 +209,6 @@ Patch27:       eucalyptus-bad-tgt-check.patch
 # https://eucalyptus.atlassian.net/browse/EUCA-4400
 Patch28:       eucalyptus-unlink-mod_rampart.patch
 
-# cert validation in boto 2.6.0 breaks the user console,
-# since the CLC has a self-signed cert.  There's some other
-# required patching for this boto version, too.
-# https://eucalyptus.atlassian.net/browse/EUCA-5306
-Patch29:       eucalyptus-EUCA-5306.patch
-
 %description
 Eucalyptus is a service overlay that implements elastic computing
 using existing resources. The goal of Eucalyptus is to allow sites
@@ -525,14 +520,13 @@ touch gatherlog/generated/stubs cluster/generated/stubs node/generated/stubs
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
-%patch29 -p1
 
 # remove classes which depend on junit
 # This is because junit on Fedora bundles hamcrest 1.1, which has conflicts
 # with hamcrest 1.2.  And regardless, these should not be bundled into our
 # production jars.
 pushd clc/modules
-rm core/src/main/java/edu/ucsb/eucalyptus/util/XMLParserTest.java
+# rm core/src/main/java/edu/ucsb/eucalyptus/util/XMLParserTest.java
 rm dns/src/main/java/com/eucalyptus/cloud/ws/tests/DNSControlTest.java
 rm dns/src/main/java/com/eucalyptus/cloud/ws/tests/RemoveARecordTest.java
 rm storage-controller/src/main/java/edu/ucsb/eucalyptus/cloud/ws/tests/CreateVolumeFromSnapshotTest.java
@@ -609,6 +603,9 @@ do
   ln -s $x clc/lib/;
 done
 
+# Don't bother with git since we're using Fedora's deps
+touch clc/.nogit
+
 # FIXME: storage/Makefile breaks with parallel make
 make # %{?_smp_mflags}
 pushd clc/eucadmin
@@ -1060,6 +1057,9 @@ if [ "$1" = "0" ]; then
 fi
 
 %changelog
+* Mon Mar 25 2013 Andy Grimm <agrimm at gmail.com> - 3.2.2-1
+- Update to 3.2.2 (CVE-2012-4067, CVE-2013-2296)
+
 * Tue Mar  5 2013 Andy Grimm <agrimm at gmail.com> - 3.2.1-2
 - Fix eucalyptus-console systemd unit name (RHBZ#917434)
 - Generate SSL certs for eucalyptus-console (RHBZ#917433)
diff --git a/sources b/sources
index dc8106d..c7b6121 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e3ad719b64c7b098e86fe933440a20e7  eucalyptus-3.2.1.tar.gz
-9198e120092fee702f9642fb7163b0f8  eucalyptus-3.2.1-generated.tgz
+64b0caa45e717644ab116ebe88cc58a3  eucalyptus-3.2.2.tar.gz
+9f868eecd25ac1110f094b7bdb1ea4a5  eucalyptus-3.2.2-generated.tgz