fix for bug 474064

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

6 files changed, 177 insertions, 23 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 738ee50e2f05..cb1bbcff01f2 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,16 @@
 # 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.10 2013/06/24 20:40:31 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.11 2013/06/30 23:46:58 prometheanfire Exp $
+
+*glance-2013.1.2-r2 (30 Jun 2013)
+*glance-2012.2.4-r2 (30 Jun 2013)
+
+  30 Jun 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +files/glance-gbug-474064-folsom.patch,
+  +files/glance-gbug-474064-grizzly.patch, +glance-2012.2.4-r2.ebuild,
+  +glance-2013.1.2-r2.ebuild, -glance-2012.2.4-r1.ebuild,
+  -glance-2013.1.2-r1.ebuild:
+  fix for bug 474064
 
 *glance-2013.1.2-r1 (24 Jun 2013)
 *glance-2012.2.4-r1 (24 Jun 2013)
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 88869dae6d32..50143b9bc8a0 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX glance-gbug-474064-folsom.patch 2357 SHA256 1a8cd2bc81de9d8149590b0f11a30d13928740ac1548ab4a5e934a311f1b0d18 SHA512 7a2005899c88cd29ef1be1b3c6119767ad2ba62b878438cb4aabecea677579c65c654526ba9afac8c73016d6b8085a6fad0016167d06437087abfc8e0ab26bda WHIRLPOOL 497a415c7c1d09075ca0e809f7dc75b2a4147bcdf53e6ccb64e439d507972dfd7336e69f980f9673ce59e1047adb5497351386bdeceaec53022a79a417c129bd
+AUX glance-gbug-474064-grizzly.patch 2377 SHA256 df92ba14455d4379f0c2297f1f087d7f3f08118e6129e45b0e5bf5fd26c7aba1 SHA512 a284b6002c3b4ae39678eb0c492b3adb6311b115761ef43f38427dc08670c0ebfb4011a3879291ee6acdf9480ca135b4cff77f41b7af9fe7a837effafba2c6f0 WHIRLPOOL 8adfcc80adf72b501a7123c29454c446b86c05917cc8a910f799db5c223fc0efb02240f36b842c05c08e8347ae6d6273ddfa088a03f0f65eee0cbfc40176c9c2
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
 AUX glance.initd 1206 SHA256 23c091ad32832b9a522518676427a2f98bc7dfa826c0bb67a0f9befaa615cafe SHA512 cd0a13ee2a7134cb2917cf2d5579f63c88a6d04769a1370ef5bdc1cfd8ebe7ad2986c501b976ae9752688c177c7a71457bae79cd3e89f84dbf9d5ac259f4099a WHIRLPOOL e59dd3a7a11b3bd74abfbc5e29bc84ce4ff3381ae411359d0d097e3123487d2eded8aefbc54f0a7feae06ecea0861e16a1cb0bd7fcb467a7c714e9c65afb7dd1
 DIST glance-2012.2.4.tar.gz 643408 SHA256 d50fa522e890258eff32aad1947684abdf0cf0c67a8a487f60a7179a84edd3f2 SHA512 fc91d799fa5fd2c66aef228d622c852623e70fa83e5babdeb10e041f77571e5a08c90c6fca16943dc98ca1cd50a09314fc5bd282e5530e7e1e44a623eee28198 WHIRLPOOL 34fdfab54444845ed4a3c0e849066f01ef88cf4317d952a0fedf562f331a41c87572d80234296651a722770929472de9263f7ded37deaaf6d65f35723e41031c
 DIST glance-2013.1.2.tar.gz 719039 SHA256 55d12a314f6fa5d291c0a0f9be4ad9d2b53086a9e47fad82d83bcf08105a65a0 SHA512 124d8d133bdbdab5b1bf43d7faa3249b14d91fed2edcc0621619865ad0fe22021d98d37786d8866a97e6b4613968b82985f7778be37f0e7f71e5e56299a1f680 WHIRLPOOL d57b5b213a25155436a941a2c44144dce31be7d23a168765fb59f8956148460d0e8c7b3052362f03f0acc9ee520b73d5a3e0ac9dec9a410318942501a6beccb6
-EBUILD glance-2012.2.4-r1.ebuild 2516 SHA256 55e1bb77c782ef8dde38bf0c69f7f05a3c36750775ae8a5e44c2310bbb2af5c0 SHA512 b2a8ad5503af0af684a5054f7c48832e6e33995298533aab27f9168fdc9b5ef090c74be227f63e379a46fe9595f20467fd466c8103975afdc1df7927b25b299a WHIRLPOOL b509ea43ebc75223a3007f55a161fe4748ed640a1b7f7e673de505539b7b838b581a6d01612d674401969f9cbd6708d7d18afc36d36f024643b6628c2ea801df
-EBUILD glance-2013.1.2-r1.ebuild 2695 SHA256 87e33333235699bd16e8aa51cd6540599992d967f7c41c42742e71e8911a8f48 SHA512 702203dc756e8c4ad5c31fff32d393cfb524d6f7f4459e4625608103a777ed3ecb406c4e38ebd2f703d6be91a47db9fb963d0961585382997d78a415c958eae8 WHIRLPOOL a03e3e8c2e395e2af113a51fb121cd36b6a5e253fc6bbb4415b9825eef58052e840b0630b5289af2f2c62d78a465c272545c8853201fed21730a0e4106d3a270
+EBUILD glance-2012.2.4-r2.ebuild 2564 SHA256 8d99d82f913fa8e5f99df4e7b157e49f93e41746a3a35d2dddfcd8b43c6d842c SHA512 f55cec79be5366f113428a84c414fe89c7a694a77a9f405bace6a2d5a4f6fd2995d992f671c6b8e097d9fa93e88bfddc87bf9a6ecb02c61d875f372c4812a78f WHIRLPOOL 72b0b8f4001cc4a8f160fd843086591d3ef0b1c365af27958c4b192655b96b758e0926dd649bda023121c8b83cf42922b03b874bb5f8dbf21aa7d9fedefa4200
+EBUILD glance-2013.1.2-r2.ebuild 2735 SHA256 5a1d06b4c32c00e2a5a8f3e6fa42b390fb3f7388c5711660b404f504e44b69c5 SHA512 74c7b4e4d5d800065f67b32f42124e174d648417abbdd05960d5ff3b6a97c7fd43bc1afe9f249eb28ede34acf69e4bae2795dd56b77402ceb699372457515d5e WHIRLPOOL 7fc308552cae17f064ca647257481f4d3336879dba56a61aa1429d6a83e7c392e2eccbde7af0700f62b83762c6342e287ae23946a9fd9d48c2f0550d87cc47c8
 EBUILD glance-9999.ebuild 2407 SHA256 554e8efefd7ef9b86422810a054d38a275ed88a41875a6a20725e157d5dd9e32 SHA512 221eaff137650344f7077496cce86e9fc8fe803bdd35a3902ea77afee41fce7b067c5cae821f92528a6f3047d4cd42a0441030a7dba223adc1fb877cb4549ad0 WHIRLPOOL d27f6c0bd535f8164d47b63b34454b41980413ddc61b3e541fa2c08e68506883c491c6aacf9fd5340d664470fc0e2ea61c7a9d947753ff62d9b1ed3e63599621
-MISC ChangeLog 2253 SHA256 ef5dfb71f12e7362a78b0ceb094f1035f2b77bc7586fe3bd640949867a8d94d6 SHA512 c462d723fe8818c7a73b9c641ca86e9859eac313119594618a4a6b4a33e37bbc4c9f1e59a08e3bbf93d2e257be5aad0bf0a27cde1233e758422b01d130766b85 WHIRLPOOL 3c6b1f2ebdaa45f9e68436e7ebc283ed4e2a3bfcc4b1c33076c51fe48ee5a55a2874e987d0186186573a93ea5c54c116c0d40be3743252f74613680a343b5c69
+MISC ChangeLog 2602 SHA256 f651893c7039cbdbe9df56674c213afec52c8ac73a6b1b8a12f192bbeea6b7b3 SHA512 f73181930cf31e09dea004add438feeda93cdab93645ae242fbc8de9f78f04437244764868176c0a0a88a58ef70014b481159b13b1c55dd600435620b628ca71 WHIRLPOOL 08f1ee86c4d571877844f679228e95b33a10470975c529471d9158cc6fe383b43b7f30c8c750d1ecaf4bfdab6a137c9f22461ae11ed484f15a047b1e957ef275
 MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRyK7WAAoJECRx6z5ArFrD2pQP/3Q1rxfyoVsFmiwfTJqI4R6Z
-kopEhyB6D0vPb6XginEk8k7FdipTxeaSDf+npvYm6emmdYslxImmxbuejdEU6/4+
-i2vimUbP0SNLwlhjQpxXBPLLqjwV22S6nGLD3yoL7lwp0b3MDd9V/1WJbZbJJbL5
-ftsD9t8iuuBlaVbDo/WzqWKjhSLMiBb5U1k18O+0e+cfLraQSqR3d9gjVH7U8Kwl
-2CCfdQxQnZew9tstbQO6NalZ1BJvqY0bstGVlcjDAVGOErzdpCOYhvMtXc/iUzHr
-I2DrQriIqOTu/ve1R8Khmfg4YI/RLbNzD4ZSoaP5bvK+Fgy/MN8Kh3qyM4SXFlRE
-FcFKTHGPOYSKK1J6nFlPMG7d2tfOY4oqzApN5360DKOHNj701X4RE8Be2AUN5I0p
-NyPSLDeDsO+zLBIIOREc+ZmgBTNg0o5MrELlQl+0bjCe/XvbSHgREddBm2lekyba
-eFIOJIIDpts8x4vZfCYEeGZEi8GS4u8UlFrgNDwFCnPduZmwjM2jX/KL/HYvlH0y
-aJMQ+X2psyHaDUSTPTX6TohW5XltnrFbPfX/wt7yC/LkgXHdigjCOCOrGtIRyENL
-pQvx5CshjIY6Tkw2jSxe58JxZTf4hy43elLKNfkDIJagwSY+KZR5PKIR/7btWTes
-KH1aBb6k2EmV3WjhAUlp
-=NiK2
+iQIcBAEBCAAGBQJR0MOIAAoJECRx6z5ArFrDIokP/1SzMdNExvzAmB7cIT+mwV/f
+19+NvrD64fEzfohWLDPjX3PCVfpkdEgwvzanjC8uvXehK1qrqbjCnor1kdZTD2cy
+LoBmdRTFVMn1eO2p/g8yyprZiZJfOLnzqNV5+yE7A+Scys8OLe10XpDvDo31QMUW
+L8vyxzmPHrLQC1zxec63ZDX8+Bf04+WJ/kkCrdPZ5fLkdJHLglvua8GNF9wMW7qP
+ojTJ230aWKQt1SO92A18rm8/zeevsiOkoxZyZKo17intxPvpBEqgduUKLGKXA9E9
+wnzBmeepO8Y7+PwxnFRQZ5qMNQJPTNpqzh0+5qPDkAgCiP36oKVi5BmwxGnQlAap
+M2Bzc507xIMyk419uLO4udK/mWKhAZ/ah0G9WFbXA4WVepG61woIaFIksmyGrEL8
+wEXJNVAfhFfahMZ7Ltd0ulcwguXSm/bv+sFHfEV18+vfmzVis/z9f5ho5Z67Fch1
+g0OZRvkwdENR1DmJw8+pAprq+WlIrA/jThYiMhgysAQJkdgzvhDFqCzIXcAdDvDn
+3E/jJpnfoiyW7HsxLEJdDvL/NiQlIzlOOD4GrzRGki9KmaUcbXCKPtusW23eaAId
+7dRjPk4htOisZUmjGGlQmcj9cXc8gLIrROZ+IWcjqVwgXZxQ8s16oWLMnIoJWmD8
+6o299ud7djFA/jeqGFpn
+=bLvJ
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/files/glance-gbug-474064-folsom.patch b/app-admin/glance/files/glance-gbug-474064-folsom.patch
new file mode 100644
index 000000000000..f63a05b315dc
--- /dev/null
+++ b/app-admin/glance/files/glance-gbug-474064-folsom.patch
@@ -0,0 +1,70 @@
+From 28d0350070c6120a83287f0846c59f50814bc37a Mon Sep 17 00:00:00 2001
+From: "Mark J. Washenberger" <mark.washenberger@markwash.net>
+Date: Wed, 26 Jun 2013 15:41:25 -0700
+Subject: [PATCH] Don't rely on prog.Name for paste app
+
+Relying on the name of the program breaks packagers who need to move
+glance executables around to other locations on the file system.
+
+Fixes bug 1194987
+
+Change-Id: I7721c5181b17b1f34adc279c055dfff5d17b57e5
+---
+ bin/glance-api.py       | 2 +-
+ bin/glance-registry.py  | 3 ++-
+ glance/common/config.py | 5 +----
+ 3 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/bin/glance-api b/bin/glance-api
+index a82261e..5244b84 100755
+--- a/bin/glance-api
++++ b/bin/glance-api
+@@ -53,7 +53,7 @@ if __name__ == '__main__':
+         log.setup('glance')
+ 
+         server = wsgi.Server()
+-        server.start(config.load_paste_app, default_port=9292)
++        server.start(config.load_paste_app('glance-api'), default_port=9292)
+         server.wait()
+     except exception.WorkerCreationFailure as e:
+         fail(2, e)
+diff --git a/bin/glance-registry b/bin/glance-registry
+index 678bcd1..39bc3ee 100755
+--- a/bin/glance-registry
++++ b/bin/glance-registry
+@@ -47,7 +47,8 @@ if __name__ == '__main__':
+         log.setup('glance')
+ 
+         server = wsgi.Server()
+-        server.start(config.load_paste_app, default_port=9191)
++        server.start(config.load_paste_app('glance-registry'),
++                     default_port=9191)
+         server.wait()
+     except RuntimeError as e:
+         sys.exit("ERROR: %s" % e)
+diff --git a/glance/common/config.py b/glance/common/config.py
+index 45cea5d..cd4feba 100644
+--- a/glance/common/config.py
++++ b/glance/common/config.py
+@@ -158,7 +158,7 @@ def _get_deployment_config_file():
+     return os.path.abspath(path)
+ 
+ 
+-def load_paste_app(app_name=None):
++def load_paste_app(app_name):
+     """
+     Builds and returns a WSGI app from a paste config file.
+ 
+@@ -170,9 +170,6 @@ def load_paste_app(app_name=None):
+     :raises RuntimeError when config file cannot be located or application
+             cannot be loaded from config file
+     """
+-    if app_name is None:
+-        app_name = CONF.prog
+-
+     # append the deployment flavor to the application name,
+     # in order to identify the appropriate paste pipeline
+     app_name += _get_deployment_flavor()
+-- 
+1.8.1.5
+
diff --git a/app-admin/glance/files/glance-gbug-474064-grizzly.patch b/app-admin/glance/files/glance-gbug-474064-grizzly.patch
new file mode 100644
index 000000000000..b8f3d0a346c1
--- /dev/null
+++ b/app-admin/glance/files/glance-gbug-474064-grizzly.patch
@@ -0,0 +1,70 @@
+From 28d0350070c6120a83287f0846c59f50814bc37a Mon Sep 17 00:00:00 2001
+From: "Mark J. Washenberger" <mark.washenberger@markwash.net>
+Date: Wed, 26 Jun 2013 15:41:25 -0700
+Subject: [PATCH] Don't rely on prog.Name for paste app
+
+Relying on the name of the program breaks packagers who need to move
+glance executables around to other locations on the file system.
+
+Fixes bug 1194987
+
+Change-Id: I7721c5181b17b1f34adc279c055dfff5d17b57e5
+---
+ bin/glance-api.py       | 2 +-
+ bin/glance-registry.py  | 3 ++-
+ glance/common/config.py | 5 +----
+ 3 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/bin/glance-api b/bin/glance-api
+index a82261e..5244b84 100755
+--- a/bin/glance-api
++++ b/bin/glance-api
+@@ -61,7 +61,7 @@ if __name__ == '__main__':
+         glance.store.verify_default_store()
+ 
+         server = wsgi.Server()
+-        server.start(config.load_paste_app(), default_port=9292)
++        server.start(config.load_paste_app('glance-api'), default_port=9292)
+         server.wait()
+     except exception.WorkerCreationFailure as e:
+         fail(2, e)
+diff --git a/bin/glance-registry b/bin/glance-registry
+index 678bcd1..39bc3ee 100755
+--- a/bin/glance-registry
++++ b/bin/glance-registry
+@@ -51,7 +51,8 @@ if __name__ == '__main__':
+         log.setup('glance')
+ 
+         server = wsgi.Server()
+-        server.start(config.load_paste_app(), default_port=9191)
++        server.start(config.load_paste_app('glance-registry'),
++                     default_port=9191)
+         server.wait()
+     except RuntimeError as e:
+         sys.exit("ERROR: %s" % e)
+diff --git a/glance/common/config.py b/glance/common/config.py
+index 45cea5d..cd4feba 100644
+--- a/glance/common/config.py
++++ b/glance/common/config.py
+@@ -183,7 +183,7 @@ def _get_deployment_config_file():
+     return os.path.abspath(path)
+ 
+ 
+-def load_paste_app(app_name=None):
++def load_paste_app(app_name):
+     """
+     Builds and returns a WSGI app from a paste config file.
+ 
+@@ -195,9 +195,6 @@ def load_paste_app(app_name=None):
+     :raises RuntimeError when config file cannot be located or application
+             cannot be loaded from config file
+     """
+-    if app_name is None:
+-        app_name = CONF.prog
+-
+     # append the deployment flavor to the application name,
+     # in order to identify the appropriate paste pipeline
+     app_name += _get_deployment_flavor()
+-- 
+1.8.1.5
+
diff --git a/app-admin/glance/glance-2012.2.4-r1.ebuild b/app-admin/glance/glance-2012.2.4-r2.ebuild
index ebe04e699d3f..51a6bc0470da 100644
--- a/app-admin/glance/glance-2012.2.4-r1.ebuild
+++ b/app-admin/glance/glance-2012.2.4-r2.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.4-r1.ebuild,v 1.1 2013/06/24 20:40:31 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2012.2.4-r2.ebuild,v 1.1 2013/06/30 23:46:58 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -48,6 +48,7 @@ RDEPEND="${DEPEND}
 	ldap? ( dev-python/python-ldap )"
 
 PATCHES=(
+		"${FILESDIR}/glance-gbug-474064-folsom.patch"
 )
 
 python_install() {
diff --git a/app-admin/glance/glance-2013.1.2-r1.ebuild b/app-admin/glance/glance-2013.1.2-r2.ebuild
index df8fa277296b..6ba5f00ec8d2 100644
--- a/app-admin/glance/glance-2013.1.2-r1.ebuild
+++ b/app-admin/glance/glance-2013.1.2-r2.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-2013.1.2-r1.ebuild,v 1.1 2013/06/24 20:40:31 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.2-r2.ebuild,v 1.1 2013/06/30 23:46:58 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -46,14 +46,15 @@ RDEPEND="${DEPEND}
 		<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
 	)
 	sqlite? ( >=dev-python/sqlalchemy-0.7[sqlite]
-	          <=dev-python/sqlalchemy-0.7.9[sqlite] )
+	          <dev-python/sqlalchemy-0.8[sqlite] )
 	mysql? ( >=dev-python/sqlalchemy-0.7[mysql]
-	         <=dev-python/sqlalchemy-0.7.9[mysql] )
+	         <dev-python/sqlalchemy-0.8[mysql] )
 	postgres? ( >=dev-python/sqlalchemy-0.7[postgres]
-	            <=dev-python/sqlalchemy-0.7.9[postgres] )
+	            <dev-python/sqlalchemy-0.8[postgres] )
 	ldap? ( dev-python/python-ldap )"
 
 PATCHES=(
+		"${FILESDIR}/glance-gbug-474064-grizzly.patch"
 )
 
 python_install() {