fix init script /run perms to allow emperor group sockets to be created

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

4 files changed, 161 insertions, 22 deletions

diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog
index 8b94e24fb344..fd8e16994405 100644
--- a/www-servers/uwsgi/ChangeLog
+++ b/www-servers/uwsgi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/uwsgi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.78 2015/05/23 00:20:14 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.79 2015/07/01 10:30:21 ultrabug Exp $
+
+*uwsgi-2.0.10-r2 (01 Jul 2015)
+
+  01 Jul 2015; Ultrabug <ultrabug@gentoo.org> -uwsgi-2.0.10-r1.ebuild,
+  +uwsgi-2.0.10-r2.ebuild, +files/uwsgi.initd-r6:
+  fix init script /run perms to allow emperor group sockets to be created
 
   23 May 2015; Manuel Rüger <mrueg@gentoo.org> metadata.xml:
   Cleanup metadata.xml
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index bfd92b0ae824..0570e64df029 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 1.1.2-threaded-php.patch 1098 SHA256 e5f03fcdf2ebf7d2867b21e640f2c44f23da169108b2ea964e96fea44152d49b SHA512 d213c827710b75c1e4e1a1ad657515a7d2cacf02fa1f2f309d5cf986b3650ea20529077e2d2df5a22ed6edf60e43e755378ec6ea556c43c844cf534552239d75 WHIRLPOOL 1b0e42b83aa45a3bb17edaf4f9d7b260bc9dae8d7e8f06a38c97045361e64ddd9e774a1df1244e521c7973b27d27d40cbca4d8d2b16d0f9765ca2daa00cc3be8
 AUX 1.2.3-pyerl.patch 1015 SHA256 1da74cb8d108f46c4faa39548f73de2f74849dde81d1012b71c7c91ab939596b SHA512 b298feccb2604b9459a15699d786c26be9d830f88a4a00beca69fba3ff0d5d78cc239e6dcce51da32121c8bb4d72af41a6e57e5594a3005cfceb4feebbffaed2 WHIRLPOOL 60ff1374e1f13c9ffaa65996a24d87d86d64d7f4edb9d1378d0b7287bfeb285d5123da4532c6e0fb022ff78d80a6b5eba9d6bb8c36536145d4a11cbdecee23f6
@@ -14,28 +14,17 @@ AUX uwsgi.initd-r2 3436 SHA256 1983e7346e50996ea9a34ac8f399b965596232bf7b9b38a98
 AUX uwsgi.initd-r3 3614 SHA256 58b998b025e4a9df20ca917bc93e287f9a8cf02d278d513fa461f70e1d08f799 SHA512 ab9dc6277bd05821287f6f8beb3ac2504f0e41db38e11b4d2884ac026f14ac7bfaaca138f045afa712d4f2843f94de105bf0d43fad35d18679ac33b507cd187e WHIRLPOOL 7bf4b1d5263ddb3ea0e3c81fe4906debaa3a3ee0a59a177b4f12a24d883bcb2049dffa4b11d9564c1ce4324a23a67cd4e8110f1955c05287f53cbd4b4e75e7cc
 AUX uwsgi.initd-r4 3612 SHA256 0ce63b2180bc359715596758ef1c636a51aca94e1147433cf5c077a1d5343622 SHA512 c58934a62d5ff8d3206b11cfbbc62d1881f14865a03fb949ebfe4955f29b5961fa87be96551382ae4fe902925dfc215409ec1b5e8360ac6806ed7b3f7b1705f8 WHIRLPOOL b7b8325330735a2a5a914131b70c3a7dc34f4c7cb2246923ebfc65acda8b9223109f64c5ba6feeb3ee5d1c1f2c0439e364fc3734ebbd29e0db37431398c776f6
 AUX uwsgi.initd-r5 3692 SHA256 08aa7a10166eed9cee44a5ea9ee36b087b1f1781c8d82e0088079110b7e8bc68 SHA512 f1ad4156d0dcb9cdeaba9625d27af6b374e1892e605e2cef0560d7131d5007bc4134bc6a3792005b623bd0198628439048a2e9b870f1247d70a1caa944770a64 WHIRLPOOL 72f3ded55ac5631770992141aa215e96d4f641761e2e643563bdb133f16ee33caaa53a2181b66619f3bedbba062dc73d6ed14c621721cb5842b287747cfee3dc
+AUX uwsgi.initd-r6 3692 SHA256 170e6af3bdc44012c175db75317769bf796b46b9d2a0ffa09ec949c27d42341a SHA512 3bedc0266a5431a22023828eb78525cb0f048cf66ede2c9507d418d92e8371951eaf25c87b2f1eb83256deee5f8ba0d615ee2908545fb186851032665f109459 WHIRLPOOL fe8a587b5df6b2dba6bd5da399db724c93f745850736d24edc28c080ffbaacb39e8e1b946b7e1ab8e14a90d1d4e8b23658581cdac3fc7c5a291f4fb0dac33474
 DIST uwsgi-2.0.10.tar.gz 779820 SHA256 c0b381d6c22da931e85e3efe612629fe33a01ac25b0f028aa631b85d86d5028b SHA512 027f2ad94f5213f5de13c08670a5f084b7d4e5aa1670550fd5ff012d016f8c0e162dbd3962d5a3d16e5202996141bb92bb025e4c0ef40a646cfb6f2368aec857 WHIRLPOOL e8fd2912d8bc5f2cdf2a58ee3553d494a680b6c3dadd59ba2f2dec810714d98cadd46c4f8b0f37291d07ee3f9e81c5c84e96c4d6fe5d0b62ed1d51ce733ff988
 DIST uwsgi-2.0.9.tar.gz 779244 SHA256 fe0489bca0a8b95653908be2297e35699fb9e992f728e382224587ee6b918295 SHA512 8afb6ca51aa2113e2c9fc0b90e11ce8c1aeddb38f41c7b0d5da6811d7ef93aa8b9e015abfd29b1ced35b0f6a00fd7285b8140b855fc3ee79804e2513e94a9fb5 WHIRLPOOL 362abe240b9a3f170409b850d9ae5186701b137159cd91d2e689b5f3d43dfe779f13d9e4554b60b82efd534a00751394a7982130912f7f106ac6e7c6dbde88d6
-EBUILD uwsgi-2.0.10-r1.ebuild 11803 SHA256 1994308c54f420702e69ffc7830753d7d3df947e8aaefdbd9b65e5a5a4261edf SHA512 bf0c0bf461bb174e4ec8d2dbb463992ddb7df1531af20fa106134c906bc9bc25fc0d481478aa82b4e1fab7e309b2b4106a794b60c0953104a062322a4e335e8e WHIRLPOOL c4f4e1b45ca348ced1050029b21299402524d3ced93ccfd903d7d141f9b0dd6d3faae44155d9bfc55da3c7bb4ad9754062a646d9f904a4f8984269f555d0f446
+EBUILD uwsgi-2.0.10-r2.ebuild 11803 SHA256 989e993d7566bd38f29ef03f6ec0cfba046781a3a5c85555fa250eb8b46a152d SHA512 dc4e9e380a05a059ec0ad6f6c792f3dd9da45558676e15d80b92efdeccca2dfdb21ff183ad64c549a99cacb1ba1052092a77f7c92864a42caf5514c62b502ef6 WHIRLPOOL 1c16510279aacd791ba184d6bb863e41c5232d37788976bd2ea97fb39c75bff59a844cadc6fedd8e60ff8734f7f8d72e5b6f7e48177599b599098e49804ff84a
 EBUILD uwsgi-2.0.9.ebuild 11780 SHA256 30fc2b3504147592d09c0fcc7e4e8227a660df82039d067f1acc1406f9a20b80 SHA512 bf657343bc7b864e8aa4e4d6b7a58d9851532ab6d1c0d8589758d497953dedd79fab096984775bdad8c46a8b857cb51e5a94bb45f0c902bbda4da3c4707800d5 WHIRLPOOL b9e2bf79afa44d417fb47170cdb8d9a19455951c5c64b7ccffe5e76be493592d3be78fe4b793c920008b16e97b74ab2406ef48651d5dbc1b241f91551e82a5ae
-MISC ChangeLog 14019 SHA256 188ea990b4b532a90c701196d177359aa98671d372fc277f61658fdedc8304c4 SHA512 b1dfec60f27d00d5075a54039a0aef45516e6249c235b1ca9f876b90db5afa58a1e6706d1af59df7cfe1f675135d848e9b8f817c2f37e3b7835728881ece1bc6 WHIRLPOOL 8b6f60174a45af0658a70995c851cac3c369960e1415874a67da84b792e7b8cd3d2db642bfa1c939a197d23892b889ec9527fb15968a0733b9534b24825442fb
+MISC ChangeLog 14250 SHA256 4ba709afcebeaa9410c23c6b710e9b8c664197e920682d58ce549cbfaec6fa3e SHA512 f04efe60b4c48207130f16da66c88f0930dff655c7a42372f5047e54de9e93f9bbbf509082d4a17444f7b54307a64aca84ef357e4d17413c97c162fdb065cc79 WHIRLPOOL 834ea7c27f9093825887a3ee702ecd732ed648e600f3b6bc263406a0098720731d521cc7ac5790a5daa60504a5b1473e4588b42378aac4de216e9e4daf36660d
 MISC metadata.xml 1435 SHA256 64ef16f210a4231a216a57e6c42de3d9159754a8c5e0890ae8ab731aa00a99d5 SHA512 15a379b7df452d93d686c3d1c2fa0a58f94c7b06ebb1214a68cd6dedfe793c51a1eb16bad7ec141fdcd9e2c174b8d63e28be37e2405889d2d964f69f086de957 WHIRLPOOL 042d8658d011170b37eb6d7278ab312029b69251e35baf8a81ba1611141a14ff56fcb621ed1f392d53ddb98547bfb3982282be2a92b51dacff38c782e5a1e3bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfzBSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwNAP/3IOFmHrcYjRmooT9YmrRQPp
-YABabOGqQ7EsS6Ag1ozaN+kou/YbMZHYnsrOkY0vhdcl8jAM3Kk9JtMdQKSp7lDv
-IEEfzUIw6DncxcZdKKJNnQrDNBoZSdv8HEFvD/8C2ZHUWxDqK/ylan0RCF2rX67V
-TpKE3+Ja5plaXkSqzUCYAb3jAI0x96NI4XdhgaglGijYQJIZYyx3w0CJ3RW61fhY
-/P32yK2v5jzq+nELfkA1yKW6G30cfT8myl9nyUsMey/2JD4fqMEtsHSticFl47IF
-cvRZc072Gefv4NOqCVMzAb/3J+WiCl2/ZJAsY0wte8miAMz40hivyPAo1comcNeN
-3kfPoPkEZ7tp00vPY0VGkUb+sIRyBCu+uvKjDV8NOyCW9H9vihZxlSbTw1F/q4BH
-0qXDvxOzJomhILxP2UKGTdukQno2v9a4x9xLwewJHmn46qmAgw0mwdT24PbLi4vK
-l6OzP4VIhQoSgi96gX0mlxU48HdPatsgWrSRllk58j7dkn7xGaiy19S+ouPZfieT
-mMqtx7RG4oAFlfOuU0/4Odz/v28R+CXiopHlMWV4GxmF+jxxBg8Ms3Dr9itfurfh
-WixIJjzGdUfsX0yzjv3nlS4hFY9o1+eiy4WsR3nvQuCwWGaPajQrzPkL5jHH5zE6
-n5rpNkeH5pCmIdgMz9FE
-=8XXW
+iF4EAREIAAYFAlWTwT4ACgkQKiQSS7ZY+hN6NgD+LMuw9ETLr0SOahVrMu4oWTVM
+eKb4HX5oXw8roM4wYwMA/094+oJ/UtbtZHiM8DdhNKKorSzFgxXnt9OYiZe2AZeA
+=PXdZ
 -----END PGP SIGNATURE-----
diff --git a/www-servers/uwsgi/files/uwsgi.initd-r6 b/www-servers/uwsgi/files/uwsgi.initd-r6
new file mode 100644
index 000000000000..cf32be167d59
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi.initd-r6
@@ -0,0 +1,144 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.initd-r6,v 1.1 2015/07/01 10:30:21 ultrabug Exp $
+
+PROGNAME=${SVCNAME#*.}
+
+UWSGI_EXEC=/usr/bin/uwsgi
+if [ "${SVCNAME}" = "uwsgi" ]; then
+	PIDPATH=/var/run/uwsgi
+else
+	PIDPATH="/var/run/uwsgi_${PROGNAME}"
+fi
+PIDFILE="${PIDPATH}/${PROGNAME}.pid"
+
+extra_started_commands="${opts} reload stats"
+
+depend() {
+	need net
+}
+
+start_emperor() {
+	local OPTIONS
+	OPTIONS="--daemonize"
+
+	if [ -n "${UWSGI_LOG_FILE}" ]; then
+		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
+	else
+		OPTIONS="${OPTIONS} /dev/null --disable-logging"
+	fi
+
+	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
+	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
+	[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
+
+	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
+		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
+	fi
+
+	ebegin "Starting uWSGI emperor"
+	checkpath -d -m 0770 -o "${UWSGI_USER}":"${UWSGI_EMPEROR_GROUP:-${UWSGI_GROUP}}" "${PIDPATH}"
+
+	cd "${UWSGI_DIR}" && \
+	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
+		--group ${UWSGI_EMPEROR_GROUP:-${UWSGI_GROUP}} \
+		-- --emperor "${UWSGI_EMPEROR_PATH}" ${OPTIONS} --pidfile "${PIDFILE}"
+	return $?
+}
+
+start_app() {
+	local OPTIONS
+	OPTIONS="--master --daemonize"
+
+	if [ -n "${UWSGI_LOG_FILE}" ]; then
+		OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
+	else
+		OPTIONS="${OPTIONS} /dev/null --disable-logging"
+	fi
+
+	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
+	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
+	[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
+
+	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
+		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
+	fi
+
+	if [ "${UWSGI_THREADS}" = "1" ]; then
+		OPTIONS="${OPTIONS} --enable-threads"
+	fi
+
+	if [ -n "${UWSGI_SOCKET}" ]; then
+		OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}"
+	fi
+
+	if [ -n "${UWSGI_PROCESSES}" ]; then
+		OPTIONS="${OPTIONS} --processes ${UWSGI_PROCESSES}"
+	fi
+
+	if [ -n "${UWSGI_CHROOT}" ]; then
+		OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}"
+	fi
+
+	if [ -n "${UWSGI_PROGRAM}" ]; then
+		OPTIONS="${OPTIONS} --fileserve-mode ${UWSGI_PROGRAM}"
+	fi
+
+	if [ -n "${UWSGI_XML_CONFIG}" ]; then
+		OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
+	fi
+
+	ebegin "Starting uWSGI application ${PROGNAME}"
+	checkpath -d -m 0750 -o "${UWSGI_USER}":"${UWSGI_GROUP}" "${PIDPATH}"
+
+	cd "${UWSGI_DIR}" && \
+	start-stop-daemon --start --user "${UWSGI_USER}" --group "${UWSGI_GROUP}" \
+		--exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}"
+	return $?
+}
+
+start() {
+	if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
+		start_emperor
+		eend $?
+	else
+		if [ "${SVCNAME}" = "uwsgi" ]; then
+			eerror "You are not supposed to run this script directly unless you"
+			eerror "want to run in Emperor mode. In that case please set the UWSGI_EMPEROR_PATH."
+			eerror "Otherwise create a symlink for the uwsgi application you want to run as well as"
+			eerror "a copy of the configuration file and modify it appropriately like so..."
+			eerror
+			eerror "  ln -s uwsgi /etc/init.d/uwsgi.trac"
+			eerror "  cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac"
+			eerror "  nano /etc/conf.d/uwsgi.trac"
+			eerror
+			return 1
+		else
+			start_app
+			eend $?
+		fi
+	fi
+}
+
+stop() {
+	if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
+		ebegin "Stopping uWSGI emperor"
+	else
+		ebegin "Stopping uWSGI application ${PROGNAME}"
+	fi
+	start-stop-daemon --stop --signal QUIT --pidfile "${PIDFILE}"
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading uWSGI"
+	start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
+	eend $?
+}
+
+stats() {
+	ebegin "Logging uWSGI statistics"
+	start-stop-daemon --signal USR1 --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/www-servers/uwsgi/uwsgi-2.0.10-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.10-r2.ebuild
index 90f5b517c575..7622c12edc6f 100644
--- a/www-servers/uwsgi/uwsgi-2.0.10-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-2.0.10-r1.ebuild,v 1.1 2015/05/12 16:48:01 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-2.0.10-r2.ebuild,v 1.1 2015/07/01 10:30:21 ultrabug Exp $
 
 EAPI="5"
 
@@ -309,7 +309,7 @@ src_install() {
 		done
 	fi
 
-	newinitd "${FILESDIR}"/uwsgi.initd-r5 uwsgi
+	newinitd "${FILESDIR}"/uwsgi.initd-r6 uwsgi
 	newconfd "${FILESDIR}"/uwsgi.confd-r3 uwsgi
 	keepdir /etc/"${PN}".d
 	use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"