update to latest openstack glance releases 2012.2.4 and 2013.1.1

for realz yo

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

3 files changed, 9 insertions, 35 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index a8d7fb94fa49..d7eced017fad 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/glance
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.6 2013/04/11 07:25:24 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.7 2013/05/10 02:57:06 prometheanfire Exp $
+
+*glance-2012.2.4 (10 May 2013)
+
+  10 May 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +glance-2012.2.4.ebuild, -files/glance-folsom-3-CVE-2013-1840.patch,
+  -glance-2012.2.3-r2.ebuild, -glance-2013.1.ebuild, glance-2013.1.ebuild:
+  update to latest openstack glance releases 2012.2.4 and 2013.1.1 for realz yo
 
   11 Apr 2013; Matthew Thode <prometheanfire@gentoo.org> glance-9999.ebuild:
   updating glance 9999 deps
diff --git a/app-admin/glance/files/glance-folsom-3-CVE-2013-1840.patch b/app-admin/glance/files/glance-folsom-3-CVE-2013-1840.patch
deleted file mode 100644
index 3299442cb0de..000000000000
--- a/app-admin/glance/files/glance-folsom-3-CVE-2013-1840.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dd849a9be540bedd4fd904cc0b86ccd9c3e34af2 Mon Sep 17 00:00:00 2001
-From: Stuart McLaren <stuart.mclaren@hp.com>
-Date: Thu, 14 Mar 2013 13:43:36 +0000
-Subject: [PATCH] Do not return location in headers
-
-In some cases credentials were being leaked when downloading a cached
-v1 image.
-
-Fixes bug 1135541, CVE-2013-1840
-
-Change-Id: I3ec0a8f484fe1bdc32c3c56fce810fcef347a7f6
----
- glance/api/middleware/cache.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/glance/api/middleware/cache.py b/glance/api/middleware/cache.py
-index 8e24ef0..dcd59b6 100644
---- a/glance/api/middleware/cache.py
-+++ b/glance/api/middleware/cache.py
-@@ -111,6 +111,9 @@ class CacheFilter(wsgi.Middleware):
- 
-     def _process_v1_request(self, request, image_id, image_iterator):
-         image_meta = registry.get_image_metadata(request.context, image_id)
-+        # Don't display location
-+        if 'location' in image_meta:
-+            del image_meta['location']
- 
-         if not image_meta['size']:
-             # override image size metadata with the actual cached
--- 
-1.8.1.5
-
diff --git a/app-admin/glance/glance-2012.2.3-r2.ebuild b/app-admin/glance/glance-2012.2.4.ebuild
index fbaf38b32ce9..1a257ad8c92e 100644
--- a/app-admin/glance/glance-2012.2.3-r2.ebuild
+++ b/app-admin/glance/glance-2012.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2012.2.3-r2.ebuild,v 1.1 2013/03/26 04:49:53 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2012.2.4.ebuild,v 1.1 2013/05/10 02:57:06 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -48,7 +48,6 @@ RDEPEND="${DEPEND}
 	ldap? ( dev-python/python-ldap )"
 
 PATCHES=(
-			"${FILESDIR}/glance-folsom-3-CVE-2013-1840.patch"
 )
 
 python_install() {