public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/
@ 2016-05-18  6:42 Austin English
  0 siblings, 0 replies; 6+ messages in thread
From: Austin English @ 2016-05-18  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     ccbf72a4fe83a86246482fea38dd8e57229b008a
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 06:35:25 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed May 18 06:38:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbf72a4

www-servers/uwsgi: use #!/sbin/openrc-run instead of #!/sbin/runscript

 www-servers/uwsgi/files/uwsgi.initd-r1 | 2 +-
 www-servers/uwsgi/files/uwsgi.initd-r2 | 2 +-
 www-servers/uwsgi/files/uwsgi.initd-r3 | 2 +-
 www-servers/uwsgi/files/uwsgi.initd-r4 | 2 +-
 www-servers/uwsgi/files/uwsgi.initd-r5 | 2 +-
 www-servers/uwsgi/files/uwsgi.initd-r6 | 2 +-
 www-servers/uwsgi/files/uwsgi.initd-r7 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r1 b/www-servers/uwsgi/files/uwsgi.initd-r1
index 9b3af69..67a8009 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r1
+++ b/www-servers/uwsgi/files/uwsgi.initd-r1
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r2 b/www-servers/uwsgi/files/uwsgi.initd-r2
index f535dd2..4b202d4 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r2
+++ b/www-servers/uwsgi/files/uwsgi.initd-r2
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r3 b/www-servers/uwsgi/files/uwsgi.initd-r3
index efa3150..28f03d0 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r3
+++ b/www-servers/uwsgi/files/uwsgi.initd-r3
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r4 b/www-servers/uwsgi/files/uwsgi.initd-r4
index 856fdb9..146355b 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r4
+++ b/www-servers/uwsgi/files/uwsgi.initd-r4
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r5 b/www-servers/uwsgi/files/uwsgi.initd-r5
index d673daa..42381ca 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r5
+++ b/www-servers/uwsgi/files/uwsgi.initd-r5
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r6 b/www-servers/uwsgi/files/uwsgi.initd-r6
index ab550aa..a0c7ad6 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r6
+++ b/www-servers/uwsgi/files/uwsgi.initd-r6
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r7 b/www-servers/uwsgi/files/uwsgi.initd-r7
index f7cff44..01c2219 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r7
+++ b/www-servers/uwsgi/files/uwsgi.initd-r7
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/
@ 2017-02-18 22:09 David Seifert
  0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2017-02-18 22:09 UTC (permalink / raw
  To: gentoo-commits

commit:     a023bde895bd1edd0f52350b004fc5e067caeee5
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Feb 16 16:35:36 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 22:06:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a023bde8

www-servers/uwsgi: remove unused patches/files

Closes: https://github.com/gentoo/gentoo/pull/3989

 www-servers/uwsgi/files/1.1.2-threaded-php.patch |  40 -------
 www-servers/uwsgi/files/1.2.3-pyerl.patch        |  31 -----
 www-servers/uwsgi/files/42_mod_uwsgi-r1.conf     |   9 --
 www-servers/uwsgi/files/42_mod_uwsgi-r2.conf     |   9 --
 www-servers/uwsgi/files/42_mod_uwsgi.conf        |   7 --
 www-servers/uwsgi/files/uwsgi.confd-r1           |  53 ---------
 www-servers/uwsgi/files/uwsgi.confd-r3           |  63 ----------
 www-servers/uwsgi/files/uwsgi.initd-r1           | 138 ----------------------
 www-servers/uwsgi/files/uwsgi.initd-r2           | 142 ----------------------
 www-servers/uwsgi/files/uwsgi.initd-r3           | 144 -----------------------
 www-servers/uwsgi/files/uwsgi.initd-r4           | 144 -----------------------
 www-servers/uwsgi/files/uwsgi.initd-r5           | 144 -----------------------
 www-servers/uwsgi/files/uwsgi.initd-r6           | 144 -----------------------
 13 files changed, 1068 deletions(-)

diff --git a/www-servers/uwsgi/files/1.1.2-threaded-php.patch b/www-servers/uwsgi/files/1.1.2-threaded-php.patch
deleted file mode 100644
index ed75ad9b2f..0000000000
--- a/www-servers/uwsgi/files/1.1.2-threaded-php.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -r a6dd30e36bc0 plugins/php/php_plugin.c
---- a/plugins/php/php_plugin.c	Fri Apr 20 16:27:00 2012 +0200
-+++ b/plugins/php/php_plugin.c	Sun Apr 22 11:54:49 2012 +0200
-@@ -116,7 +116,7 @@
- }
- 
- 
--static int sapi_uwsgi_send_headers(sapi_headers_struct *sapi_headers)
-+static int sapi_uwsgi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
- {
- 	sapi_header_struct *h;
- 	zend_llist_position pos;
-@@ -237,7 +237,7 @@
- }
- 
- 
--static char *sapi_uwsgi_read_cookies(void)
-+static char *sapi_uwsgi_read_cookies(TSRMLS_D)
- {
- 	uint16_t len = 0;
- 	struct wsgi_request *wsgi_req = (struct wsgi_request *) SG(server_context);
-@@ -624,6 +624,10 @@
- 	struct uwsgi_string_list *pset = uphp.set;
- 	struct uwsgi_string_list *append_config = uphp.append_config;
- 
-+#ifdef ZTS
-+	tsrm_startup(1, 1, 0, NULL);
-+#endif
-+
- 	sapi_startup(&uwsgi_sapi_module);
- 
- 	// applying custom options
-@@ -721,6 +725,7 @@
- 
- 	zend_file_handle file_handle;
- 
-+   	TSRMLS_FETCH(); // fetch the threading state in case PHP is built with threading
- 	SG(server_context) = (void *) wsgi_req;
- 
- 	if (uwsgi_parse_vars(wsgi_req)) {

diff --git a/www-servers/uwsgi/files/1.2.3-pyerl.patch b/www-servers/uwsgi/files/1.2.3-pyerl.patch
deleted file mode 100644
index 1d4794d8f6..0000000000
--- a/www-servers/uwsgi/files/1.2.3-pyerl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/plugins/pyerl/pyerl.c b/plugins/pyerl/pyerl.c
-index a335f03..aee98e2 100644
---- a/plugins/pyerl/pyerl.c
-+++ b/plugins/pyerl/pyerl.c
-@@ -537,7 +537,7 @@ void pyerl_init() {
- }
- 
- struct uwsgi_plugin pyerl_plugin = {
--
-+        .name = "pyerl",
-         .post_init = pyerl_init,
- };
- 
-diff --git a/plugins/pyerl/uwsgiplugin.py b/plugins/pyerl/uwsgiplugin.py
-index 161d722..ae9c68d 100644
---- a/plugins/pyerl/uwsgiplugin.py
-+++ b/plugins/pyerl/uwsgiplugin.py
-@@ -1,7 +1,12 @@
- from distutils import sysconfig
-+import os
- 
- NAME='pyerl'
--CFLAGS = ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True)]
-+
-+ERLANGPATH = os.environ.get('UWSGICONFIG_ERLANGPATH', 'erl')
-+includedir = os.popen(ERLANGPATH + " -noshell -noinput -eval \"io:format('~s~n', [code:lib_dir(erl_interface, include)])\" -s erlang halt").read().rstrip()
-+
-+CFLAGS = ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True),  '-I' + includedir ]
- LDFLAGS = []
- LIBS = []
- 

diff --git a/www-servers/uwsgi/files/42_mod_uwsgi-r1.conf b/www-servers/uwsgi/files/42_mod_uwsgi-r1.conf
deleted file mode 100644
index bcb383ee3a..0000000000
--- a/www-servers/uwsgi/files/42_mod_uwsgi-r1.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfDefine PROXY_UWSGI>
-    LoadModule uwsgi_module modules/mod_proxy_uwsgi.so
-</IfDefine>
-<IfDefine RUWSGI>
-    LoadModule uwsgi_module modules/mod_Ruwsgi.so
-</IfDefine>
-<IfDefine UWSGI>
-    LoadModule uwsgi_module modules/mod_uwsgi.so
-</IfDefine>

diff --git a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf b/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
deleted file mode 100644
index 85ede87b03..0000000000
--- a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfDefine PROXY_UWSGI>
-    LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
-</IfDefine>
-<IfDefine RUWSGI>
-    LoadModule uwsgi_module modules/mod_Ruwsgi.so
-</IfDefine>
-<IfDefine UWSGI>
-    LoadModule uwsgi_module modules/mod_uwsgi.so
-</IfDefine>

diff --git a/www-servers/uwsgi/files/42_mod_uwsgi.conf b/www-servers/uwsgi/files/42_mod_uwsgi.conf
deleted file mode 100644
index a619baeafe..0000000000
--- a/www-servers/uwsgi/files/42_mod_uwsgi.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<IfDefine UWSGI>
-    LoadModule uwsgi_module modules/mod_uwsgi.so
-</IfDefine>
-<IfDefine RUWSGI>
-    LoadModule uwsgi_module modules/mod_Ruwsgi.so
-</IfDefine>
-

diff --git a/www-servers/uwsgi/files/uwsgi.confd-r1 b/www-servers/uwsgi/files/uwsgi.confd-r1
deleted file mode 100644
index 3b0a005b8e..0000000000
--- a/www-servers/uwsgi/files/uwsgi.confd-r1
+++ /dev/null
@@ -1,53 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# YOU SHOULD ONLY MODIFY THIS FILE IF YOU USE THE UWSGI EMPEROR MODE!
-# IF YOU WANT TO RUN A SINGLE APP INSTANCE, CREATE A COPY AND MODIFY THAT INSTEAD!
-
-# Path (or name) of UNIX/TCP socket to bind to
-# Example : UWSGI_SOCKET=127.0.0.1:1234
-UWSGI_SOCKET=
-
-# Enable threads? (1 = yes, 0 = no). The default is 0
-#
-UWSGI_THREADS=0
-
-# The path to your uWSGI application.
-#
-UWSGI_PROGRAM=
-
-# The path to your uWSGI xml config file.
-#
-UWSGI_XML_CONFIG=
-
-# The number of child processes to spawn. The default is 1.
-#
-UWSGI_PROCESSES=1
-
-# The log file path. If empty, log only errors
-#
-UWSGI_LOG_FILE=
-
-# If you want to run your application inside a chroot then specify the
-# directory here. Leave this blank otherwise.
-#
-UWSGI_CHROOT=
-
-# If you want to run your application from a specific directiory specify
-# it here. Leave this blank otherwise.
-#
-UWSGI_DIR=
-
-# The user and group to run your application as. If you do not specify these,
-# the application will be run as root:root.
-#
-UWSGI_USER=
-
-# Run the uwsgi emperor which loads vassals dynamically from this PATH
-# see http://projects.unbit.it/uwsgi/wiki/Emperor
-# The advised Gentoo folder is /etc/uwsgi.d/
-UWSGI_EMPEROR_PATH=
-
-# Additional options you might want to pass to uWSGI
-#
-UWSGI_EXTRA_OPTIONS=

diff --git a/www-servers/uwsgi/files/uwsgi.confd-r3 b/www-servers/uwsgi/files/uwsgi.confd-r3
deleted file mode 100644
index fa0158029b..0000000000
--- a/www-servers/uwsgi/files/uwsgi.confd-r3
+++ /dev/null
@@ -1,63 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# YOU SHOULD ONLY MODIFY THIS FILE IF YOU USE THE UWSGI EMPEROR MODE!
-# IF YOU WANT TO RUN A SINGLE APP INSTANCE, CREATE A COPY AND MODIFY THAT INSTEAD!
-
-# Path (or name) of UNIX/TCP socket to bind to
-# Example : UWSGI_SOCKET=127.0.0.1:1234
-UWSGI_SOCKET=
-
-# Enable threads? (1 = yes, 0 = no). The default is 0
-#
-UWSGI_THREADS=0
-
-# The path to your uWSGI application.
-#
-UWSGI_PROGRAM=
-
-# The path to your uWSGI xml config file.
-#
-UWSGI_XML_CONFIG=
-
-# The number of child processes to spawn. The default is 1.
-#
-UWSGI_PROCESSES=1
-
-# The log file path. If empty, log only errors
-#
-UWSGI_LOG_FILE=
-
-# If you want to run your application inside a chroot then specify the
-# directory here. Leave this blank otherwise.
-#
-UWSGI_CHROOT=
-
-# If you want to run your application from a specific directiory specify
-# it here. Leave this blank otherwise.
-#
-UWSGI_DIR=
-
-# The user to run your application as. If you do not specify these,
-# the application will be run as user root.
-#
-UWSGI_USER=
-
-# The group to run your application as. If you do not specify these,
-# the application will be run as group root.
-#
-UWSGI_GROUP=
-
-# Run the uwsgi emperor which loads vassals dynamically from this PATH
-# see http://projects.unbit.it/uwsgi/wiki/Emperor
-# The advised Gentoo folder is /etc/uwsgi.d/
-UWSGI_EMPEROR_PATH=
-
-# The group the emperor should run as. This is different from the UWSGI_GROUP
-# as you could want your apps share some sockets with other processes such as
-# www servers while preserving your emperor logs from being accessible by them.
-UWSGI_EMPEROR_GROUP=
-
-# Additional options you might want to pass to uWSGI
-#
-UWSGI_EXTRA_OPTIONS=

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r1 b/www-servers/uwsgi/files/uwsgi.initd-r1
deleted file mode 100644
index 67a8009bf8..0000000000
--- a/www-servers/uwsgi/files/uwsgi.initd-r1
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-PROGNAME=${SVCNAME#*.}
-
-UWSGI_EXEC=/usr/bin/uwsgi
-PIDPATH=/var/run/uwsgi
-PIDFILE="${PIDPATH}/${PROGNAME}.pid"
-
-extra_started_commands="${opts} reload stats"
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o "${UWSGI_USER}":root "${PIDPATH}"
-}
-
-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"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	ebegin "Starting uWSGI emperor"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
-		-- --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"
-
-	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}"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
-		-- ${OPTIONS} --pidfile "${PIDFILE}"
-	return $?
-}
-
-start() {
-	if [ "${SVCNAME}" == "uwsgi" ]; then
-		if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-			start_emperor
-			eend $?
-		else
-			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
-		fi
-	else
-		start_app
-		eend $?
-	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/files/uwsgi.initd-r2 b/www-servers/uwsgi/files/uwsgi.initd-r2
deleted file mode 100644
index 4b202d451a..0000000000
--- a/www-servers/uwsgi/files/uwsgi.initd-r2
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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_pre() {
-	checkpath -d -m 0750 -o "${UWSGI_USER}":root "${PIDPATH}"
-}
-
-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"
-
-	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
-		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
-	fi
-
-	ebegin "Starting uWSGI emperor"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
-		-- --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"
-
-	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}"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" \
-		-- ${OPTIONS} --pidfile "${PIDFILE}"
-	return $?
-}
-
-start() {
-	if [ "${SVCNAME}" == "uwsgi" ]; then
-		if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-			start_emperor
-			eend $?
-		else
-			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
-		fi
-	else
-		start_app
-		eend $?
-	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/files/uwsgi.initd-r3 b/www-servers/uwsgi/files/uwsgi.initd-r3
deleted file mode 100644
index 28f03d0563..0000000000
--- a/www-servers/uwsgi/files/uwsgi.initd-r3
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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_pre() {
-	checkpath -d -m 0750 -o "${UWSGI_USER}":"${UWSGI_GROUP}" "${PIDPATH}"
-}
-
-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"
-	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}"
-	cd "${UWSGI_DIR}" && \
-	start-stop-daemon --start --user "${UWSGI_USER}" --group "${UWSGI_GROUP}" \
-		--exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}"
-	return $?
-}
-
-start() {
-	if [ "${SVCNAME}" == "uwsgi" ]; then
-		if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
-			start_emperor
-			eend $?
-		else
-			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
-		fi
-	else
-		start_app
-		eend $?
-	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/files/uwsgi.initd-r4 b/www-servers/uwsgi/files/uwsgi.initd-r4
deleted file mode 100644
index 146355ba70..0000000000
--- a/www-servers/uwsgi/files/uwsgi.initd-r4
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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_pre() {
-	checkpath -d -m 0750 -o "${UWSGI_USER}":"${UWSGI_GROUP}" "${PIDPATH}"
-}
-
-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"
-	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}"
-	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/files/uwsgi.initd-r5 b/www-servers/uwsgi/files/uwsgi.initd-r5
deleted file mode 100644
index 42381caf8f..0000000000
--- a/www-servers/uwsgi/files/uwsgi.initd-r5
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 0750 -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/files/uwsgi.initd-r6 b/www-servers/uwsgi/files/uwsgi.initd-r6
deleted file mode 100644
index a0c7ad6da5..0000000000
--- a/www-servers/uwsgi/files/uwsgi.initd-r6
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 $?
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/
@ 2017-04-12 19:50 Zac Medico
  0 siblings, 0 replies; 6+ messages in thread
From: Zac Medico @ 2017-04-12 19:50 UTC (permalink / raw
  To: gentoo-commits

commit:     c8973f428af39b63f1dcdf511585dd118c4dafda
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 12 19:39:25 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Apr 12 19:50:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8973f42

www-servers/uwsgi: re-add files referenced by APACHE2_MOD_CONF (bug 611300)

Fixes: a023bde895bd ("www-servers/uwsgi: remove unused patches/files")
Bug: https://bugs.gentoo.org/show_bug.cgi?id=611300
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-servers/uwsgi/files/42_mod_uwsgi-r2.conf | 9 +++++++++
 www-servers/uwsgi/files/42_mod_uwsgi.conf    | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf b/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
new file mode 100644
index 00000000000..85ede87b037
--- /dev/null
+++ b/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
@@ -0,0 +1,9 @@
+<IfDefine PROXY_UWSGI>
+    LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
+</IfDefine>
+<IfDefine RUWSGI>
+    LoadModule uwsgi_module modules/mod_Ruwsgi.so
+</IfDefine>
+<IfDefine UWSGI>
+    LoadModule uwsgi_module modules/mod_uwsgi.so
+</IfDefine>

diff --git a/www-servers/uwsgi/files/42_mod_uwsgi.conf b/www-servers/uwsgi/files/42_mod_uwsgi.conf
new file mode 100644
index 00000000000..a619baeafee
--- /dev/null
+++ b/www-servers/uwsgi/files/42_mod_uwsgi.conf
@@ -0,0 +1,7 @@
+<IfDefine UWSGI>
+    LoadModule uwsgi_module modules/mod_uwsgi.so
+</IfDefine>
+<IfDefine RUWSGI>
+    LoadModule uwsgi_module modules/mod_Ruwsgi.so
+</IfDefine>
+


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/
@ 2017-04-12 20:15 Zac Medico
  0 siblings, 0 replies; 6+ messages in thread
From: Zac Medico @ 2017-04-12 20:15 UTC (permalink / raw
  To: gentoo-commits

commit:     575f84cd1a8b85f1b14b4965e3fe3943916d28d7
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 12 20:12:43 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Apr 12 20:15:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=575f84cd

www-servers/uwsgi: remove unused 42_mod_uwsgi.conf

Note that 42_mod_uwsgi.conf in the APACHE2_MOD_CONF variable is
actually the destination argument of a newins call.

Fixes: c8973f428af3 ("www-servers/uwsgi: re-add files referenced by APACHE2_MOD_CONF (bug 611300)")
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-servers/uwsgi/files/42_mod_uwsgi.conf | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/www-servers/uwsgi/files/42_mod_uwsgi.conf b/www-servers/uwsgi/files/42_mod_uwsgi.conf
deleted file mode 100644
index a619baeafee..00000000000
--- a/www-servers/uwsgi/files/42_mod_uwsgi.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<IfDefine UWSGI>
-    LoadModule uwsgi_module modules/mod_uwsgi.so
-</IfDefine>
-<IfDefine RUWSGI>
-    LoadModule uwsgi_module modules/mod_Ruwsgi.so
-</IfDefine>
-


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/
@ 2020-06-25  7:30 Conrad Kostecki
  0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2020-06-25  7:30 UTC (permalink / raw
  To: gentoo-commits

commit:     1698b86acb449b5758104da2b25b7fd40a7d1879
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 24 18:08:58 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:30:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1698b86a

www-servers/uwsgi: remove unused patch/file

Closes: https://github.com/gentoo/gentoo/pull/16401
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 www-servers/uwsgi/files/2.0.14-php-plugin.patch | 22 ----------------------
 www-servers/uwsgi/files/42_mod_uwsgi-r2.conf    |  9 ---------
 2 files changed, 31 deletions(-)

diff --git a/www-servers/uwsgi/files/2.0.14-php-plugin.patch b/www-servers/uwsgi/files/2.0.14-php-plugin.patch
deleted file mode 100644
index f60a6553cfd..00000000000
--- a/www-servers/uwsgi/files/2.0.14-php-plugin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6b332e6f7e6fc3c267a91ce5b5591684575ea271 Mon Sep 17 00:00:00 2001
-From: Damjan Georgievski <gdamjan@gmail.com>
-Date: Thu, 13 Oct 2016 00:55:35 +0200
-Subject: [PATCH] fix issue #1380 - compiling with llvm/freebsd
-
----
- plugins/php/php_plugin.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
-index 536ec1a..ef30180 100644
---- a/plugins/php/php_plugin.c
-+++ b/plugins/php/php_plugin.c
-@@ -232,7 +232,7 @@ static void sapi_uwsgi_register_variables(zval *track_vars_array TSRMLS_DC)
- 			size_t name_len = equal-usl->value;
- 			char *name = estrndup(usl->value, name_len);
- 			char *strval = equal+1;
--			zend_register_string_constant(name, name_len, strval, CONST_CS, 0);
-+			zend_register_string_constant(name, name_len, strval, CONST_CS, 0 TSRMLS_CC);
- 		}
- 		usl = usl->next;
- 	}

diff --git a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf b/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
deleted file mode 100644
index 85ede87b037..00000000000
--- a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfDefine PROXY_UWSGI>
-    LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
-</IfDefine>
-<IfDefine RUWSGI>
-    LoadModule uwsgi_module modules/mod_Ruwsgi.so
-</IfDefine>
-<IfDefine UWSGI>
-    LoadModule uwsgi_module modules/mod_uwsgi.so
-</IfDefine>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/
@ 2024-03-04 13:50 Alexys Jacob
  0 siblings, 0 replies; 6+ messages in thread
From: Alexys Jacob @ 2024-03-04 13:50 UTC (permalink / raw
  To: gentoo-commits

commit:     328e4997a35aca0e7bb51179cf79805fa2781138
Author:     Anthony Ryan <anthonyryan1 <AT> gmail <DOT> com>
AuthorDate: Thu Feb 29 23:13:21 2024 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Mar  4 13:50:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=328e4997

www-servers/uwsgi: OpenRC init.d stop timeout should reflect the default shutdown time

If we don't wait long enough for uwsgi to shut down all it's workers properly
OpenRC can lose track of the pid or think the daemon has crashed if shutdown
finishes after OpenRC has given up.

Signed-off-by: Anthony Ryan <anthonyryan1 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35582
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>

 www-servers/uwsgi/files/uwsgi.initd-r7 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r7 b/www-servers/uwsgi/files/uwsgi.initd-r7
index 64dfc7a736ff..a6b99edf1b38 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r7
+++ b/www-servers/uwsgi/files/uwsgi.initd-r7
@@ -128,7 +128,8 @@ stop() {
 	else
 		ebegin "Stopping uWSGI application ${PROGNAME}"
 	fi
-	start-stop-daemon --stop --signal QUIT --pidfile "${PIDFILE}"
+	# retry should be set higher than uwsgi worker-reload-mercy (default 60)
+	start-stop-daemon --stop --signal QUIT --retry 90 --pidfile "${PIDFILE}"
 	eend $?
 }
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-03-04 13:50 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-12 19:50 [gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/ Zac Medico
  -- strict thread matches above, loose matches on Subject: below --
2024-03-04 13:50 Alexys Jacob
2020-06-25  7:30 Conrad Kostecki
2017-04-12 20:15 Zac Medico
2017-02-18 22:09 David Seifert
2016-05-18  6:42 Austin English

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox