update to latest openstack glance releases 2012.2.4 and 2013.1.1

for realz yo

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 25 insertions, 52 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/Manifest b/app-admin/glance/Manifest
index 8b57e0e98c86..52dc3678942c 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,30 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX glance-folsom-3-CVE-2013-1840.patch 1069 SHA256 a6379989a860975b07cf34e7cfaa0bb10e7c578dea706a004b834b1eca85c15b SHA512 b49dc9403c40ccc7d3629159cad78fa75bf242823c7bbb4557ed1d7c091a582d91fb6f8681f9ae1203c6ec2fa40d61deb3865dc1981c41ec0b37c3d298d7f04f WHIRLPOOL 85784f4bc323402ed75f3253b0c9051380aa419ecb02a92703226b18c8621e403d3fb3f5cce775bf6ea03ca6ac4cea1dc5f8484dbc443124df6612fce8012029
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
 AUX glance.initd 1206 SHA256 23c091ad32832b9a522518676427a2f98bc7dfa826c0bb67a0f9befaa615cafe SHA512 cd0a13ee2a7134cb2917cf2d5579f63c88a6d04769a1370ef5bdc1cfd8ebe7ad2986c501b976ae9752688c177c7a71457bae79cd3e89f84dbf9d5ac259f4099a WHIRLPOOL e59dd3a7a11b3bd74abfbc5e29bc84ce4ff3381ae411359d0d097e3123487d2eded8aefbc54f0a7feae06ecea0861e16a1cb0bd7fcb467a7c714e9c65afb7dd1
-DIST glance-2012.2.3.tar.gz 638592 SHA256 9431c6cc0d95eb75994b9cd63c9d2c7829edc158f091ca0b0e9208d657183eec SHA512 1df5e9ccba5d1ae2c6ea1fe13dbc867af49ff15ea732f9a6c051dc723a94656c9f312a00e23a84fb44ab50477e65437060b5cbf818b4690cd1f431fa287bb01f WHIRLPOOL 0742259a9b6a9ac6d78b699aae48a7b962482daa0cb414f48c371d4f29bbd8e8ac45858c4dce080f9766b614f612837c831ce6158168d04760fadf7b663d7748
+DIST glance-2012.2.4.tar.gz 643408 SHA256 d50fa522e890258eff32aad1947684abdf0cf0c67a8a487f60a7179a84edd3f2 SHA512 fc91d799fa5fd2c66aef228d622c852623e70fa83e5babdeb10e041f77571e5a08c90c6fca16943dc98ca1cd50a09314fc5bd282e5530e7e1e44a623eee28198 WHIRLPOOL 34fdfab54444845ed4a3c0e849066f01ef88cf4317d952a0fedf562f331a41c87572d80234296651a722770929472de9263f7ded37deaaf6d65f35723e41031c
 DIST glance-2013.1.tar.gz 716226 SHA256 f4deee125ee6729daee5315c6aacd9e265c3015692a62ae6aefeadbd3fef7f70 SHA512 9dc8c99b2c26e8b260e94d020fb4401c123c2360c0ad1f616e994b0a562898030d22cb0c0020531132cad5b51beaebc68cc70aaf87d2814498b1dbd58fbd3931 WHIRLPOOL 1899eeb00c02f3f353a7720e2d17f7dd5873909d2a214b250d7325c82ae2d610e5432caeb603ddaabe2178552964650b3b98489fc74bd0136e9e9438a26d9bb7
-EBUILD glance-2012.2.3-r2.ebuild 2236 SHA256 5026555a6ceaaa80029803e7759b772f4c68f8c26f80172674c909b6f3a35f3a SHA512 28e766c95be486178e8455a4e1ca5a28c9d673dab2d806c21d8e9f4c7740c22de54fa46190e8731c0a2438c5af2884078bdda06616680d1ad721f76c9caa9bde WHIRLPOOL 981a45893af893cbd9693187661ac93509bd976ddf30b1028178360203dd4309bb063d026564889aadc2ef8e63b616da9972925de7c9100dd3c74dfc8f2dc752
+EBUILD glance-2012.2.4.ebuild 2180 SHA256 0d705777b404eaf635835648471b155e0098a37a673d30b7a8a7da3333f5bde3 SHA512 74200491b1adbb3dece2eb401c4624074fd9d965c9235732c551c6b51fb804f6381af62669d781ee35ffc947b108b2218a38165ef21fdcfc2e77815515c8c183 WHIRLPOOL a9fbbdb4b3a122e0d56f155ea16827b28edd61e2f10e64307b5143d331c68e6e7943e4663ab37fa97616ea55bbac07772db3bcaa50337fdcf46acf8c8c2f75c4
 EBUILD glance-2013.1.ebuild 2444 SHA256 2d00b6096cb0a118bb7859b975a826558e5652692e92c0cb2ed6867eb2171771 SHA512 907b07a9731a4508db18d864c420810e2bc7ff2f3eb1cd2e75736022afdd8205ecb6a17c13486c1d607d1a7f4c346adc83f5ab3ac0b132b007454ff5d74c5010 WHIRLPOOL 538084fa8ce3c6da14c2b630a7558b67d4ae4011bda4a45327bc8debadb9bf9a5e44611bcccbffaf3fbda4db48b6adc5241a95d17b9c842ea7fbeb7203e90749
 EBUILD glance-9999.ebuild 2407 SHA256 554e8efefd7ef9b86422810a054d38a275ed88a41875a6a20725e157d5dd9e32 SHA512 221eaff137650344f7077496cce86e9fc8fe803bdd35a3902ea77afee41fce7b067c5cae821f92528a6f3047d4cd42a0441030a7dba223adc1fb877cb4549ad0 WHIRLPOOL d27f6c0bd535f8164d47b63b34454b41980413ddc61b3e541fa2c08e68506883c491c6aacf9fd5340d664470fc0e2ea61c7a9d947753ff62d9b1ed3e63599621
-MISC ChangeLog 1379 SHA256 a91f78504714baa107d4ae2fdfcc6bf176a120ffc969697552f419001b943fbc SHA512 415b606a0c14b8454f35351eb0a9942ea05f77a843b6d11e017bb401f03c3a708fa1490ccd332e651ddd784b5b49edd5005de9a214c5aa1272617bbbf64f927c WHIRLPOOL 0b6edd77b31d4184ad81ab94e33b1ddbe3d6319b9035e6bcdd47713c7dbcb5d0c1411ab5e183aa115d4859c614474247ca05522f10078a45337d046755efe9b7
+MISC ChangeLog 1695 SHA256 dddf2a419703ab571aee9e9e1df26d67c178995ca57f0e405e4dc76d7e9326e7 SHA512 72387ff301d2dd34de2773eac6ae2c104f7c7b8610301c77316675fde071605881a799041663c50cada44b9fa4266f5234593975d253c99d29c5cbb41261def7 WHIRLPOOL 99d0ab59a216e8008b172a673ec7cdbd00417f2d5175a75e9a52dd4d7c142ea1a0823167be91e70c107e706b37721501efda5bbc768c0d447bbcb8875f63843e
 MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRZmWIAAoJECRx6z5ArFrDu/8P/1PNJh/BNDBqGFT5QKS/7vU4
-1O4x37Pjec0R5bBGOG+r2iHqm99jhyfjx8BiPlrBU1CY4KQC/FC1zrbE/w6ms8z1
-sn7y3wArAn/j9ypr5GtRYLzKV70rSxqRPahZY/+DFlsdS5PU07pi9txT4MppQ1Lf
-9xoSXpqH88zsN0dVsaE9FpdgP271JhmxF0ueEEHHMYsYOwRijuC7s1gZCTis3H6S
-FhZR1hprAdrK2qwHPwB2ekQmkrqWQ1KyiFNNdWo/7ur4ZlqYoUmz2VjLarBRaht+
-bxFqbW3W6iYlTi1D9EEiqVwCzd4Lux/0xQwcPWVg2++66tAwjPbk0Z0B42x9PzYS
-P1SwWwL6zw9npmnzy72K2+PHTQGvHjUPafBflCVQEeA8MXE5iOdBcxbbugQVo/R4
-B3McWr5wjxRqFu2x23roDs2QKuzVdmgk4kRZMmZuEBCNkpkiqUFFJoyTMfHx72Qt
-F+8BtxvNRNou+hlQA8EJiU4K0pTgY3nRwwsNBCNfbQftDzzix4IV/Z/+i+6jE/vN
-8TbJ2hV5ZzhGwcukwIhUZAtbuOcd/A4YumxKA/x6qZUOtsuOxjq/jbAwZ4bwPnrc
-OOqUbd142AhTFORv/bAMBOK4x78yqlq9go19U0T2wT9NEKeOi88crITPlf4ZLiJG
-cjWXot4i4/G3o24WSusk
-=1QSf
+iQIcBAEBCAAGBQJRjGI8AAoJECRx6z5ArFrD6tsP/0f8Is8LrwXIjgjCL0O3Dy6h
+x9Bu0kXyql0vmkfA5SeiF3d7Oq8decwx9hDGRsJoJnu2indWdJiijXEejF3jBmL/
+wXiruLvNUBOLjSkNokbCwuD3wn9R6UO1ncAOTVwaXh2fEbnZrok3TviCNyPcGrSi
+S+OoeGgYgBtKrjJAT0GSgxc1CGH2Lce/VGOVLUH9u09a7LXmSbJnNw84gfszDpQk
+NIgbOKTYSdSxmC8DWv+F6wWknm7ibsjnigETjEpeYgwXCZ+v+10+jLhHtK6cK2Jx
+r9ZDmHViYlg8kGdRG44Bb4OrugBNuTWcN5PLulsU08pPTlBIXqRKvl6l2LfGYvvh
+qJF+1jbybQab/oznQnKuTyootxAjksiyNCa8GFhEh2JLsHNrGRAwKtU3bR4pp1qD
+6PYu0bCy8tjtz7diYtYDuyWe8DA8tLwQ8pmh5VSQ3qPwtvot24qfHFGVQUN7J3o5
+tuia6sHOtWpGTZ4pfcp66gSEr94YyqEcFzOjq6vns+1b9q+pV6FcuQTCuFk46HG2
+7kcaFSPJsj2GyRowKzSs/SZwYej9uosgUNEw/vCLCyvaZbuLHFZ2DoFHreGjdWpj
+tTYdBpUjjPgKGNlUojvlJ4+Blnq1tzlEp9l6E7A8rN9cSS0OyiiSafrBo+UuRjx3
+zvaF1PWHrsFSTIMxccvk
+=0/pX
 -----END PGP SIGNATURE-----
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() {