update for CVE-2013-2096

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

6 files changed, 154 insertions, 659 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index af13d2e11ea1..f889d7a7ab01 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/nova
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.44 2013/12/13 21:10:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.45 2013/12/19 03:18:19 prometheanfire Exp $
+
+*nova-2013.2.1 (19 Dec 2013)
+
+  19 Dec 2013; Matthew Thode <prometheanfire@gentoo.org> +nova-2013.2.1.ebuild,
+  -files/CVE-2013-4463_4469-havana.patch, -files/CVE-2013-6419_2013.2.patch,
+  nova-2013.2.9999.ebuild:
+  update for CVE-2013-2096
 
 *nova-2013.2-r3 (13 Dec 2013)
 *nova-2013.1.4-r2 (13 Dec 2013)
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index a8bddc325d59..85cccb78e0d7 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -2,37 +2,37 @@
 Hash: SHA256
 
 AUX CVE-2013-4463_4469-grizzly.patch 19603 SHA256 72abd5f11fa8bf4c5900d4beef411158a609590e33ce8ad2022cf44a4fd49a83 SHA512 0bad8afecfd985d84919db83a2687cd5332927b323d8836a67dc129af42430b46b39abb83783ba087fb953bf295961a770d56917e9e56ae19cf1abf0c2b58adf WHIRLPOOL 9bdedc9eeebd5a3ec1ab8f90dcb963e830f4523cbd39d1f37706ffc28f8775d450be23b4ecf71ddcbf41a5352bc5f737b7e37df23b16f191fdbc3279df7ee50f
-AUX CVE-2013-4463_4469-havana.patch 20808 SHA256 2407de89451cefb46a4b156516bdf71bd5f324962fc4ea0f63a96752846f8885 SHA512 18622589bd383e27162b97c5f4ab854957981a63b6bb6e74a44765ca5e014e3f3061fb04f08cd12288a01e88eee2ed346d594db8c04e7e078aaed93d9593bdd8 WHIRLPOOL 27cf1c5543e8d30a3a7d6769133a7a1bc001f0201d752adc2089ea28b4b73fb2590df3edcc1326f11c2a333063c397e4f3dc2546d457203a2110592fd238005b
 AUX CVE-2013-4497-grizzly-1.patch 4853 SHA256 b4477a17f45d505f0f09462888f6fdf59c2c5c89efbf38339a357f00e098c877 SHA512 9d9f4edbdcbffe9abe96526be454f68675543cf8601dac622943389350cc9d2ed28addb5e51fa61305142bd981e80d2f79f6f2b13d9bdc2ec76a1a5438d52798 WHIRLPOOL e30cd6d15c5fad7227c23a9b5a10b57cc7100b626d862a794108dd0ef3caa903bbafb1b497af2d18acbc3f371e59b924f848356134e43df323eef3db483b0c47
 AUX CVE-2013-4497-grizzly-2.patch 1945 SHA256 8c4be7bc42b485afd64d5ec1dd61ecfb5540555640c370649afc5312a3ddcac1 SHA512 1153e89733d0e8cffe1c6cbcaf9b3cabf8ebbf797e578c8ab379df9b01bd88758606ca450f0d7741efdc92869c078f4e1229b29cbb4fa9b8107ef9b92935452a WHIRLPOOL 843758c9f16fa476f0c1e67c2f3596b8adaba26f6d4dfd7c7213294221fe048b22356ba504bd264dab7313a48ce2ca0a8d968767184fe1cdb7b8ac815269ee27
 AUX CVE-2013-6419_2013.1.4.patch 5711 SHA256 0af9859e7cd0373c3c69fbb7d2256976412599cd079e696344288a81d3422bcd SHA512 b6f2fd940278cf7fa7b0a1d54d6c069f73a5c3462c4adb536c03d611c197ba3509d4464a7ef7539213ba51d749efc5ecc85800a4f86998464cdc2beb42bafd7e WHIRLPOOL ba62d91c0135a8328ca3e4048223630d2c2c133a2231e80655dc4d7dd0b772d1f81402aafaf7ec8742a77ee7cc58e7cf03d915e2058669a105c4553ccc976b48
-AUX CVE-2013-6419_2013.2.patch 7791 SHA256 441a6d09d8c732c5ed93dded9348e54014ad9909c131cb3436f3a34bee55a7b5 SHA512 48419a04287b2c1f8f308e759460a1695c3e6be8e366a00a6d5bd613a3a8f0e84db0d6b749e4e8f07ce2b0ab3e2e13a6d9a886e0ee3388408c115f51cfc28766 WHIRLPOOL a7a3e6021a67cecf659106629e1adb608889b25a0a34688e5db7daae52701511d990ba8a0ab9c8a05df1a83a660913a88ff2e38ee06bce6a7aec4b1115af4ce4
 AUX nova-confd 101 SHA256 d9013141618d1e8b8ba85297155747d9c8fc362238de7bba3108b9a2539c8c73 SHA512 4c7ec1d123f2cdaf394d1f4824df861bbe309b0b329db44080160d81746cd0fc9d4cc1b35da0f66ab075f1d4e835ababfb7bccaf4a2e931e60f2c0ac572a552e WHIRLPOOL 6a237357a3905d29a96b32c37f6d189e4f5cefc0986bb091e24a79295191332143741c604c2a9fd44484c75b3be89742a5570862cf0cd4ba225425f7f32b5348
 AUX nova-initd 1496 SHA256 5b5f928335ac345103492555c3bc57407f547915b099762d0087aef172e5edf8 SHA512 cca06baba484d505f3a96643d836204a08e9dde50197531cdab2d95188b992a95a375a386b9c54fcc8e0a4f6167babba975db7510db1087f044afa39effe4eec WHIRLPOOL 4c667a5cc469826063a65879c1beddc98371edf295a273c9b8f679627cabfe2260d8b3bbdf9550d3894fc1525d63b9f98d6e939406f90ac5f2f745daa59311c2
 AUX nova-sudoers 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5dba76acb4a76 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 WHIRLPOOL bc42ae1d12e9f900b263fd5c3d0f59062f46fbec1ff97c0bceb234082bea5943eb64795b4f5e102b8e2749c6868163e5924467088cad42df09345e3406e5f83c
 DIST nova-2013.1.4.tar.gz 5801779 SHA256 0491ec81552b9c407021941ea1c477d5bcd93ec1dcc66d5fc0c1cef594dac760 SHA512 de1addcbc4577c4a376d8762e44d6f7c455bd63ba0be9d8a6a7176ef7a24e85f2bf9014e31d1180e42e48308ee6a17dcf039da2739388501a5fedbad8e5a7f0c WHIRLPOOL 08898e55b7380bd1852c00dcd8e03d4eb06c8c888688d66ba717842929973235eb9d6d34dda4be2700f208a7ff9e088de2690a74acd97f5cb6b81bcce743ece3
+DIST nova-2013.2.1.tar.gz 8937179 SHA256 b1a4ccb24d9a55b7ef0edc1a2b4ba374d52360a1f41148c92823787e8747401e SHA512 34b8e05128e000770731c63c4240071b8a764913b42bc9284a79af3d76fb10d6c825ca78e490762237a8ee416ce04a9a3f0c7ddcad54cb6830fd6376851d050f WHIRLPOOL 9a54affc20c10d88f0f559528b5d24ce71a073b90d710b7d84be53d150a2cfe47e766a4eda3638620ba8d7075b7f354af1ada2489eb04f8d18cdeb9cee5d5016
 DIST nova-2013.2.tar.gz 8909222 SHA256 55a51f8d8b6c7b0ba6f8ff9c48604bb82a90bdc3f21460ed325d1cee2dfea95a SHA512 655d6f5a4ab9ddfb741a920417061808bf22521c967d324f0fa1856c801795969df6f4982362bce26836975c09e7f41e25575309cde5c6788ed32e69304381ea WHIRLPOOL d88272c8101426ed4930a924b254d045a5c965f867573039b72b51f7aa5ba2daa47f54332f63e09e781dd22ca55c142acdb432dc92ad366e13b56138ff8f3186
 EBUILD nova-2013.1.4-r2.ebuild 5370 SHA256 6727132e94a6c7331788a849b9f1ee1713de695655b5b48f95d271c2186272b0 SHA512 d02ad60d18972a485e2d5b3e047efb2546826522f644ab6e9270e6aef8aa9a0199728d8aa4d5a14d2464313824988bb4fb803e9d7e980833a03e051c231ce298 WHIRLPOOL b16ad90f3ae370149072880cdb793800d5a4755ea6e19fee17060662d3d8623c4f862aec64e10e13ca97c3aaa1b1444007d168e10815501d3d52d253a638748d
 EBUILD nova-2013.1.9999.ebuild 5073 SHA256 cd1b26465d4bbdbf9daa606fb4787e075461e45acf624eee0753424c2facdb44 SHA512 2d2f40807775654e9e277a8c6910555686dc7d481f75c18d710bb0c12442e92ab852b2243dfd9236ef327aec91899fcacbed55b5429bf158f3714c866b47a453 WHIRLPOOL bbe37fe1d3f294b9d871433b303c4c3265f7e6095263e10954ccd30796d57236dde2aa742bd134ff762de27d4ee3866e1da232d99b6aef68269e66bd52dc632f
 EBUILD nova-2013.2-r3.ebuild 5172 SHA256 a05a48b973ef7533cb505dfaf4b4fd13a0aa1b2978d72c1e1610300cd25198f9 SHA512 91249672afa1b797f652f6cf82173c334544a1a154752c92c787b38de2e5ad753f0aeb94f1aca626941b9d3c8a07aa5b2c43a099e6eb021eb5f397709009511d WHIRLPOOL 2912ddaec0179af7cb882c6b179256d4431a7e47be0249f1d00671f8a363b2300947fe2d389fbca5bebc59389694f3c0d5c18ca996db3332d40eb4b4c1898fc4
-EBUILD nova-2013.2.9999.ebuild 5090 SHA256 8097dba32e82f125532690b9343beca86b5d1d75a1778d11086e1ed0e0217dd8 SHA512 aa5b4910ade2caa6be5c5ccaa3bdbd5d94ccb689885f0993bf785a1617a0e8f3bf4da5a1416fa458b09e0d5f1dcdd3ad75c81ed5b5463f55714ee8a2ad3f76c2 WHIRLPOOL 2b7693f568e01ba40dc45dbfa2d7539d7f761d2b1245b4b5dda0079f404a5161fa052f3ac99fbcf4082a7d6fbc931dbdd5ef696b54821c03321bafe11f89ef72
+EBUILD nova-2013.2.1.ebuild 5080 SHA256 159c7875c4350fb8d05632ed4e5a8524287f3167aee4d700ba4389ab593b7c48 SHA512 7fbaf143d871a7d2da8f303822cb12dbafb4c9b924dae6796d9f2dd6444e0b482481b0a5be65b99cd6756be101e6ac58b9b23fe68d640eff93c58f2287b1685a WHIRLPOOL 89b2f558266a8da8a5ee09313b4ca3518813a1af1b84bd7c76d68de95be67fa79adf6d2f832ed060cb087fbbb6837cbf3e9e25acb6136bb0fc0aa76aab049703
+EBUILD nova-2013.2.9999.ebuild 5088 SHA256 2e0a8db3ad0eea45951794607a01b98c692557fdce6425270ce503a617c6db40 SHA512 3d4581853a013042a5bbc971998b04ee72f4b8c05e8600e07539e8d98ef83429a32058465089293016f6f571b85ead32c453b7f31d29951c792d8a86510572eb WHIRLPOOL 001e39da91eeb090ef3ef0cad66afccf3e8f91578ac8c034fc688ac3955675b0e855cfee76922402c02248488133e0916004fb4e3551aca42d39af1d017780fd
 EBUILD nova-9999.ebuild 5221 SHA256 96934150733f53305da5cbfd377e4608fb5b43932e5f98b74017fb1174f7f144 SHA512 fe2f7aa7eb89883edabe37008e1fc02f5b54ab9f0487d636765832e728c42bd447bc1490375c1d99a3677f1bf1e5e60af89eee90efcb49be046f94c95d923a0e WHIRLPOOL fac835027124b39f8f434199e1b4eaa9240b361c037d6961f6d02584e2b2a204eb9ed0ce89c39b7989b22d8d1dcf08c5c1a8437e3b39604f999979634d7c68ff
-MISC ChangeLog 10509 SHA256 e0e3f5332d1fd5d62c26068445202ba71a7ef8071f648da3404c357c00077054 SHA512 24a629bf039d032f41b6d68567ad3292b2d86fbe29e4bf223db3f5debbdb02ec21a2c72e9dd0b26ff2c850a41e82699219a9e4af0c4dd49545b02c67244633ef WHIRLPOOL f2737f8f9a6bff34c31c304d85117d0d81c204c1b4752a73f8da344c32f5b4fd93ba12e58d3f2d2d3fcf6aaacb20169b7c9de93880d91127a79e74759954728e
+MISC ChangeLog 10751 SHA256 191ee05eb851eb0b21660ee54f750253c9752928399d06a12ab0d220b20eae15 SHA512 71e4e216a03301e7b32736d8d3539252935626a6eb70f9717a77b5b590189355260adcf66c664eba1fb86dd1d3596139ffdbf7ca76868ce79a35d64b69d3782e WHIRLPOOL 48c62aa315da19721f5773abb802fb246d214e898ae815e96ed938b74af219fc86150a2ea49173fc684d64768b6a0ada185d2aaabe8f40eaacb17c8835315b9a
 MISC metadata.xml 1452 SHA256 29bf3efaab7a4e45f5e442b26a7606edaed3f47e4ffec3e8990f95aea6bf2450 SHA512 537664b6ff29f4afe09eb4635c2cb06d87a6c3c3101e8ef89d1ab9b5b802c79024e94a0cce5a44ec2fd5b1cc37a251dd42156a015b6a294f219b90daff17c9c1 WHIRLPOOL c6e44f9a48fea6ae2a323e9e03d8805301fb0d94bb5634b1946909715f6c05d45c49180204d00221aae1e6dc6748347b4273fae838216b5d5d07932bc473a851
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSq3fVAAoJECRx6z5ArFrD75QP/2f4luwbEqaOX1QOB6CvjSsD
-U1w8UqnV1+10hRSJb4XUbOZMwzbdevaVlwo3WmybwrAnyLorTlHmB26cZkfYoHVC
-pYUZgnrof14vdtpK3Bg5RqqjC4Oz6d+jLpf5REHfGDrJ3gRDWFCFXrHzra78VYnm
-CY7x/Tm16e3TQS+cGbXah7+kYovYykS4hsCAqfYO3sorqxSIatCSWsETJ0IYaTu7
-5YqOdnVcpOQr7H++W4K2hZridPPldctKAhSC9BZP5LYgVHLb6GhxNpSvqG03OTtR
-X7EElq+CSMOdQ2nVyFowbMvqh5nL9xWumELGhnW3Oc9hi42qWLYCWkltcGMiNiJ8
-dG43X4j1eiofDR0ftawAW02MTvnLf0Uop0DdnU+Yd0IzQnipWMDr2c7H/t+Mq7KH
-iKXCsfZBaRrU1zEMLSod2DGgj3KGsuQIuzPt5kfWEmWpXH0V8x/+6yPAt0m9LiZ9
-gjvr6iaMfwzKT8BB+zeDREn7y7JI/E+88dB+9tkfE+gNTtqu6QCMXQb3wcOPUz/4
-VjGC8geM7QaanftMS9Vh3ake9Ww0NaAlChtnGske40GnY/vnvHTESUUYIXsfAE24
-qXHVbbloJ3HZl0titsZNiTcfmTk57tWgHaOP/9Q8mTTDINHKCJlzGR1MvbVFFBg+
-O9jf+kLxm7jb3yOjefAW
-=StfQ
+iQIcBAEBCAAGBQJSsmY9AAoJECRx6z5ArFrD5MsQAM1vnVbhsoFRmxxFIWyge2Fs
+nUTpTQ97MsGToqPnPgppf7VRqeXebs+9M5SPYz8Vxj7xVP8ZiyCWgysD80hUYvCu
+Mu9nb3nGWhX1qkO3DInV1GCOvpbjz3VHbaxHJeFqdAoiKTCA2SwKYvoq1UE7Vka6
+AvGaEuQJ6zs2tqxEsa91fonI9P8iyFRngme151+AkBo2BnZSqAG9kdGd4OLjTJHS
+R5truEi+NHXsYh6K74TaVjmbPKU+1BrSEFKb01NYrhl9s+HcGp9QVoI3G6V+OVvG
+5eLIZEJ33LTHQHurnacPXZDkvkLjlV7NQ5VJHGpHrFuEDuTYGR1wwBcNMkUWya9/
+4G28CxM7aBlXA6B0eSaDyEg/gp0t1XT8c/dS2ZQVKHoIIPsULHwdWKbkd9+bs6GH
+TxXgdfTJmzCm9PWSwv1kzYGSRd5UxL2sVEM+qeJaFqMmgvV4+mr8G2Soa6lW6kq6
+7ZMLzgm7dODHJTMwUUpBn4QCOz0vJVSFgAUC8Lx43QddEnSUXvIri16RwwBGNmAT
++gCQcdJ/wCaxgdE3BxhYk5OV0gWavIJXM9wVARooqFFXuLhsXs02igukRuMAMV3H
+C1VBC82W/tWkFeNvVyojOXwYbPDzz3KlgavNuCGYvFqhlB8SDIFTevy/SkLT48Tz
+xN62zPOQIR4vGXcdFLGb
+=YkbM
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/files/CVE-2013-4463_4469-havana.patch b/sys-cluster/nova/files/CVE-2013-4463_4469-havana.patch
deleted file mode 100644
index 575b11d9bbdf..000000000000
--- a/sys-cluster/nova/files/CVE-2013-4463_4469-havana.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-From 3cdfe894ab58f7b91bf7fb690fc5bc724e44066f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@redhat.com>
-Date: Fri, 27 Sep 2013 04:07:14 +0100
-Subject: [PATCH] ensure we don't boot oversized images
-
-Since we can't generally shrink incoming images, add extra checks
-to ensure oversized images are not allowed through.
-All cases when populating the libvirt image cache are now handled,
-including the initial download from glance, where we avoid
-converting to raw, as that could generate non sparse images
-much larger than the downloaded image.
-
-* nova/virt/libvirt/utils.py (fetch_image): Allow passing through
-of the max_size parameter.
-* nova/virt/images.py (fetch_to_raw): Accept the max_size parameter,
-and use it to discard images with larger (virtual) sizes.
-* nova/virt/libvirt/imagebackend.py (verify_base_size): A new
-refactored function to identify and raise exception to oversized images.
-(Raw.create_image): Pass the max_size to the fetch function.
-Also enforce virtual image size checking for already fetched images,
-as this class (despite the name) can be handling qcow files.
-(Qcow2.create_image): Pass the max_size to the fetch function,
-or verify the virtual size for the instance as done previously.
-(Lvm.create_image): Pass the max_size to the fetch function.
-Also check the size before transferring to the volume to improve
-efficiency by not even attempting the transfer of oversized images.
-(Rbd.create_image): Likewise.
-* nova/tests/virt/libvirt/fake_libvirt_utils.py: Support max_size arg.
-* nova/tests/virt/libvirt/test_libvirt.py (test_fetch_raw_image):
-Add a case to check oversized images are discarded.
-* nova/tests/virt/libvirt/test_imagebackend.py
-(test_create_image_too_small): Adjust to avoid the fetch size check.
-
-Fixes bug: 1177830
-Fixes bug: 1206081
-Change-Id: I3d47adaa2ad07434853f447feb27d7aae0e2e717
----
- nova/tests/virt/libvirt/fake_libvirt_utils.py |  2 +-
- nova/tests/virt/libvirt/test_imagebackend.py  | 34 ++++++-----------
- nova/tests/virt/libvirt/test_libvirt.py       | 24 ++++++++++--
- nova/virt/images.py                           | 24 ++++++++++--
- nova/virt/libvirt/imagebackend.py             | 55 +++++++++++++++++++--------
- nova/virt/libvirt/utils.py                    |  5 ++-
- 6 files changed, 98 insertions(+), 46 deletions(-)
-
-diff --git a/nova/tests/virt/libvirt/fake_libvirt_utils.py b/nova/tests/virt/libvirt/fake_libvirt_utils.py
-index e18f9df..4799837 100644
---- a/nova/tests/virt/libvirt/fake_libvirt_utils.py
-+++ b/nova/tests/virt/libvirt/fake_libvirt_utils.py
-@@ -197,7 +197,7 @@ def get_fs_info(path):
-             'free': 84 * (1024 ** 3)}
- 
- 
--def fetch_image(context, target, image_id, user_id, project_id):
-+def fetch_image(context, target, image_id, user_id, project_id, max_size=0):
-     pass
- 
- 
-diff --git a/nova/tests/virt/libvirt/test_imagebackend.py b/nova/tests/virt/libvirt/test_imagebackend.py
-index b862510..2455ec8 100644
---- a/nova/tests/virt/libvirt/test_imagebackend.py
-+++ b/nova/tests/virt/libvirt/test_imagebackend.py
-@@ -190,7 +190,7 @@ def prepare_mocks(self):
- 
-     def test_create_image(self):
-         fn = self.prepare_mocks()
--        fn(target=self.TEMPLATE_PATH, image_id=None)
-+        fn(target=self.TEMPLATE_PATH, max_size=None, image_id=None)
-         imagebackend.libvirt_utils.copy_image(self.TEMPLATE_PATH, self.PATH)
-         self.mox.ReplayAll()
- 
-@@ -211,7 +211,7 @@ def test_create_image_generated(self):
- 
-     def test_create_image_extend(self):
-         fn = self.prepare_mocks()
--        fn(target=self.TEMPLATE_PATH, image_id=None)
-+        fn(max_size=self.SIZE, target=self.TEMPLATE_PATH, image_id=None)
-         imagebackend.libvirt_utils.copy_image(self.TEMPLATE_PATH, self.PATH)
-         imagebackend.disk.extend(self.PATH, self.SIZE, use_cow=False)
-         self.mox.ReplayAll()
-@@ -261,7 +261,7 @@ def prepare_mocks(self):
- 
-     def test_create_image(self):
-         fn = self.prepare_mocks()
--        fn(target=self.TEMPLATE_PATH)
-+        fn(max_size=None, target=self.TEMPLATE_PATH)
-         imagebackend.libvirt_utils.create_cow_image(self.TEMPLATE_PATH,
-                                                     self.PATH)
-         self.mox.ReplayAll()
-@@ -273,15 +273,12 @@ def test_create_image(self):
- 
-     def test_create_image_with_size(self):
-         fn = self.prepare_mocks()
--        fn(target=self.TEMPLATE_PATH)
-+        fn(max_size=self.SIZE, target=self.TEMPLATE_PATH)
-         self.mox.StubOutWithMock(os.path, 'exists')
--        self.mox.StubOutWithMock(imagebackend.disk, 'get_disk_size')
-         if self.OLD_STYLE_INSTANCE_PATH:
-             os.path.exists(self.OLD_STYLE_INSTANCE_PATH).AndReturn(False)
-         os.path.exists(self.TEMPLATE_PATH).AndReturn(False)
-         os.path.exists(self.PATH).AndReturn(False)
--        imagebackend.disk.get_disk_size(self.TEMPLATE_PATH
--                                       ).AndReturn(self.SIZE)
-         os.path.exists(self.PATH).AndReturn(False)
-         imagebackend.libvirt_utils.create_cow_image(self.TEMPLATE_PATH,
-                                                     self.PATH)
-@@ -295,13 +292,11 @@ def test_create_image_with_size(self):
- 
-     def test_create_image_too_small(self):
-         fn = self.prepare_mocks()
--        fn(target=self.TEMPLATE_PATH)
-         self.mox.StubOutWithMock(os.path, 'exists')
-         self.mox.StubOutWithMock(imagebackend.disk, 'get_disk_size')
-         if self.OLD_STYLE_INSTANCE_PATH:
-             os.path.exists(self.OLD_STYLE_INSTANCE_PATH).AndReturn(False)
--        os.path.exists(self.TEMPLATE_PATH).AndReturn(False)
--        os.path.exists(self.PATH).AndReturn(False)
-+        os.path.exists(self.TEMPLATE_PATH).AndReturn(True)
-         imagebackend.disk.get_disk_size(self.TEMPLATE_PATH
-                                        ).AndReturn(self.SIZE)
-         self.mox.ReplayAll()
-@@ -313,9 +308,8 @@ def test_create_image_too_small(self):
- 
-     def test_generate_resized_backing_files(self):
-         fn = self.prepare_mocks()
--        fn(target=self.TEMPLATE_PATH)
-+        fn(max_size=self.SIZE, target=self.TEMPLATE_PATH)
-         self.mox.StubOutWithMock(os.path, 'exists')
--        self.mox.StubOutWithMock(imagebackend.disk, 'get_disk_size')
-         self.mox.StubOutWithMock(imagebackend.libvirt_utils,
-                                  'get_disk_backing_file')
-         if self.OLD_STYLE_INSTANCE_PATH:
-@@ -330,8 +324,6 @@ def test_generate_resized_backing_files(self):
-                                               self.QCOW2_BASE)
-         imagebackend.disk.extend(self.QCOW2_BASE, self.SIZE, use_cow=True)
- 
--        imagebackend.disk.get_disk_size(self.TEMPLATE_PATH
--                                       ).AndReturn(self.SIZE)
-         os.path.exists(self.PATH).AndReturn(True)
-         self.mox.ReplayAll()
- 
-@@ -342,9 +334,8 @@ def test_generate_resized_backing_files(self):
- 
-     def test_qcow2_exists_and_has_no_backing_file(self):
-         fn = self.prepare_mocks()
--        fn(target=self.TEMPLATE_PATH)
-+        fn(max_size=self.SIZE, target=self.TEMPLATE_PATH)
-         self.mox.StubOutWithMock(os.path, 'exists')
--        self.mox.StubOutWithMock(imagebackend.disk, 'get_disk_size')
-         self.mox.StubOutWithMock(imagebackend.libvirt_utils,
-                                  'get_disk_backing_file')
-         if self.OLD_STYLE_INSTANCE_PATH:
-@@ -354,8 +345,6 @@ def test_qcow2_exists_and_has_no_backing_file(self):
- 
-         imagebackend.libvirt_utils.get_disk_backing_file(self.PATH)\
-             .AndReturn(None)
--        imagebackend.disk.get_disk_size(self.TEMPLATE_PATH
--                                       ).AndReturn(self.SIZE)
-         os.path.exists(self.PATH).AndReturn(True)
-         self.mox.ReplayAll()
- 
-@@ -392,7 +381,7 @@ def prepare_mocks(self):
- 
-     def _create_image(self, sparse):
-         fn = self.prepare_mocks()
--        fn(target=self.TEMPLATE_PATH)
-+        fn(max_size=None, target=self.TEMPLATE_PATH)
-         self.libvirt_utils.create_lvm_image(self.VG,
-                                             self.LV,
-                                             self.TEMPLATE_SIZE,
-@@ -424,7 +413,7 @@ def _create_image_generated(self, sparse):
- 
-     def _create_image_resize(self, sparse):
-         fn = self.prepare_mocks()
--        fn(target=self.TEMPLATE_PATH)
-+        fn(max_size=self.SIZE, target=self.TEMPLATE_PATH)
-         self.libvirt_utils.create_lvm_image(self.VG, self.LV,
-                                             self.SIZE, sparse=sparse)
-         self.disk.get_disk_size(self.TEMPLATE_PATH
-@@ -463,7 +452,7 @@ def test_create_image_resize_sparsed(self):
- 
-     def test_create_image_negative(self):
-         fn = self.prepare_mocks()
--        fn(target=self.TEMPLATE_PATH)
-+        fn(max_size=self.SIZE, target=self.TEMPLATE_PATH)
-         self.libvirt_utils.create_lvm_image(self.VG,
-                                             self.LV,
-                                             self.SIZE,
-@@ -607,7 +596,7 @@ def test_cache_template_exists(self):
- 
-     def test_create_image(self):
-         fn = self.prepare_mocks()
--        fn(rbd=self.rbd, target=self.TEMPLATE_PATH)
-+        fn(max_size=None, rbd=self.rbd, target=self.TEMPLATE_PATH)
- 
-         self.rbd.RBD_FEATURE_LAYERING = 1
- 
-@@ -635,6 +624,7 @@ def fake_fetch(target, *args, **kwargs):
-             return
- 
-         self.stubs.Set(os.path, 'exists', lambda _: True)
-+        self.stubs.Set(image, 'check_image_exists', lambda: True)
- 
-         image.cache(fake_fetch, self.TEMPLATE_PATH, self.SIZE)
- 
-diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py
-index ac36be4..5d1361e 100644
---- a/nova/tests/virt/libvirt/test_libvirt.py
-+++ b/nova/tests/virt/libvirt/test_libvirt.py
-@@ -6308,7 +6308,8 @@ def test_fetch_image(self):
-         image_id = '4'
-         user_id = 'fake'
-         project_id = 'fake'
--        images.fetch_to_raw(context, image_id, target, user_id, project_id)
-+        images.fetch_to_raw(context, image_id, target, user_id, project_id,
-+                            max_size=0)
- 
-         self.mox.ReplayAll()
-         libvirt_utils.fetch_image(context, target, image_id,
-@@ -6338,20 +6339,27 @@ class FakeImgInfo(object):
-                 file_format = path.split('.')[-2]
-             elif file_format == 'converted':
-                 file_format = 'raw'
-+
-             if 'backing' in path:
-                 backing_file = 'backing'
-             else:
-                 backing_file = None
- 
-+            if 'big' in path:
-+                virtual_size = 2
-+            else:
-+                virtual_size = 1
-+
-             FakeImgInfo.file_format = file_format
-             FakeImgInfo.backing_file = backing_file
-+            FakeImgInfo.virtual_size = virtual_size
- 
-             return FakeImgInfo()
- 
-         self.stubs.Set(utils, 'execute', fake_execute)
-         self.stubs.Set(os, 'rename', fake_rename)
-         self.stubs.Set(os, 'unlink', fake_unlink)
--        self.stubs.Set(images, 'fetch', lambda *_: None)
-+        self.stubs.Set(images, 'fetch', lambda *_, **__: None)
-         self.stubs.Set(images, 'qemu_img_info', fake_qemu_img_info)
-         self.stubs.Set(fileutils, 'delete_if_exists', fake_rm_on_error)
- 
-@@ -6373,7 +6381,8 @@ class FakeImgInfo(object):
-                               't.qcow2.part', 't.qcow2.converted'),
-                              ('rm', 't.qcow2.part'),
-                              ('mv', 't.qcow2.converted', 't.qcow2')]
--        images.fetch_to_raw(context, image_id, target, user_id, project_id)
-+        images.fetch_to_raw(context, image_id, target, user_id, project_id,
-+                            max_size=1)
-         self.assertEqual(self.executes, expected_commands)
- 
-         target = 't.raw'
-@@ -6390,6 +6399,15 @@ class FakeImgInfo(object):
-                           context, image_id, target, user_id, project_id)
-         self.assertEqual(self.executes, expected_commands)
- 
-+        target = 'big.qcow2'
-+        self.executes = []
-+        expected_commands = [('rm', '-f', 'big.qcow2.part')]
-+        self.assertRaises(exception.InstanceTypeDiskTooSmall,
-+                          images.fetch_to_raw,
-+                          context, image_id, target, user_id, project_id,
-+                          max_size=1)
-+        self.assertEqual(self.executes, expected_commands)
-+
-         del self.executes
- 
-     def test_get_disk_backing_file(self):
-diff --git a/nova/virt/images.py b/nova/virt/images.py
-index 9c4c101..6d20e65 100644
---- a/nova/virt/images.py
-+++ b/nova/virt/images.py
-@@ -179,7 +179,7 @@ def convert_image(source, dest, out_format, run_as_root=False):
-     utils.execute(*cmd, run_as_root=run_as_root)
- 
- 
--def fetch(context, image_href, path, _user_id, _project_id):
-+def fetch(context, image_href, path, _user_id, _project_id, max_size=0):
-     # TODO(vish): Improve context handling and add owner and auth data
-     #             when it is added to glance.  Right now there is no
-     #             auth checking in glance, so we assume that access was
-@@ -190,9 +190,10 @@ def fetch(context, image_href, path, _user_id, _project_id):
-         image_service.download(context, image_id, dst_path=path)
- 
- 
--def fetch_to_raw(context, image_href, path, user_id, project_id):
-+def fetch_to_raw(context, image_href, path, user_id, project_id, max_size=0):
-     path_tmp = "%s.part" % path
--    fetch(context, image_href, path_tmp, user_id, project_id)
-+    fetch(context, image_href, path_tmp, user_id, project_id,
-+          max_size=max_size)
- 
-     with fileutils.remove_path_on_error(path_tmp):
-         data = qemu_img_info(path_tmp)
-@@ -209,6 +210,23 @@ def fetch_to_raw(context, image_href, path, user_id, project_id):
-                 reason=(_("fmt=%(fmt)s backed by: %(backing_file)s") %
-                         {'fmt': fmt, 'backing_file': backing_file}))
- 
-+        # We can't generally shrink incoming images, so disallow
-+        # images > size of the flavor we're booting.  Checking here avoids
-+        # an immediate DoS where we convert large qcow images to raw
-+        # (which may compress well but not be sparse).
-+        # TODO(p-draigbrady): loop through all flavor sizes, so that
-+        # we might continue here and not discard the download.
-+        # If we did that we'd have to do the higher level size checks
-+        # irrespective of whether the base image was prepared or not.
-+        disk_size = data.virtual_size
-+        if max_size and max_size < disk_size:
-+            msg = _('%(base)s virtual size %(disk_size)s '
-+                    'larger than flavor root disk size %(size)s')
-+            LOG.error(msg % {'base': path,
-+                             'disk_size': disk_size,
-+                             'size': max_size})
-+            raise exception.InstanceTypeDiskTooSmall()
-+
-         if fmt != "raw" and CONF.force_raw_images:
-             staged = "%s.converted" % path
-             LOG.debug("%s was %s, converting to raw" % (image_href, fmt))
-diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py
-index 84c46e8..e900789 100644
---- a/nova/virt/libvirt/imagebackend.py
-+++ b/nova/virt/libvirt/imagebackend.py
-@@ -193,6 +193,36 @@ def _can_fallocate(self):
-                           (CONF.preallocate_images, self.path))
-         return can_fallocate
- 
-+    @staticmethod
-+    def verify_base_size(base, size, base_size=0):
-+        """Check that the base image is not larger than size.
-+           Since images can't be generally shrunk, enforce this
-+           constraint taking account of virtual image size.
-+        """
-+
-+        # Note(pbrady): The size and min_disk parameters of a glance
-+        #  image are checked against the instance size before the image
-+        #  is even downloaded from glance, but currently min_disk is
-+        #  adjustable and doesn't currently account for virtual disk size,
-+        #  so we need this extra check here.
-+        # NOTE(cfb): Having a flavor that sets the root size to 0 and having
-+        #  nova effectively ignore that size and use the size of the
-+        #  image is considered a feature at this time, not a bug.
-+
-+        if size is None:
-+            return
-+
-+        if size and not base_size:
-+            base_size = disk.get_disk_size(base)
-+
-+        if size < base_size:
-+            msg = _('%(base)s virtual size %(base_size)s '
-+                    'larger than flavor root disk size %(size)s')
-+            LOG.error(msg % {'base': base,
-+                              'base_size': base_size,
-+                              'size': size})
-+            raise exception.InstanceTypeDiskTooSmall()
-+
-     def snapshot_create(self):
-         raise NotImplementedError()
- 
-@@ -234,7 +264,8 @@ def copy_raw_image(base, target, size):
-             #Generating image in place
-             prepare_template(target=self.path, *args, **kwargs)
-         else:
--            prepare_template(target=base, *args, **kwargs)
-+            prepare_template(target=base, max_size=size, *args, **kwargs)
-+            self.verify_base_size(base, size)
-             if not os.path.exists(self.path):
-                 with fileutils.remove_path_on_error(self.path):
-                     copy_raw_image(base, self.path, size)
-@@ -273,7 +304,9 @@ def copy_qcow2_image(base, target, size):
- 
-         # Download the unmodified base image unless we already have a copy.
-         if not os.path.exists(base):
--            prepare_template(target=base, *args, **kwargs)
-+            prepare_template(target=base, max_size=size, *args, **kwargs)
-+        else:
-+            self.verify_base_size(base, size)
- 
-         legacy_backing_size = None
-         legacy_base = base
-@@ -299,17 +332,6 @@ def copy_qcow2_image(base, target, size):
-                     libvirt_utils.copy_image(base, legacy_base)
-                     disk.extend(legacy_base, legacy_backing_size, use_cow=True)
- 
--        # NOTE(cfb): Having a flavor that sets the root size to 0 and having
--        #            nova effectively ignore that size and use the size of the
--        #            image is considered a feature at this time, not a bug.
--        disk_size = disk.get_disk_size(base)
--        if size and size < disk_size:
--            msg = _('%(base)s virtual size %(disk_size)s'
--                    'larger than flavor root disk size %(size)s')
--            LOG.error(msg % {'base': base,
--                              'disk_size': disk_size,
--                              'size': size})
--            raise exception.InstanceTypeDiskTooSmall()
-         if not os.path.exists(self.path):
-             with fileutils.remove_path_on_error(self.path):
-                 copy_qcow2_image(base, self.path, size)
-@@ -367,6 +389,7 @@ def create_image(self, prepare_template, base, size, *args, **kwargs):
-         @utils.synchronized(base, external=True, lock_path=self.lock_path)
-         def create_lvm_image(base, size):
-             base_size = disk.get_disk_size(base)
-+            self.verify_base_size(base, size, base_size=base_size)
-             resize = size > base_size
-             size = size if resize else base_size
-             libvirt_utils.create_lvm_image(self.vg, self.lv,
-@@ -384,7 +407,7 @@ def create_lvm_image(base, size):
-             with self.remove_volume_on_error(self.path):
-                 prepare_template(target=self.path, *args, **kwargs)
-         else:
--            prepare_template(target=base, *args, **kwargs)
-+            prepare_template(target=base, max_size=size, *args, **kwargs)
-             with self.remove_volume_on_error(self.path):
-                 create_lvm_image(base, size)
- 
-@@ -514,7 +537,9 @@ def create_image(self, prepare_template, base, size, *args, **kwargs):
-             features = self.rbd.RBD_FEATURE_LAYERING
- 
-         if not os.path.exists(base):
--            prepare_template(target=base, *args, **kwargs)
-+            prepare_template(target=base, max_size=size, *args, **kwargs)
-+        else:
-+            self.verify_base_size(base, size)
- 
-         # keep using the command line import instead of librbd since it
-         # detects zeroes to preserve sparseness in the image
-diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py
-index 66ff83e..d7c92b7 100644
---- a/nova/virt/libvirt/utils.py
-+++ b/nova/virt/libvirt/utils.py
-@@ -639,9 +639,10 @@ def get_fs_info(path):
-             'used': used}
- 
- 
--def fetch_image(context, target, image_id, user_id, project_id):
-+def fetch_image(context, target, image_id, user_id, project_id, max_size=0):
-     """Grab image."""
--    images.fetch_to_raw(context, image_id, target, user_id, project_id)
-+    images.fetch_to_raw(context, image_id, target, user_id, project_id,
-+                        max_size=max_size)
- 
- 
- def get_instance_path(instance, forceold=False, relative=False):
--- 
-1.8.4
-
diff --git a/sys-cluster/nova/files/CVE-2013-6419_2013.2.patch b/sys-cluster/nova/files/CVE-2013-6419_2013.2.patch
deleted file mode 100644
index 1dcfe1b9b68f..000000000000
--- a/sys-cluster/nova/files/CVE-2013-6419_2013.2.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-commit 2a95eee992b66cd65e401e31785c080f811476cf
-Author: Aaron Rosen <arosen@nicira.com>
-Date:   Mon Oct 7 13:33:31 2013 -0700
-
-    Prevent spoofing instance_id from neturon to nova
-    
-    Previously, one could update a port's device_id in neutron to be that
-    of another tenant's instance_id and then be able to retrieve that instance's
-    metadata. This patch prevents this from occuring by checking that X-Tenant-ID
-    received from the metadata request matches the tenant_id in the nova database.
-    
-    DocImpact - This patch is dependent on another patch in neutron which adds
-                X-Tenant-ID to the request. Therefore to minimize downtime one
-                should upgrade Neutron first (then restart neutron-metadata-agent)
-                and lastly update nova.
-    
-    Fixes bug: 1235450
-
-diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
-index 27f4d4e..7ac9023 100644
---- a/nova/api/metadata/handler.py
-+++ b/nova/api/metadata/handler.py
-@@ -140,29 +140,34 @@ class MetadataRequestHandler(wsgi.Application):
-                     'Please try your request again.')
-             raise webob.exc.HTTPInternalServerError(explanation=unicode(msg))
- 
-         if meta_data is None:
-             LOG.error(_('Failed to get metadata for ip: %s'), remote_address)
- 
-         return meta_data
- 
-     def _handle_instance_id_request(self, req):
-         instance_id = req.headers.get('X-Instance-ID')
-+        tenant_id = req.headers.get('X-Tenant-ID')
-         signature = req.headers.get('X-Instance-ID-Signature')
-         remote_address = req.headers.get('X-Forwarded-For')
- 
-         # Ensure that only one header was passed
- 
-         if instance_id is None:
-             msg = _('X-Instance-ID header is missing from request.')
-+        elif tenant_id is None:
-+            msg = _('X-Tenant-ID header is missing from request.')
-         elif not isinstance(instance_id, basestring):
-             msg = _('Multiple X-Instance-ID headers found within request.')
-+        elif not isinstance(tenant_id, basestring):
-+            msg = _('Multiple X-Tenant-ID headers found within request.')
-         else:
-             msg = None
- 
-         if msg:
-             raise webob.exc.HTTPBadRequest(explanation=msg)
- 
-         expected_signature = hmac.new(
-             CONF.neutron_metadata_proxy_shared_secret,
-             instance_id,
-             hashlib.sha256).hexdigest()
-@@ -188,11 +193,19 @@ class MetadataRequestHandler(wsgi.Application):
-             LOG.exception(_('Failed to get metadata for instance id: %s'),
-                           instance_id)
-             msg = _('An unknown error has occurred. '
-                     'Please try your request again.')
-             raise webob.exc.HTTPInternalServerError(explanation=unicode(msg))
- 
-         if meta_data is None:
-             LOG.error(_('Failed to get metadata for instance id: %s'),
-                       instance_id)
- 
-+        if meta_data.instance['project_id'] != tenant_id:
-+            LOG.warning(_("Tenant_id %(tenant_id)s does not match tenant_id "
-+                          "of instance %(instance_id)s."),
-+                        {'tenant_id': tenant_id,
-+                         'instance_id': instance_id})
-+            # causes a 404 to be raised
-+            meta_data = None
-+
-         return meta_data
-diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py
-index 50f0d07..e75b51f 100644
---- a/nova/tests/test_metadata.py
-+++ b/nova/tests/test_metadata.py
-@@ -594,74 +594,104 @@ class MetadataHandlerTestCase(test.TestCase):
-             CONF.neutron_metadata_proxy_shared_secret,
-             expected_instance_id,
-             hashlib.sha256).hexdigest()
- 
-         # try a request with service disabled
-         response = fake_request(
-             self.stubs, self.mdinst,
-             relpath="/2009-04-04/user-data",
-             address="192.192.192.2",
-             headers={'X-Instance-ID': 'a-b-c-d',
-+                     'X-Tenant-ID': 'test',
-                      'X-Instance-ID-Signature': signed})
-         self.assertEqual(response.status_int, 200)
- 
-         # now enable the service
-         self.flags(service_neutron_metadata_proxy=True)
-         response = fake_request(
-             self.stubs, self.mdinst,
-             relpath="/2009-04-04/user-data",
-             address="192.192.192.2",
-             fake_get_metadata_by_instance_id=fake_get_metadata,
-             headers={'X-Forwarded-For': '192.192.192.2',
-                      'X-Instance-ID': 'a-b-c-d',
-+                     'X-Tenant-ID': 'test',
-                      'X-Instance-ID-Signature': signed})
- 
-         self.assertEqual(response.status_int, 200)
-         self.assertEqual(response.body,
-                          base64.b64decode(self.instance['user_data']))
- 
-         # mismatched signature
-         response = fake_request(
-             self.stubs, self.mdinst,
-             relpath="/2009-04-04/user-data",
-             address="192.192.192.2",
-             fake_get_metadata_by_instance_id=fake_get_metadata,
-             headers={'X-Forwarded-For': '192.192.192.2',
-                      'X-Instance-ID': 'a-b-c-d',
-+                     'X-Tenant-ID': 'test',
-                      'X-Instance-ID-Signature': ''})
- 
-         self.assertEqual(response.status_int, 403)
- 
-+        # missing X-Tenant-ID from request
-+        response = fake_request(
-+            self.stubs, self.mdinst,
-+            relpath="/2009-04-04/user-data",
-+            address="192.192.192.2",
-+            fake_get_metadata_by_instance_id=fake_get_metadata,
-+            headers={'X-Forwarded-For': '192.192.192.2',
-+                     'X-Instance-ID': 'a-b-c-d',
-+                     'X-Instance-ID-Signature': signed})
-+
-+        self.assertEqual(response.status_int, 400)
-+
-+        # mismatched X-Tenant-ID
-+        response = fake_request(
-+            self.stubs, self.mdinst,
-+            relpath="/2009-04-04/user-data",
-+            address="192.192.192.2",
-+            fake_get_metadata_by_instance_id=fake_get_metadata,
-+            headers={'X-Forwarded-For': '192.192.192.2',
-+                     'X-Instance-ID': 'a-b-c-d',
-+                     'X-Tenant-ID': 'FAKE',
-+                     'X-Instance-ID-Signature': signed})
-+
-+        self.assertEqual(response.status_int, 404)
-+
-         # without X-Forwarded-For
-         response = fake_request(
-             self.stubs, self.mdinst,
-             relpath="/2009-04-04/user-data",
-             address="192.192.192.2",
-             fake_get_metadata_by_instance_id=fake_get_metadata,
-             headers={'X-Instance-ID': 'a-b-c-d',
-+                     'X-Tenant-ID': 'test',
-                      'X-Instance-ID-Signature': signed})
- 
-         self.assertEqual(response.status_int, 500)
- 
-         # unexpected Instance-ID
-         signed = hmac.new(
-             CONF.neutron_metadata_proxy_shared_secret,
-            'z-z-z-z',
-            hashlib.sha256).hexdigest()
- 
-         response = fake_request(
-             self.stubs, self.mdinst,
-             relpath="/2009-04-04/user-data",
-             address="192.192.192.2",
-             fake_get_metadata_by_instance_id=fake_get_metadata,
-             headers={'X-Forwarded-For': '192.192.192.2',
-                      'X-Instance-ID': 'z-z-z-z',
-+                     'X-Tenant-ID': 'test',
-                      'X-Instance-ID-Signature': signed})
-         self.assertEqual(response.status_int, 500)
- 
- 
- class MetadataPasswordTestCase(test.TestCase):
-     def setUp(self):
-         super(MetadataPasswordTestCase, self).setUp()
-         fake_network.stub_out_nw_api_get_instance_nw_info(self.stubs)
-         self.instance = copy.copy(INSTANCES[0])
-         self.instance['system_metadata'] = get_default_sys_meta()
diff --git a/sys-cluster/nova/nova-2013.2.1.ebuild b/sys-cluster/nova/nova-2013.2.1.ebuild
new file mode 100644
index 000000000000..bd9f21fda68e
--- /dev/null
+++ b/sys-cluster/nova/nova-2013.2.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.2.1.ebuild,v 1.1 2013/12/19 03:18:19 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python."
+HOMEPAGE="https://launchpad.net/nova"
+SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+api +cert +compute +conductor +consoleauth +kvm +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy sqlite mysql postgres xen"
+REQUIRED_USE="|| ( mysql postgres sqlite )
+			  || ( kvm xen )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		app-admin/sudo"
+
+RDEPEND="sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
+	          <dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
+		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
+	         <dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
+		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
+	            <dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
+		>=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
+		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.4.0[${PYTHON_USEDEP}]
+		!~dev-python/boto-2.13.0[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
+		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+		>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
+		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+		<dev-python/webob-1.3[${PYTHON_USEDEP}]
+		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+		dev-python/paste[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-1.0.5[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
+		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
+		>=dev-python/websockify-0.5.1[${PYTHON_USEDEP}]
+		<dev-python/websockify-0.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		dev-python/libvirt-python[${PYTHON_USEDEP}]
+		novncproxy? ( www-apps/novnc )
+		sys-apps/iproute2
+		net-misc/openvswitch
+		sys-fs/sysfsutils
+		sys-fs/multipath-tools
+		kvm? ( app-emulation/qemu )
+		xen? ( app-emulation/xen
+			   app-emulation/xen-tools )"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_install() {
+	distutils-r1_python_install
+	newconfd "${FILESDIR}/nova-confd" "nova"
+	newinitd "${FILESDIR}/nova-initd" "nova"
+	use api && dosym /etc/init.d/nova /etc/init.d/nova-api
+	use cert && dosym /etc/init.d/nova /etc/init.d/nova-cert
+	use compute && dosym /etc/init.d/nova /etc/init.d/nova-compute
+	use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor
+	use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth
+	use network &&  dosym /etc/init.d/nova /etc/init.d/nova-network
+	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-novncproxy
+	use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler
+	use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy
+	use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy
+
+	diropts -m 0750
+	dodir /var/run/nova /var/log/nova /var/lock/nova
+	fowners nova:nova /var/log/nova /var/lock/nova /var/run/nova
+
+	diropts -m 0755
+	dodir /var/lib/nova/instances
+	fowners nova:nova /var/lib/nova/instances
+
+	keepdir /etc/nova
+	insinto /etc/nova
+	newins "etc/nova/nova.conf.sample" "nova.conf"
+	doins "etc/nova/api-paste.ini"
+	doins "etc/nova/logging_sample.conf"
+	doins "etc/nova/policy.json"
+	doins "etc/nova/rootwrap.conf"
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+
+	#copy migration conf file (not coppied on install via setup.py script)
+	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+
+	#copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "isntalling CA files failed"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/nova-sudoers"
+}
diff --git a/sys-cluster/nova/nova-2013.2.9999.ebuild b/sys-cluster/nova/nova-2013.2.9999.ebuild
index d9a76c3f19c6..fdd850c93456 100644
--- a/sys-cluster/nova/nova-2013.2.9999.ebuild
+++ b/sys-cluster/nova/nova-2013.2.9999.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/sys-cluster/nova/nova-2013.2.9999.ebuild,v 1.8 2013/12/03 20:14:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.2.9999.ebuild,v 1.9 2013/12/19 03:18:19 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -50,8 +50,8 @@ RDEPEND="sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
 		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
 		>=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
 		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
 		>=dev-python/python-cinderclient-1.0.5[${PYTHON_USEDEP}]
 		>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
 		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]