fixes for bugs 474060 and 474062

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

5 files changed, 53 insertions, 26 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index 70de5679521d..bba78a73f432 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,14 @@
 # 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.15 2013/06/09 01:18:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.16 2013/06/25 19:04:50 prometheanfire Exp $
+
+*nova-2012.2.4-r3 (25 Jun 2013)
+*nova-2013.1.2-r2 (25 Jun 2013)
+
+  25 Jun 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +nova-2012.2.4-r3.ebuild, +nova-2013.1.2-r2.ebuild, -nova-2012.2.4-r2.ebuild,
+  -nova-2013.1.2-r1.ebuild, nova-9999.ebuild:
+  fixes for bugs 474060 and 474062
 
 *nova-2013.1.2-r1 (09 Jun 2013)
 
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 83328af164b7..e5d6559f8f83 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -6,25 +6,25 @@ AUX nova-folsom-4-CVE-2013-2096.patch 4545 SHA256 b7203f3d380b3d545259060872933e
 AUX nova-grizzly-1-CVE-2013-2096.patch 4019 SHA256 d20b89067fb63f4d37ebc5c258841c3d18bd9e4e59c455f247f8df1a25973be6 SHA512 e4b80eaf8260765534d1a69c1c3883c794e611ac17acf299443b519c09503f0f063bc2ea1b090e1519e30ef3afa84253ce0e2603a764001556e52c6b09bfc814 WHIRLPOOL 44215c9e48d06976ba372421b5de29083a72172f1f02a84649eecd1dff675ecbdde9be69851ca10fe194346ad750e900c1dafa0ea4be8799c4bf055126bd18e7
 DIST nova-2012.2.4.tar.gz 6286004 SHA256 883a44282514b484a1187c07875834b9c4648555bf20002aceb1d6731ebd0252 SHA512 c05705c7802035232921e7ca9cdcea05571f4771dae573f9364b740553e470d8e4b4e832bf04120c089bad48a75b8493921eefeb28383f70620495a935ad6ec3 WHIRLPOOL 9e8c56b1a66f15f5f6218413e1cd518a0e73f371baea774023a11ad38abccae3e172ec0894fd77f59848685d1993451499916b94c62289d16f57470005e7c123
 DIST nova-2013.1.2.tar.gz 5748169 SHA256 964be1ad9a2578f3441e9c61553b5bac464aec9a35d4f4e941325adab0b2206b SHA512 a8d83e9ca61e6334f86f0c1cfd89ad02a2f9dde60c8f4f54ac99a07578e836929191029360280b6776b7ce5b7a88138bb69f432343a2c376952d32aec2e4c727 WHIRLPOOL b7701694bff7dbc452c3949f30418ec662b9ba3bea16afba30e6c7b649e5476a63848897b79f77e5e7c7e2795a20b1b3bbec41010e961580b7affb4e896845b7
-EBUILD nova-2012.2.4-r2.ebuild 2281 SHA256 373cc5fc31dcd86a31ba1c7e20e5b41463183e557ad514453cb5e1b2e5804f40 SHA512 29242c5343385ac6e99519553ac8a0759b068e03c12557123f4ebafd850533b39fe97baa27e59439c9cb7babc8e92e3e67579a2ac40ae4f8f87e8c4ddda3573a WHIRLPOOL d434f6d0cf0b2856c9a2f32fa877453e44bfc34b5ec6bbeb67fc6ddc77ebbf48b1dbc748a72de99ddc3b0342313af4348632267a7b8db11bcaa83e520c71281b
-EBUILD nova-2013.1.2-r1.ebuild 2646 SHA256 90498548540ee784cd840a5bd09880cdc791cdecc472f56cde4da82f54b80d50 SHA512 5b8e388cf088913b70d1ce4d8c0d3b880d5a1781c0d7515527b89784bdcae1e7f4857feaf59034e03c93a2a80e62a77695a6828887bfd637e955a1c2a44a1565 WHIRLPOOL bed52f7d81e4041dc65039fc90d246cdd8c5cef68a3043a140a47196d16f95d3e8147de67690ec5b104795e23f26b665322a18e7097903f5b4e3968b3b0c80d1
-EBUILD nova-9999.ebuild 2954 SHA256 5a107d052dcc507660f3d278692980889f4f520453e5818c64b2a657411bc576 SHA512 c610d276eb8a81526e5abed19fe794ecc0cbf8206d13a6c92cbad21a0419c1130bdb65f28519a5c53ea1edb83ff4b093ee0971758ea349e8e9a35d33089465a6 WHIRLPOOL 4189350c2a4c85e9d97d62edf01c19a66368c0e3b658260fa1d3b8a78ce0e928f5eb599955438fe49f54154408f8cf3800e648fdbbf0dacc68fa57437866e5e8
-MISC ChangeLog 3520 SHA256 a7a5e0f7c8b33d9ff880fe06a5f93351b62a6da04d40202e916af306f75c03dc SHA512 26c68184dd9bf96cafbca01f1c8ee09da8fcb454e1e365a4190079df5fe43d94a03bca0c176fdde6ecda3a94d8b3fe173302b65542f25dd653ff0a8b3594cf9a WHIRLPOOL c061489abf1710e7cb057da5345dde01d82877ce4c323ddd21e16dfc8d86110671a8f09993a4b9e7028e006e7f79c4a50ec48b82a4fada94c37b743137258299
+EBUILD nova-2012.2.4-r3.ebuild 2674 SHA256 f6bcba48b87962a3d690062fb4b11f5d65bc2ebcd2fec0da184603874c171508 SHA512 25c827a591ec3631278e1479f49373e3f4b086b3eb6c09eda595d364f938ff12e4141898ad0078ac4c56415d3e62a106a0651a9bcd95c858f10c8f6a20566a32 WHIRLPOOL e5149bb51ed417d78a09a2cff7bf7adba6bb7bbd1b9a8ca2c91de10ed42c3feffaebf145872786991429cf4e017ae8d93ccde7fdc8348d5ee08905b8878dc4e5
+EBUILD nova-2013.1.2-r2.ebuild 2976 SHA256 fd1e0802ee744e91e8b3067c7111dc26cf2f52eeef086854b1c54a6ff2725bcc SHA512 d65979935a6453b367ceb2b3d794c977646373a5e12a11d1867b10e040211f1340f5abae3b3335f6605fa8e3a974d6fc4ab8d88f27462069c03044f67976127c WHIRLPOOL 4dbb734ecaef06c8f1c6b6080b7a5d720c0c5e1b1a75fd56de6b8cee14b14d2cf6f02ef414004a6794212a0e2fd5fa0dc8742ca6ff04320e29145969e2c5db3a
+EBUILD nova-9999.ebuild 3345 SHA256 afa6f66e5e92714fbab8e5df3ae7117919df35455bdfc84c2e80d2636d346b9c SHA512 2e07d5c54e1ba0e61ddf52a12c858961bac70ed50e5af6aae49708c136e1f1e81a240648e4251d7931554bb0e23fa503cde394ad6670ff8f0c687040f2e000d5 WHIRLPOOL edcd237c4f24a231f8b48744db02bc21b85c56c74ee05fcf13655e158dbc009a1f7c58d3389ad7d04e021fe503d74777a4242109a0fead7f9cf8cb29d9d47eb9
+MISC ChangeLog 3804 SHA256 102ce5d073c12cf6e01dac71d8b2bcdabe48d343ecea616c7b7456842986d7a4 SHA512 757a114dff7a54bf001b735c9605735b711d3b966e5bd66c1e5100c066bb5ab95d496de496b06ce73461572025f4e10d8b7384ca467a4d794eaf7eadbeeb92b4 WHIRLPOOL bb624c59518fd075bd0787b87f213a0db7351fe2f10c1427585ac9ec203cf25fb69abb15af00ff775ccf45186435e2976a4a8179e048683c05779a94f9fab059
 MISC metadata.xml 407 SHA256 87ac581ad3af018ee16b2c5a8dbc98553ad93fc48bf5cfd62a6f929353049e77 SHA512 4ae00a6fc5411c1795249864317143787b31cb068fb1508f8a1455fd6194254961cca80256e0b437dc131560126cdf5a59d98a5a5064ac49c6e43c1651718a4a WHIRLPOOL 52b178c072593baea26fa3d7e9c06aac003d1a828ffa98de712306f60eeddba92271bc6061d7224a76ac35fa3c1da33213983e998160acf92a6d7027b284bcc0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRs9gqAAoJECRx6z5ArFrD9iMP/0Nt4kPdlxLPWyt/9b9Ig6jG
-m8zf02uriZJaOOipavAM9HJkbj11K9jZ/JFE1S51AW6gJ945aIRQXe8dWFaqrAjj
-xl8vsSxIkv/CJooP5QOprRZQshYvVDFRwEhWCoymNaG2A3/tEahgJQe9b0LLeHeY
-D5I3GZTWtChl6brFmg+NqLNi7q/HoOQix0nsG8A5OrCUH+wW8a97uwzoOoQRO17Q
-Z4IJhJPmFnmBEkj/ph7hz5jVZTcSz235Jl81wFJ5CQZLf5dyN3fs5J4vooeWvQ2i
-km3zezEEhIDTAaJkh3OD2KO5JSpQOlDCctvSDBAFiin9o9ptY54BSKyio59V/IB6
-z/OyneYl5twKw/UnCMxO+T9J7u7KUc50rovCRa0n5vUzjzkDY5xgMnpsF9LJtWqm
-tuj6yNDJITOD42TQ30+urk7o+TjtxpplQ16YzeoxN0M70+kPfYXIwfcGU1M8MrH6
-rxkNzyMSx9D8VSUANhH7NYf/9nSXCTWwAVXaMbjZyezloDIWRgyDDo43VNhJBMOz
-eJgE9utzS2XGX2ss8IXwuvIlBnSf+DSPuzd5sTZ+NiWJJO3qPCMPJPYpU0eQwL+d
-zuKUb+mlaYstvXtqii4oj+M7mqyCtHOrHnO5ukj7lcz6SQvkzKd7Dudt+YW7Lu+b
-hkWI+ZiBx+nHlXvCvx+B
-=RXZ/
+iQIcBAEBCAAGBQJRyen4AAoJECRx6z5ArFrD7KUQAMMzZMl+G4R9GNA+9zyHYgPa
+rHlSSXOOEfA23mIHfW6Ufs8HO9Rs3sos1nc7iMctKyeFw1id+b5KkZDBwEdSL5L+
+eaUYY8jfnSy38sMCVTlYPmQXg9qnxWfgJBqm1K/PSQGN9LUc/I+ltqrCtY5dICqs
+ROZsoNRSJPWzE8tBqhCN+TcuHqcwqhfUU6LTFG1Ae7LkvcsqemEZaUHkv67RYtFt
+Bk/BCKUrm11VMibwlzn/E0gUVf/7UH775/acZWX26OfpRxrW8zuok/ThIT5SB6Hh
+XkMzNOSQAGE9XPyEU744jvsyE1fg2dgthBUERKIar/+3R4V+WCQ4aJjZVWDnZPcQ
+Q+HiIG7E4sj9HXL24wYe3rG+nJM+ib4A3gquCgS+Cgl213h3xH8Sro62tIvFV2Li
+V94UPY/ytObkgbhLSOPVXUVdTEZEoEDTJ34skPBCCNfbN+xIiAgNZW7RRkOMBWsV
+47KWXjicoa6XF3/+VjFVwELrSjJuSJdAgZaPSy1+L8tFLBNsez0Lgwkry4D3qzzD
+qTEDw4oDancnZny19khxSpQc3Cfc9GChz5sXYlyuVK5PPKJmBnCSi+g+qVTw0KNa
+MJI/qQ+bJXpLadn+76HLMt8sTBfWPa/Cvz9sUWDm7XNdUfVN8mHDgNF0WwxAKiSg
+lBkNlsRZqNQfOHZOs2hf
+=l9Nr
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/nova-2012.2.4-r2.ebuild b/sys-cluster/nova/nova-2012.2.4-r3.ebuild
index 4fc43413aaaa..f08ab6c27de0 100644
--- a/sys-cluster/nova/nova-2012.2.4-r2.ebuild
+++ b/sys-cluster/nova/nova-2012.2.4-r3.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-2012.2.4-r2.ebuild,v 1.1 2013/05/17 14:57:48 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2012.2.4-r3.ebuild,v 1.1 2013/06/25 19:04:50 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -63,4 +63,11 @@ python_install() {
 	doins "etc/nova/rootwrap.d/compute.filters"
 	doins "etc/nova/rootwrap.d/network.filters"
 	doins "etc/nova/rootwrap.d/volume.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"
 }
diff --git a/sys-cluster/nova/nova-2013.1.2-r1.ebuild b/sys-cluster/nova/nova-2013.1.2-r2.ebuild
index f032042db550..17eb7a3b7b85 100644
--- a/sys-cluster/nova/nova-2013.1.2-r1.ebuild
+++ b/sys-cluster/nova/nova-2013.1.2-r2.ebuild
@@ -1,11 +1,11 @@
 # 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.1.2-r1.ebuild,v 1.1 2013/06/09 01:18:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.2-r2.ebuild,v 1.1 2013/06/25 19:04:50 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 eutils multilib
 
 DESCRIPTION="Nova is a cloud computing fabric controller (main part of an
 IaaS system). It is written in Python."
@@ -62,12 +62,19 @@ python_install() {
 	insinto /etc/nova
 
 	newins "etc/nova/nova.conf.sample" "nova.conf"
-	newins "etc/nova/api-paste.ini" "api-paste.ini"
-	newins "etc/nova/logging_sample.conf" "logging_sample.conf"
-	newins "etc/nova/policy.json" "policy.json"
-	newins "etc/nova/rootwrap.conf" "rootwrap.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"
 }
diff --git a/sys-cluster/nova/nova-9999.ebuild b/sys-cluster/nova/nova-9999.ebuild
index 4d46c7f634e8..ea025eb59098 100644
--- a/sys-cluster/nova/nova-9999.ebuild
+++ b/sys-cluster/nova/nova-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-9999.ebuild,v 1.2 2013/06/09 01:18:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-9999.ebuild,v 1.3 2013/06/25 19:04:50 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -78,4 +78,9 @@ python_install() {
 	doins "etc/nova/rootwrap.d/network.filters"
 	doins "etc/nova/rootwrap.d/baremetal-compute-ipmi.filters"
 	doins "etc/nova/rootwrap.d/baremetal-deploy-helper.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"
 }