fixing bug 490838

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

5 files changed, 114 insertions, 14 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 60ddfeec992a..65b61912d5db 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,10 @@
 # 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.25 2013/11/14 11:08:12 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.26 2013/11/18 03:02:59 prometheanfire Exp $
+
+  18 Nov 2013; Matthew Thode <prometheanfire@gentoo.org> +files/glance-3.initd,
+  glance-2013.2-r2.ebuild, glance-2013.2.9999.ebuild:
+  fixing bug 490838
 
 *glance-2013.2-r2 (14 Nov 2013)
 
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 6d6c2d52ce72..03a428fd4db4 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX glance-2.initd 2102 SHA256 8ddaf11b40be8084a5377acd479ff2966f5db7df17be1e65831067903b5d7a28 SHA512 1e15817b7c2ba7c58a4eda3a5f92d47795e5088c04adbf9bc692f60aa7cf08be659dae30ed6ac0fd42857f75e869b42a76d7e48e0bb72f50a5659b32386c08cf WHIRLPOOL 50125c4bf247fe85e25e77c99b92931587b6c081c02b9e4a13f143996305f320ffb431656ab31d9bd11f217807c4c5f09663b53b128366d1cd7ad582a5d5b1bb
 AUX glance-2013.2-sphinx_mapping.patch 582 SHA256 043c3f7ef413cf3675920880af57943b909ec9f3376f6e86a1ae1d5948d9ad98 SHA512 d012ce5eaed00c3ba7b6219813cee503f68cdb14b8e50eedc731afc63767e1867749d6e4824611e0d024b2fdebfe5a2b3ad53b0ad7b18a39defcc17094da4a0f WHIRLPOOL 659bf94e7740be3ea0d2f130b332e694ebdcca8b90acfb479b8502eec4b867eda999ec2c6cdecc1f3dcbe3e3ddf72798c76bdf16ab4ab561ce61975a451c4585
+AUX glance-3.initd 2153 SHA256 2052c6bbe5651a429ed62a20b5f92540d86bca5380e4350be13c8a601fb4b462 SHA512 5943e61b93a0bbaf5986434e9b915d3ce91bdeb5aa243503deb7a116b68b70151c7088f6039fcaa5018088d27d49067ea23217315980f79c19e8f29eaf77c19c WHIRLPOOL 243374c66fc6b34b39e6d475a2dabc35bdcd5a1ddf7a2158ae725fbf25919651f95960c8af17900cca33a49b40cbc60be0d37c1f11d79941387937bf625e98a7
 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
@@ -12,16 +13,26 @@ DIST glance-2013.2.tar.gz 1614843 SHA256 135fb1b6fe8410894b9d070071e1b7d7ddd37fb
 EBUILD glance-2013.1.4.ebuild 3146 SHA256 1ea12e958ef036f33d7479bf594251c189d922af33cf4ddb0441ad429193bd96 SHA512 b8fa8788dbd8274fa43fa0dfe88fc8f43f832a82913d4816174bf771639eeb907659faad3315981706bac41b7143b75c5c3ae50d5ad8794d4fd9c88c932ae99a WHIRLPOOL 6a7826ce32d9ba75111c58d130366602d706f406ad0cfd4fa17f42694d73c985cf0c19ffb3f26f78fad58cf88f101456bd6e4614c29f54609e620c313f19626d
 EBUILD glance-2013.1.9999.ebuild 3108 SHA256 d5c2be3191fe463325739e687b6c1bcd8a3a0368a74070e505e0af99d7426c47 SHA512 9184b27115d249582d04a8685f5d9388613456007ab672dc91fc466f17cacb44a2b7f12367ad32300b745ed1ae59e6649348e6eedc87b4f82bf7e14325665727 WHIRLPOOL e770e0e34c1cf1a18241027bf6dc65b20cf44ce082aec50aa46b1414e03fcb0edbdf4a5329db4b045afa1ee6d3dc67939113d84c97036bf2404baf18a0c5d567
 EBUILD glance-2013.2-r1.ebuild 4819 SHA256 f00d7c59e5c6820250e8c6fd6620185f5c1a6559cd3c03ba3596176fd4a0d233 SHA512 379ebe6b0b49a7cd55f14845c246ef74e39135c864337e296ca443217461636904e25cfbeb22cd20f16f68e4f23532a228f33520b69a3a6fc4244e9c6d081a02 WHIRLPOOL b4b7fd7453e463ecfe5e9b4e2b89668e61df6c0bdd675def166f5b2d38513a81aa5120976f91344749dc121331694e94a4b25a1537178a8d034e6c1c2a69c792
-EBUILD glance-2013.2-r2.ebuild 4985 SHA256 a1f6c02e1396cc2c668556067d4c7b6f2531aad7cace0647b4ed6da123fa536c SHA512 7c39995205fbf3ee139af30535ea8b5c3b1cf745b035f0e2af2235110ffebabd0ba3a0a9b6cae7d4bdcd266fd2c29bb6fb44e02cc704c31bd02909022d91c977 WHIRLPOOL 982e86cc37dc9dc360a853cb049195f6b8571117ad18f39cf822c5627e990d741a4b25f2f6aaa2905f9541291814096c69a9864c973c1dda1aff4d3f6242aabd
-EBUILD glance-2013.2.9999.ebuild 5005 SHA256 8bf6246dc96a34122d1aa6849256ec9fb10abfab422814556f5624024968547f SHA512 539f9f37839ca4a852c9609f43838ed416662f19afd0d28abe1de8819b0ccb26d45a8ed2bdc2556cf05d717e5bb28f140042207a3e8e75d024699dde25a293fc WHIRLPOOL e120ff43a411b1c67d8d5d313d64a98e9c2c5afab54d010b8cf3eeb381e96a659943e777dc1522114312fad263cf6372be7d1d28e428f89a60a1e384a5fff219
+EBUILD glance-2013.2-r2.ebuild 5189 SHA256 91111996da560d1463dc77caa6c4d553225262ac079995bfa0c6b254ff6d8174 SHA512 38967a6d4c4240121b7178c498dc7142dcee6e72fcb5dec2ed62a23d90ab44ef9425a30569cafe0d4d6c2fb711caa7a681a0d87eb942a1be7b0bfae81ab4fd36 WHIRLPOOL 862b1e44147a0550259638e0bd83692c07cd896582ec3691ebe2943eec886a75aabc7e85698d07fa4cc17c00e7778e2940876ef05d0e8f9e81b378136e2fcbcd
+EBUILD glance-2013.2.9999.ebuild 5209 SHA256 e9df2042025369eb834e58ff5b839b74a24ac343b5595d95f1f9de931c0b1ce7 SHA512 76a5f68f5bd07211d9ce0b433a3927b611cc4fd46b33a362d94ea87feee4e27b91bd3b09e13bff20d258ab6bb8d6a0d2673720466db4b7fc6d6fb943727d8fea WHIRLPOOL 9ed2b112e31ac0aa3f340af053aafcc773d0c05b050c0e7da5e3ee994156d782079466bba3be9318926017e8cd392740754d5c4487e41691242e5d58c59ea483
 EBUILD glance-2013.2.ebuild 3339 SHA256 b8f47bd6d8a6cbf7b60fcaac9eb71bbf1c46eb0e33113a1b40cefc405e20029d SHA512 2559cad07c9ad4a21a12873029d00a379a9ceacab3551f9ce92869eaef161ad54af17751f5345297f3dbbd156f41c5a8c712767496c5c56d9603a4ecd8c2461c WHIRLPOOL 79d22ae2f09b9c5c80f0d2da0852f5429c7f3c431dfbbb0c4e7d768abd77415339144d918a38e19db38258bd8282ea77322363c06fbcd41f4825dcd1ab472918
 EBUILD glance-9999.ebuild 3031 SHA256 70283c6d4784f1a524210e9fb994f5e2ab14a133581f509f833253a2fc07243f SHA512 a79d8ae559f26eba446c25ff48c58cc524bb399862dae936fed91c129facde0da906019458b586102ad5d13fe025eddf2d2a19b57a74e9395b5e6ecf33f05637 WHIRLPOOL a8ed52c906b9d840b312b39f458780aed6f42b1b0dd6a67fe5e27b04a5926bb5565ceed7ba425eceae5c43aceb3335272714d58ad64f5121e35db5d132db476b
-MISC ChangeLog 5761 SHA256 7a79449482401e502ac8f39458b57ab79b610ad4d0b4147fb786cc3aa44ae290 SHA512 98779e9c4cf82c8df3d0d75892f04d72d93b29e0998c299d9d720e23e4b78465b6be87972c6d27deb90fb2d7fc3615df7e31ca70571e025404e37ca90d917a3d WHIRLPOOL 81e6a732fef01a5d5808d6df24cdacf5a702134fc66e0e1c65f12bc3d52e80583a297535f3d47e4ff7b6b240a2925e375d3d55fb134aadd050ef046242582e84
+MISC ChangeLog 5923 SHA256 6981aea9e782d441ece2f59856df29d6d22b5ed6b1a424d2caa210ef63710874 SHA512 6209e6a66620b8cb42aa35198f56bbb70ab634e66afb4ab1a295da726eb53e280fb75cb779cb9c8a42ab47a61c6a25f6421ffc5c9ab508bb0f319002478d8fb4 WHIRLPOOL 123e40864cda360a6b82b537883db10b9f9bd7c913ea017661c8ef163af31da8029283ac8a74a8c38c2855ad468a9437cbfd396f465ba02f20d89471d342f151
 MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKErywACgkQso7CE7gHKw0W6wCdEvB9+ojS4pN7PjxjtrNK/vTz
-+MkAn1dRJV/qe39ZEkKgK9gRDKlDvgVN
-=TMPt
+iQIcBAEBCAAGBQJSiYP3AAoJECRx6z5ArFrDVYwQANgV9TjDjbQQZ7llm3oDseTO
+XQQui2URdoLmC8EapSG/2qqwlSxOL55HBTVkhoqTZ220kB9GG1mdL9TwT8REl5dT
+iAiV+MEUehWojq8JB8qmXK44ffSF3i7QeVkw2SsFUNiLHsDpPdYgkZKrvHp7FPHc
+QE07c2H0t8d1rZtfhBItHEvK/dw/Ed0AZ11RbCXdzsIUeBXYKtIfoGp/euPVGD14
+72qnLllyfQ8Wg6x7iBn8uE2W6BphLWHg9fKOHNdBHI55dvREpEnP0oVbmy3UeVWi
+aPL7ec9WjuiZpcBavOIhzdePlHag2Ai52mHrhblpkSdNPU6qBIJlOkyrjU8+iQod
+XEt0yReFIgYDnpxRM/N7mZB2bI+MP1GRfNKbNNydzzYj/Q5R/x0RsK6vUPX+E7Mq
+Og1n9B/sGoYe+2f6yYrMEfFHEXMC0LJtaXImsDZi7kdDb/fAyXct3N+AbXGEjwGU
+CFO28dVG2Vu9RiDo30L/Q8VVOrlf23Y95yFKKAwgjAZO5czuy4ckxDLqdMSs/Q5W
+JdyOtiETajOh0t6HCE+n5221UUAHYps/RGwFtb8S1gJhqlhMOf93HfmFw142S3vi
+QYO1LeyK5iCJ4uMNW4XCgoTTCgYTWwyfcjZuLUX5ODWVjZf0suXgh3+cTdZwMnLp
++2Mgv6rTfzRMKWGGItu7
+=5Ymd
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/files/glance-3.initd b/app-admin/glance/files/glance-3.initd
new file mode 100644
index 000000000000..5292c8ec1ead
--- /dev/null
+++ b/app-admin/glance/files/glance-3.initd
@@ -0,0 +1,71 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/files/glance-3.initd,v 1.1 2013/11/18 03:02:59 prometheanfire Exp $
+
+depend() {
+    need net
+}
+
+BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
+SERVERNAME=$(echo $SVCNAME | cut -d '-' -f 2)
+SERVICES=( api registry scrubber )
+if [ ${SVCNAME} == 'glance' ]; then
+    SERVERNAME='all'
+fi
+
+checkconfig() {
+    if [ ! -r /etc/conf.d/$BASENAME ]; then
+        eerror "No glance conf.dfile found: /etc/conf.d/$BASENAME)"
+        return 1
+    fi
+    if [ ${SVCNAME} == 'glance' ]; then
+        for service in ${SERVICES[*]}; do
+            if [ ! -r /etc/glance/glance-${service}.conf ]; then
+                eerror "No glance-${SERVICE} config file found: /etc/glance/glance-${SERVICE}.conf)"
+                return 1
+            fi
+        done
+    elif [ ! -r /etc/glance/${SVCNAME}.conf ]; then
+        eerror "No ${BASENAME} config file found: /etc/glance/${SVCNAME}.conf)"
+        return 1
+    fi
+    return 0
+}
+
+
+start() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Starting ${SVCNAME}"
+    if [ ! -d ${PID_PATH} ]; then
+        mkdir ${PID_PATH}
+    fi
+    
+    start-stop-daemon --start --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" --user glance --exec /usr/bin/glance-control ${SERVERNAME} start /etc/glance/glance-${SERVERNAME}.conf
+    
+    eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Stopping ${SVCNAME}"
+    
+    if [ ${SVCNAME} == 'glance' ]; then
+        for service in ${SERVICES[*]}; do
+            start-stop-daemon --stop --quiet --pidfile "${PID_PATH}/glance-${service}.pid" \
+                    --exec /usr/bin/glance-control ${service} stop /etc/glance/glance-${service}.conf
+        done
+    else
+        start-stop-daemon --stop --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" \
+                --exec /usr/bin/glance-control ${SERVERNAME} stop /etc/glance/glance-${SERVERNAME}.conf
+    fi
+    eend $? "Failed to stop ${SVCNAME}"
+}
+
+#restart() {
+#
+#}
diff --git a/app-admin/glance/glance-2013.2-r2.ebuild b/app-admin/glance/glance-2013.2-r2.ebuild
index f0c77f4281e4..db0fc8426d4b 100644
--- a/app-admin/glance/glance-2013.2-r2.ebuild
+++ b/app-admin/glance/glance-2013.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.2-r2.ebuild,v 1.1 2013/11/14 11:08:12 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2-r2.ebuild,v 1.2 2013/11/18 03:02:59 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -70,7 +70,7 @@ RDEPEND=">=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
 		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
 		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
 		<=dev-python/iso8601-0.1.4-r1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.1[${PYTHON_USEDEP}]
 		swift? (
 			>=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
 			<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
@@ -87,6 +87,11 @@ RDEPEND=">=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
 
 PATCHES=( "${FILESDIR}"/${P}-sphinx_mapping.patch )
 
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
 python_compile_all() {
 	use doc && "${PYTHON}" setup.py build_sphinx
 }
@@ -101,7 +106,7 @@ python_test() {
 python_install() {
 	distutils-r1_python_install
 	newconfd "${FILESDIR}/glance.confd" glance
-	newinitd "${FILESDIR}/glance-2.initd" glance
+	newinitd "${FILESDIR}/glance-3.initd" glance
 
 	for function in api registry scrubber; do
 		dosym /etc/init.d/glance /etc/init.d/glance-${function}
@@ -124,6 +129,8 @@ python_install() {
 	doins "etc/logging.cnf.sample"
 	doins "etc/policy.json"
 	doins "etc/schema-image.json"
+
+	fowners glance:glance /var/run/glance /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber /etc/glance
 }
 
 python_install_all() {
diff --git a/app-admin/glance/glance-2013.2.9999.ebuild b/app-admin/glance/glance-2013.2.9999.ebuild
index 301e590975dc..009140a2975d 100644
--- a/app-admin/glance/glance-2013.2.9999.ebuild
+++ b/app-admin/glance/glance-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/app-admin/glance/glance-2013.2.9999.ebuild,v 1.2 2013/11/14 11:08:12 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2.9999.ebuild,v 1.3 2013/11/18 03:02:59 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -71,7 +71,7 @@ RDEPEND=">=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
 		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
 		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
 		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.1[${PYTHON_USEDEP}]
 		swift? (
 			>=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
 			<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
@@ -88,6 +88,11 @@ RDEPEND=">=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
 
 PATCHES=( "${FILESDIR}"/${PN}-2013.2-sphinx_mapping.patch )
 
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
 python_compile_all() {
 	use doc && "${PYTHON}" setup.py build_sphinx
 }
@@ -102,7 +107,7 @@ python_test() {
 python_install() {
 	distutils-r1_python_install
 	newconfd "${FILESDIR}/glance.confd" glance
-	newinitd "${FILESDIR}/glance-2.initd" glance
+	newinitd "${FILESDIR}/glance-3.initd" glance
 
 	for function in api registry scrubber; do
 		dosym /etc/init.d/glance /etc/init.d/glance-${function}
@@ -125,6 +130,8 @@ python_install() {
 	doins "etc/logging.cnf.sample"
 	doins "etc/policy.json"
 	doins "etc/schema-image.json"
+
+	fowners glance:glance /var/run/glance /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber /etc/glance
 }
 python_install_all() {
 	use doc && local HTML_DOCS=( doc/build/html/. )