* [gentoo-commits] dev/ultrabug:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2012-03-07 12:18 Alexys Jacob
0 siblings, 0 replies; 4+ messages in thread
From: Alexys Jacob @ 2012-03-07 12:18 UTC (permalink / raw
To: gentoo-commits
commit: 3c888a58ca910e181c8a29c5ee567a1f2e049af5
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 7 12:18:32 2012 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Mar 7 12:18:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=3c888a58
uwsgi rework
---
www-servers/uwsgi/Manifest | 6 +
www-servers/uwsgi/files/42_mod_uwsgi.conf | 7 +
www-servers/uwsgi/files/uwsgi.confd | 52 +++++++
www-servers/uwsgi/files/uwsgi.initd | 134 +++++++++++++++++
www-servers/uwsgi/metadata.xml | 9 +
www-servers/uwsgi/uwsgi-1.1_pre17.ebuild | 232 +++++++++++++++++++++++++++++
6 files changed, 440 insertions(+), 0 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
new file mode 100644
index 0000000..b82e018
--- /dev/null
+++ b/www-servers/uwsgi/Manifest
@@ -0,0 +1,6 @@
+AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
+AUX uwsgi.confd 1391 RMD160 712ee1e0c53e735d636d554468c2fcf49ca583ea SHA1 d40388f26793fb405917a7f5105982802f8854f3 SHA256 a6d9a34e0f33d100ae5177ae2da17dfdebdc4ba64d9e670b71ec9da156c0e960
+AUX uwsgi.initd 3191 RMD160 dc665d3dc1325266c2fcee095503ae4e6b297980 SHA1 56396e9f7870a61e4084b524432972f349c09240 SHA256 4e2913b96e6fc88287879126727ae627e32fd5b51076aa8155af73359f1c97ca
+DIST uwsgi-1.1-snapshot17.tar.gz 487321 RMD160 3310a90441dbf3c4d692c597a090728a2fab86d9 SHA1 406fd977f0a3acb8c61966119ec2b4fdc1b4ec8c SHA256 f3061e06c1e4f95602894587edf49d89bd62147b30e2b0a725ebb37ee5d44ff6
+EBUILD uwsgi-1.1_pre17.ebuild 5876 RMD160 b97713d03ca681751e4adec29513c0e3c8e0503f SHA1 ea466e2040445c6104e0eb022a3d2684ade4130b SHA256 c69551385851f3a23d023d1e3d43a691897f50a8771197dda1dd6fece8c6a4d0
+MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
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 0000000..a619bae
--- /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>
+
diff --git a/www-servers/uwsgi/files/uwsgi.confd b/www-servers/uwsgi/files/uwsgi.confd
new file mode 100644
index 0000000..d85b91f
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi.confd
@@ -0,0 +1,52 @@
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.confd,v 1.1 2011/05/31 19:49:07 maksbotan Exp $
+
+# 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
+UWSGI_EMPEROR_PATH=
+
+# Additional options you might want to pass to uWSGI
+#
+UWSGI_EXTRA_OPTIONS=
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
new file mode 100644
index 0000000..5b6335a
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -0,0 +1,134 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.initd,v 1.1 2011/05/31 19:49:07 maksbotan Exp $
+
+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_emperor() {
+ local OPTIONS
+ OPTIONS="--emperor ${UWSGI_EMPEROR_PATH} --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}" \
+ -- ${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} --file ${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() {
+ mkdir -p "${PIDPATH}"
+
+ if [ "${SVCNAME}" == "uwsgi" ]; then
+ if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
+ start_emperor
+ eend $?
+ else
+ eerror "You are not supposed to run this script directly. Create a symlink"
+ eerror "for the uwsgi application you want to run as well as a copy of the"
+ eerror "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 " `basename "${EDITOR}"` /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/metadata.xml b/www-servers/uwsgi/metadata.xml
new file mode 100644
index 0000000..18c5a8c
--- /dev/null
+++ b/www-servers/uwsgi/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>no-herd</herd>
+ <maintainer>
+ <email>hollow@gentoo.org</email>
+ <name>Benedikt Böhm</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/www-servers/uwsgi/uwsgi-1.1_pre17.ebuild b/www-servers/uwsgi/uwsgi-1.1_pre17.ebuild
new file mode 100644
index 0000000..8323b81
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-1.1_pre17.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.4:2.7 3:3.1:3.2"
+PYTHON_MODNAME="uwsgidecorators"
+SUPPORT_PYTHON_ABIS="1"
+USE_RUBY="ruby18 ree18 ruby19"
+RUBY_OPTIONAL="yes"
+
+MY_P="${P/_/-}"
+
+inherit apache-module python multilib ruby-ng
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+SRC_URI="http://projects.unbit.it/downloads/uwsgi-1.1-snapshot17.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 +caps +carbon debug json ldap lua +nagios perl +pcre python rrdtool rsyslog ruby spooler sqlite syslog +uuid +xml yaml zeromq"
+REQUIRED_USE="|| ( lua perl python ruby )"
+
+CDEPEND="caps? ( sys-libs/libcap )
+ json? ( dev-libs/jansson )
+ ldap? ( net-nds/openldap )
+ lua? ( dev-lang/lua )
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl )
+ ruby? ( $(ruby_implementations_depend) )
+ sqlite? ( dev-db/sqlite:3 )
+ rsyslog? ( app-admin/rsyslog )
+ uuid? ( sys-apps/util-linux )
+ xml? ( dev-libs/libxml2 )
+ yaml? ( dev-libs/libyaml )
+ zeromq? ( net-libs/zeromq )"
+DEPEND="${CDEPEND}
+ dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+ rrdtool? ( net-analyzer/rrdtool )"
+
+S="${WORKDIR}/uwsgi-1.1-snapshot17"
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="42_mod_${PN}"
+
+want_apache2_2
+
+use_true_false() {
+ if use $1 ; then
+ echo "true"
+ else
+ echo "false"
+ fi
+}
+
+src_unpack() {
+ default
+}
+
+pkg_setup() {
+ depend.apache_pkg_setup
+ python_pkg_setup
+}
+
+src_prepare() {
+ sed -i \
+ -e "s|'-O2', ||" \
+ -e "s|'-Werror', ||" \
+ -e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
+ uwsgiconfig.py || die "sed failed"
+
+ sed -i \
+ -e 's|python\([0-9].[0-9]\)-config|python-config-\1|' \
+ plugins/python/uwsgiplugin.py || die "sed failed"
+}
+
+src_configure() {
+ local plugins=""
+ use carbon && plugins+=", carbon"
+ use nagios && plugins+=", nagios"
+ use rrdtool && plugins+=", rrdtool"
+ use rsyslog && plugins+=", rsyslog"
+ use syslog && plugins+=", syslog"
+
+ cat > "buildconf/gentoo.ini" << EOF
+[uwsgi]
+xml = $(use_true_false xml)
+ini = true
+yaml = $(use_true_false yaml)
+json = $(use_true_false json)
+sqlite3 = $(use_true_false sqlite)
+zeromq = $(use_true_false zeromq)
+snmp = true
+sctp = false
+spooler = true
+embedded = true
+udp = true
+multicast = true
+threading = true
+sendfile = true
+minterpreters = true
+async = true
+evdis = false
+ldap = $(use_true_false ldap)
+pcre = $(use_true_false pcre)
+debug = $(use_true_false debug)
+unbit = false
+xml_implementation = libxml2
+yaml_implementation = libyaml
+malloc_implementation = libc
+plugins =
+bin_name = uwsgi
+append_version =
+plugin_dir = /usr/$(get_libdir)/uwsgi
+plugin_build_dir = ${T}/plugins
+embedded_plugins = ping, cache, rpc, fastrouter, http, ugreen, signal, logsocket, ${plugins:1}
+as_shared_library = false
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+embed_files =
+
+embed_config =
+[python]
+paste = true
+web3 = true
+EOF
+ use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+ use uuid || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+}
+
+each_ruby_compile() {
+ cd "${WORKDIR}/${MY_P}"
+
+ sed -i -e "s|^NAME=.*|NAME='rack_${RUBY##*/}'|" plugins/rack/uwsgiplugin.py || die "sed failed"
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo || die "building plugin for ${RUBY} failed"
+
+ if [[ "${RUBY}" == *ruby19 ]] ; then
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/ruby19 gentoo || die "building plugin for ${RUBY} failed"
+ fi
+}
+
+install_python_lib() {
+ insinto $(python_get_sitedir)
+ doins uwsgidecorators.py
+}
+
+src_compile() {
+ python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+
+ mkdir -p "${T}/plugins"
+
+ if use lua ; then
+ python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
+ fi
+
+ if use perl ; then
+ python uwsgiconfig.py --plugin plugins/psgi gentoo || die "building plugin for perl failed"
+ fi
+
+ if use python ; then
+ for a in ${PYTHON_ABIS} ; do
+ python${a} uwsgiconfig.py --plugin plugins/python gentoo python${a/.} || die "building plugin for python-${a} failed"
+ done
+ fi
+
+ if use ruby ; then
+ ruby-ng_src_compile
+ fi
+
+ if use spooler ; then
+ python uwsgiconfig.py --plugin plugins/spooler gentoo || die "building plugin for spooler failed"
+ fi
+
+ if use apache2 ; then
+ for m in Ruwsgi uwsgi ; do
+ APXS2_ARGS="-c mod_${m}.c"
+ apache-module_src_compile
+ done
+ fi
+}
+
+src_install() {
+ dobin uwsgi
+
+ insinto /usr/$(get_libdir)/uwsgi
+ doins "${T}/plugins"/*.so
+
+ use lua && dosym uwsgi /usr/bin/uwsgi_lua
+
+ use perl && dosym uwsgi /usr/bin/uwsgi_perl
+
+ if use python ; then
+ python_execute_function install_python_lib
+ for a in ${PYTHON_ABIS} ; do
+ dosym uwsgi /usr/bin/uwsgi_python${a/.}
+ done
+ fi
+
+ if use apache2; then
+ for m in Ruwsgi uwsgi ; do
+ APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
+ apache-module_src_install
+ done
+ fi
+
+ newinitd "${FILESDIR}"/uwsgi.initd uwsgi
+ newconfd "${FILESDIR}"/uwsgi.confd uwsgi
+ keepdir /etc/"${PN}".d
+ use spooler && keepdir /var/spool/"${PN}"
+}
+
+pkg_postinst() {
+ if use apache2 ; then
+ elog "Two Apache modules have been installed: mod_uwsgi and mod_Ruwsgi."
+ elog "You can enable them with -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
+ elog "Both have the same configuration interface and define the same symbols."
+ elog "Therefore you can enable only one of them at a time."
+ elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky."
+ elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
+ fi
+
+ if use lua || use perl || use ruby || use python; then
+ elog "The lua, perl and ruby modules are built as plugins."
+ elog "Use '--plugins lua', '--plugins psgi', '--plugins rack_ruby18' or '--plugins python27' to load them."
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/ultrabug:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2012-03-12 8:44 Alexys Jacob
0 siblings, 0 replies; 4+ messages in thread
From: Alexys Jacob @ 2012-03-12 8:44 UTC (permalink / raw
To: gentoo-commits
commit: 82d489b7a90cf5ceea1a51d434729b4451e4c5ee
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 08:43:56 2012 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 08:43:56 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=82d489b7
uwsgi RC bump
---
www-servers/uwsgi/Manifest | 6 +++---
www-servers/uwsgi/files/uwsgi.confd | 1 +
...uwsgi-1.1_pre17.ebuild => uwsgi-1.1_rc1.ebuild} | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index b82e018..bc7810b 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,6 +1,6 @@
AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
-AUX uwsgi.confd 1391 RMD160 712ee1e0c53e735d636d554468c2fcf49ca583ea SHA1 d40388f26793fb405917a7f5105982802f8854f3 SHA256 a6d9a34e0f33d100ae5177ae2da17dfdebdc4ba64d9e670b71ec9da156c0e960
+AUX uwsgi.confd 1436 RMD160 27556a66bcd8f55e50bbce61110fdcc0a7b78b22 SHA1 a054d3d71fe333edc3a13c441051592a0db552e0 SHA256 2d87d90f643948e6d7f2a491196874d930122c37ff65949b089fdcba26916399
AUX uwsgi.initd 3191 RMD160 dc665d3dc1325266c2fcee095503ae4e6b297980 SHA1 56396e9f7870a61e4084b524432972f349c09240 SHA256 4e2913b96e6fc88287879126727ae627e32fd5b51076aa8155af73359f1c97ca
-DIST uwsgi-1.1-snapshot17.tar.gz 487321 RMD160 3310a90441dbf3c4d692c597a090728a2fab86d9 SHA1 406fd977f0a3acb8c61966119ec2b4fdc1b4ec8c SHA256 f3061e06c1e4f95602894587edf49d89bd62147b30e2b0a725ebb37ee5d44ff6
-EBUILD uwsgi-1.1_pre17.ebuild 5876 RMD160 b97713d03ca681751e4adec29513c0e3c8e0503f SHA1 ea466e2040445c6104e0eb022a3d2684ade4130b SHA256 c69551385851f3a23d023d1e3d43a691897f50a8771197dda1dd6fece8c6a4d0
+DIST uwsgi-1.1-rc1.tar.gz 493055 RMD160 c0bfd23c37afe6eccc4e419850ae183bbdf60247 SHA1 31d5231252bccc6008d232ae636783ae53eed670 SHA256 426dcf6e72b4f476301ce8b3e9d9541ee8a550c58445b5fec5346057d4f4350a
+EBUILD uwsgi-1.1_rc1.ebuild 5850 RMD160 bb5326e782c472af8e2f9947e2459a0aa2aed390 SHA1 04ff14c0ba066521134bd7af6c88a959dc5ef548 SHA256 77444c6ca0ee343bce8cd2d1224aa1d58c0c2c4fc0040e0910e503e0b36880b1
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
diff --git a/www-servers/uwsgi/files/uwsgi.confd b/www-servers/uwsgi/files/uwsgi.confd
index d85b91f..5d1fc5c 100644
--- a/www-servers/uwsgi/files/uwsgi.confd
+++ b/www-servers/uwsgi/files/uwsgi.confd
@@ -45,6 +45,7 @@ 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
diff --git a/www-servers/uwsgi/uwsgi-1.1_pre17.ebuild b/www-servers/uwsgi/uwsgi-1.1_rc1.ebuild
similarity index 98%
rename from www-servers/uwsgi/uwsgi-1.1_pre17.ebuild
rename to www-servers/uwsgi/uwsgi-1.1_rc1.ebuild
index 8323b81..d4fa225 100644
--- a/www-servers/uwsgi/uwsgi-1.1_pre17.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.1_rc1.ebuild
@@ -15,7 +15,7 @@ inherit apache-module python multilib ruby-ng
DESCRIPTION="uWSGI server for Python web applications"
HOMEPAGE="http://projects.unbit.it/uwsgi/"
-SRC_URI="http://projects.unbit.it/downloads/uwsgi-1.1-snapshot17.tar.gz"
+SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -41,7 +41,7 @@ DEPEND="${CDEPEND}
RDEPEND="${CDEPEND}
rrdtool? ( net-analyzer/rrdtool )"
-S="${WORKDIR}/uwsgi-1.1-snapshot17"
+S="${WORKDIR}/${MY_P}"
APXS2_S="${S}/apache2"
APACHE2_MOD_CONF="42_mod_${PN}"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/ultrabug:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2012-05-14 8:09 Alexys Jacob
0 siblings, 0 replies; 4+ messages in thread
From: Alexys Jacob @ 2012-05-14 8:09 UTC (permalink / raw
To: gentoo-commits
commit: 3422559c50e79acc8fbc779dff80d854ce4514da
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 08:09:07 2012 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon May 14 08:09:07 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=3422559c
merge dev-zero's php work, bump, drop old
---
www-servers/uwsgi/Manifest | 5 +-
www-servers/uwsgi/files/1.1.2-threaded-php.patch | 40 +++++++++++
.../{uwsgi-1.1.2.ebuild => uwsgi-1.2.3.ebuild} | 75 +++++++++++++++++---
3 files changed, 107 insertions(+), 13 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index f5dfaeb..dbeda61 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,6 +1,7 @@
+AUX 1.1.2-threaded-php.patch 1098 RMD160 df45f3951fe9b75e2fbde10e5bcf8fa42f42c7eb SHA1 de05ded4b9a82392bb662a2cf2a05e8741fce641 SHA256 e5f03fcdf2ebf7d2867b21e640f2c44f23da169108b2ea964e96fea44152d49b
AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
AUX uwsgi.confd 1436 RMD160 27556a66bcd8f55e50bbce61110fdcc0a7b78b22 SHA1 a054d3d71fe333edc3a13c441051592a0db552e0 SHA256 2d87d90f643948e6d7f2a491196874d930122c37ff65949b089fdcba26916399
AUX uwsgi.initd 3191 RMD160 dc665d3dc1325266c2fcee095503ae4e6b297980 SHA1 56396e9f7870a61e4084b524432972f349c09240 SHA256 4e2913b96e6fc88287879126727ae627e32fd5b51076aa8155af73359f1c97ca
-DIST uwsgi-1.1.2.tar.gz 497365 RMD160 4bb5f23db5b2ca0ae585dfde01dfc5bc1ea823c2 SHA1 b48ec35fcdd19c1786257958e34089c021655ba9 SHA256 0fc96217f83fed8cfaa340db2d09adb938b43edb1a963df8ede87f8d87b06e76
-EBUILD uwsgi-1.1.2.ebuild 5893 RMD160 2b1fbf04e43df8746649cd3d4c8e650e6b98a665 SHA1 8c0a48eb7bb26cd19c61a1bdf721c10cad5033fc SHA256 6ac20ab16efbf50815ff123efcedd8056b7a68d8d55205e8d9f6b5ffdbf38997
+DIST uwsgi-1.2.3.tar.gz 512385 RMD160 816a2970b1ba57a25fe0e12fde2ebb49092408c1 SHA1 337d2144fae8982c97a91830287e84b84974ad10 SHA256 1f9f6047468272708241780597014ed00d93919a384e81b30e65167fb2c2e129
+EBUILD uwsgi-1.2.3.ebuild 7318 RMD160 23d2500c7a9324aa183eb55dea11632b96db6493 SHA1 f0e64c4f999d9b2e9cc271990f431c1f64169d8d SHA256 8544a7b4234b07b90712e09c8b37f6d4e75f44a7cd98cac67c2ae4906387f754
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
diff --git a/www-servers/uwsgi/files/1.1.2-threaded-php.patch b/www-servers/uwsgi/files/1.1.2-threaded-php.patch
new file mode 100644
index 0000000..ed75ad9
--- /dev/null
+++ b/www-servers/uwsgi/files/1.1.2-threaded-php.patch
@@ -0,0 +1,40 @@
+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/uwsgi-1.1.2.ebuild b/www-servers/uwsgi/uwsgi-1.2.3.ebuild
similarity index 70%
rename from www-servers/uwsgi/uwsgi-1.1.2.ebuild
rename to www-servers/uwsgi/uwsgi-1.2.3.ebuild
index 185095d..733c8df 100644
--- a/www-servers/uwsgi/uwsgi-1.1.2.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -8,10 +8,14 @@ PYTHON_MODNAME="uwsgidecorators"
SUPPORT_PYTHON_ABIS="1"
USE_RUBY="ruby18 ree18 ruby19"
RUBY_OPTIONAL="yes"
+PHP_EXT_NAME="dummy"
+PHP_EXT_INI="no"
+USE_PHP="php5-3 php5-4" # deps must be registered separately below
+PHP_EXT_OPTIONAL_USE="php"
MY_P="${P/_/-}"
-inherit apache-module python multilib pax-utils ruby-ng
+inherit apache-module eutils python multilib pax-utils php-ext-source-r2 ruby-ng
DESCRIPTION="uWSGI server for Python web applications"
HOMEPAGE="http://projects.unbit.it/uwsgi/"
@@ -20,15 +24,21 @@ SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="apache2 +caps +carbon debug json ldap lua +nagios perl +pcre python rrdtool rsyslog ruby spooler sqlite syslog +uuid +xml yaml zeromq"
-REQUIRED_USE="|| ( lua perl python ruby )"
+IUSE="apache2 +caps +carbon debug erlang graylog2 json ldap lua +nagios perl +pcre php python rrdtool rsyslog ruby spooler sqlite syslog +uuid +xml yaml zeromq"
+REQUIRED_USE="|| ( erlang lua perl php python ruby )"
CDEPEND="caps? ( sys-libs/libcap )
json? ( dev-libs/jansson )
+ erlang? ( dev-lang/erlang )
+ graylog2? ( sys-libs/zlib )
ldap? ( net-nds/openldap )
lua? ( dev-lang/lua )
pcre? ( dev-libs/libpcre )
perl? ( dev-lang/perl )
+ php? (
+ php_targets_php5-3? ( dev-lang/php:5.3[embed] )
+ php_targets_php5-4? ( dev-lang/php:5.4[embed] )
+ )
ruby? ( $(ruby_implementations_depend) )
sqlite? ( dev-db/sqlite:3 )
rsyslog? ( app-admin/rsyslog )
@@ -65,6 +75,8 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}/1.1.2-threaded-php.patch"
+
sed -i \
-e "s|'-O2', ||" \
-e "s|'-Werror', ||" \
@@ -74,11 +86,16 @@ src_prepare() {
sed -i \
-e 's|python\([0-9].[0-9]\)-config|python-config-\1|' \
plugins/python/uwsgiplugin.py || die "sed failed"
+
+ sed -i \
+ -e "s|/lib|/$(get_libdir)|" \
+ plugins/php/uwsgiplugin.py || die "sed failed"
}
src_configure() {
local plugins=""
use carbon && plugins+=", carbon"
+ use graylog2 && plugins+=", graylog2"
use nagios && plugins+=", nagios"
use rrdtool && plugins+=", rrdtool"
use rsyslog && plugins+=", rsyslog"
@@ -115,7 +132,7 @@ bin_name = uwsgi
append_version =
plugin_dir = /usr/$(get_libdir)/uwsgi
plugin_build_dir = ${T}/plugins
-embedded_plugins = ping, cache, rpc, fastrouter, http, ugreen, signal, logsocket, ${plugins:1}
+embedded_plugins = ping, cache, rpc, fastrouter, http, ugreen, signal, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, ${plugins:1}
as_shared_library = false
locking = auto
@@ -137,11 +154,10 @@ EOF
each_ruby_compile() {
cd "${WORKDIR}/${MY_P}"
- sed -i -e "s|^NAME=.*|NAME='rack_${RUBY##*/}'|" plugins/rack/uwsgiplugin.py || die "sed failed"
- UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo || die "building plugin for ${RUBY} failed"
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
if [[ "${RUBY}" == *ruby19 ]] ; then
- UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/ruby19 gentoo || die "building plugin for ${RUBY} failed"
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo || die "building fiber plugin for ${RUBY} failed"
fi
}
@@ -155,6 +171,10 @@ src_compile() {
mkdir -p "${T}/plugins"
+ if use erlang ; then
+ python uwsgiconfig.py --plugin plugins/erlang gentoo || die "building plugin for erlang failed"
+ fi
+
if use lua ; then
python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
fi
@@ -163,6 +183,12 @@ src_compile() {
python uwsgiconfig.py --plugin plugins/psgi gentoo || die "building plugin for perl failed"
fi
+ if use php ; then
+ for s in $(php_get_slots); do
+ UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
+ done
+ fi
+
if use python ; then
for a in ${PYTHON_ABIS} ; do
python${a} uwsgiconfig.py --plugin plugins/python gentoo python${a/.} || die "building plugin for python-${a} failed"
@@ -196,6 +222,12 @@ src_install() {
use perl && dosym uwsgi /usr/bin/uwsgi_perl
+ if use php ; then
+ for a in ${PYTHON_ABIS} ; do
+ dosym uwsgi /usr/bin/uwsgi_${s/.}
+ done
+ fi
+
if use python ; then
python_execute_function install_python_lib
for a in ${PYTHON_ABIS} ; do
@@ -226,8 +258,29 @@ pkg_postinst() {
elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
fi
- if use lua || use perl || use ruby || use python; then
- elog "The lua, perl and ruby modules are built as plugins."
- elog "Use '--plugins lua', '--plugins psgi', '--plugins rack_ruby18' or '--plugins python27' to load them."
+ elog "Append the following options to the uwsgi call to load the respective language plugin:"
+ use erlang && elog " '--plugins erlang' for erlang"
+ use lua && elog " '--plugins lua' for lua"
+ use perl && elog " '--plugins psgi' for perl"
+
+ if use php ; then
+ for s in $(php_get_slots); do
+ elog " '--plugins ${s/.}' for ${s}"
+ done
+ fi
+
+ if use python ; then
+ for a in ${PYTHON_ABIS} ; do
+ elog " '--plugins python${a/.}' for python-${a}"
+ done
+ fi
+
+ if use ruby ; then
+ for ruby in $USE_RUBY; do
+ use ruby_targets_${ruby} && elog " '--plugins rack_${ruby/.}' for ${ruby}"
+ if [[ "${ruby}" == *ruby19 ]] ; then
+ elog " '--plugins fibre' for ruby-1.9 fibres"
+ fi
+ done
fi
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] dev/ultrabug:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2012-05-15 7:43 Alexys Jacob
0 siblings, 0 replies; 4+ messages in thread
From: Alexys Jacob @ 2012-05-15 7:43 UTC (permalink / raw
To: gentoo-commits
commit: 28bcdc7ab5956cf9a544ca09670a31a5b26839bb
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Tue May 15 07:43:50 2012 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue May 15 07:43:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=28bcdc7a
uwsgi now in g-x86
---
www-servers/uwsgi/Manifest | 7 -
www-servers/uwsgi/files/1.1.2-threaded-php.patch | 40 ---
www-servers/uwsgi/files/42_mod_uwsgi.conf | 7 -
www-servers/uwsgi/files/uwsgi.confd | 53 ----
www-servers/uwsgi/files/uwsgi.initd | 134 ----------
www-servers/uwsgi/metadata.xml | 9 -
www-servers/uwsgi/uwsgi-1.2.3.ebuild | 286 ----------------------
7 files changed, 0 insertions(+), 536 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
deleted file mode 100644
index dbeda61..0000000
--- a/www-servers/uwsgi/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 1.1.2-threaded-php.patch 1098 RMD160 df45f3951fe9b75e2fbde10e5bcf8fa42f42c7eb SHA1 de05ded4b9a82392bb662a2cf2a05e8741fce641 SHA256 e5f03fcdf2ebf7d2867b21e640f2c44f23da169108b2ea964e96fea44152d49b
-AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
-AUX uwsgi.confd 1436 RMD160 27556a66bcd8f55e50bbce61110fdcc0a7b78b22 SHA1 a054d3d71fe333edc3a13c441051592a0db552e0 SHA256 2d87d90f643948e6d7f2a491196874d930122c37ff65949b089fdcba26916399
-AUX uwsgi.initd 3191 RMD160 dc665d3dc1325266c2fcee095503ae4e6b297980 SHA1 56396e9f7870a61e4084b524432972f349c09240 SHA256 4e2913b96e6fc88287879126727ae627e32fd5b51076aa8155af73359f1c97ca
-DIST uwsgi-1.2.3.tar.gz 512385 RMD160 816a2970b1ba57a25fe0e12fde2ebb49092408c1 SHA1 337d2144fae8982c97a91830287e84b84974ad10 SHA256 1f9f6047468272708241780597014ed00d93919a384e81b30e65167fb2c2e129
-EBUILD uwsgi-1.2.3.ebuild 7318 RMD160 23d2500c7a9324aa183eb55dea11632b96db6493 SHA1 f0e64c4f999d9b2e9cc271990f431c1f64169d8d SHA256 8544a7b4234b07b90712e09c8b37f6d4e75f44a7cd98cac67c2ae4906387f754
-MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
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 ed75ad9..0000000
--- 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/42_mod_uwsgi.conf b/www-servers/uwsgi/files/42_mod_uwsgi.conf
deleted file mode 100644
index a619bae..0000000
--- 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 b/www-servers/uwsgi/files/uwsgi.confd
deleted file mode 100644
index 5d1fc5c..0000000
--- a/www-servers/uwsgi/files/uwsgi.confd
+++ /dev/null
@@ -1,53 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.confd,v 1.1 2011/05/31 19:49:07 maksbotan Exp $
-
-# 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.initd b/www-servers/uwsgi/files/uwsgi.initd
deleted file mode 100644
index 5b6335a..0000000
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.initd,v 1.1 2011/05/31 19:49:07 maksbotan Exp $
-
-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_emperor() {
- local OPTIONS
- OPTIONS="--emperor ${UWSGI_EMPEROR_PATH} --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}" \
- -- ${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} --file ${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() {
- mkdir -p "${PIDPATH}"
-
- if [ "${SVCNAME}" == "uwsgi" ]; then
- if [ -n "${UWSGI_EMPEROR_PATH}" ]; then
- start_emperor
- eend $?
- else
- eerror "You are not supposed to run this script directly. Create a symlink"
- eerror "for the uwsgi application you want to run as well as a copy of the"
- eerror "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 " `basename "${EDITOR}"` /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/metadata.xml b/www-servers/uwsgi/metadata.xml
deleted file mode 100644
index 18c5a8c..0000000
--- a/www-servers/uwsgi/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>no-herd</herd>
- <maintainer>
- <email>hollow@gentoo.org</email>
- <name>Benedikt Böhm</name>
- </maintainer>
-</pkgmetadata>
diff --git a/www-servers/uwsgi/uwsgi-1.2.3.ebuild b/www-servers/uwsgi/uwsgi-1.2.3.ebuild
deleted file mode 100644
index 733c8df..0000000
--- a/www-servers/uwsgi/uwsgi-1.2.3.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2:2.4:2.7 3:3.1:3.2"
-PYTHON_MODNAME="uwsgidecorators"
-SUPPORT_PYTHON_ABIS="1"
-USE_RUBY="ruby18 ree18 ruby19"
-RUBY_OPTIONAL="yes"
-PHP_EXT_NAME="dummy"
-PHP_EXT_INI="no"
-USE_PHP="php5-3 php5-4" # deps must be registered separately below
-PHP_EXT_OPTIONAL_USE="php"
-
-MY_P="${P/_/-}"
-
-inherit apache-module eutils python multilib pax-utils php-ext-source-r2 ruby-ng
-
-DESCRIPTION="uWSGI server for Python web applications"
-HOMEPAGE="http://projects.unbit.it/uwsgi/"
-SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 +caps +carbon debug erlang graylog2 json ldap lua +nagios perl +pcre php python rrdtool rsyslog ruby spooler sqlite syslog +uuid +xml yaml zeromq"
-REQUIRED_USE="|| ( erlang lua perl php python ruby )"
-
-CDEPEND="caps? ( sys-libs/libcap )
- json? ( dev-libs/jansson )
- erlang? ( dev-lang/erlang )
- graylog2? ( sys-libs/zlib )
- ldap? ( net-nds/openldap )
- lua? ( dev-lang/lua )
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl )
- php? (
- php_targets_php5-3? ( dev-lang/php:5.3[embed] )
- php_targets_php5-4? ( dev-lang/php:5.4[embed] )
- )
- ruby? ( $(ruby_implementations_depend) )
- sqlite? ( dev-db/sqlite:3 )
- rsyslog? ( app-admin/rsyslog )
- uuid? ( sys-apps/util-linux )
- xml? ( dev-libs/libxml2 )
- yaml? ( dev-libs/libyaml )
- zeromq? ( net-libs/zeromq )"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig"
-RDEPEND="${CDEPEND}
- rrdtool? ( net-analyzer/rrdtool )"
-
-S="${WORKDIR}/${MY_P}"
-APXS2_S="${S}/apache2"
-APACHE2_MOD_CONF="42_mod_${PN}"
-
-want_apache2_2
-
-use_true_false() {
- if use $1 ; then
- echo "true"
- else
- echo "false"
- fi
-}
-
-src_unpack() {
- default
-}
-
-pkg_setup() {
- depend.apache_pkg_setup
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}/1.1.2-threaded-php.patch"
-
- sed -i \
- -e "s|'-O2', ||" \
- -e "s|'-Werror', ||" \
- -e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
- uwsgiconfig.py || die "sed failed"
-
- sed -i \
- -e 's|python\([0-9].[0-9]\)-config|python-config-\1|' \
- plugins/python/uwsgiplugin.py || die "sed failed"
-
- sed -i \
- -e "s|/lib|/$(get_libdir)|" \
- plugins/php/uwsgiplugin.py || die "sed failed"
-}
-
-src_configure() {
- local plugins=""
- use carbon && plugins+=", carbon"
- use graylog2 && plugins+=", graylog2"
- use nagios && plugins+=", nagios"
- use rrdtool && plugins+=", rrdtool"
- use rsyslog && plugins+=", rsyslog"
- use syslog && plugins+=", syslog"
-
- cat > "buildconf/gentoo.ini" << EOF
-[uwsgi]
-xml = $(use_true_false xml)
-ini = true
-yaml = $(use_true_false yaml)
-json = $(use_true_false json)
-sqlite3 = $(use_true_false sqlite)
-zeromq = $(use_true_false zeromq)
-snmp = true
-sctp = false
-spooler = true
-embedded = true
-udp = true
-multicast = true
-threading = true
-sendfile = true
-minterpreters = true
-async = true
-evdis = false
-ldap = $(use_true_false ldap)
-pcre = $(use_true_false pcre)
-debug = $(use_true_false debug)
-unbit = false
-xml_implementation = libxml2
-yaml_implementation = libyaml
-malloc_implementation = libc
-plugins =
-bin_name = uwsgi
-append_version =
-plugin_dir = /usr/$(get_libdir)/uwsgi
-plugin_build_dir = ${T}/plugins
-embedded_plugins = ping, cache, rpc, fastrouter, http, ugreen, signal, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, ${plugins:1}
-as_shared_library = false
-
-locking = auto
-event = auto
-timer = auto
-filemonitor = auto
-
-embed_files =
-
-embed_config =
-[python]
-paste = true
-web3 = true
-EOF
- use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
- use uuid || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-}
-
-each_ruby_compile() {
- cd "${WORKDIR}/${MY_P}"
-
- UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
-
- if [[ "${RUBY}" == *ruby19 ]] ; then
- UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo || die "building fiber plugin for ${RUBY} failed"
- fi
-}
-
-install_python_lib() {
- insinto $(python_get_sitedir)
- doins uwsgidecorators.py
-}
-
-src_compile() {
- python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
-
- mkdir -p "${T}/plugins"
-
- if use erlang ; then
- python uwsgiconfig.py --plugin plugins/erlang gentoo || die "building plugin for erlang failed"
- fi
-
- if use lua ; then
- python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
- fi
-
- if use perl ; then
- python uwsgiconfig.py --plugin plugins/psgi gentoo || die "building plugin for perl failed"
- fi
-
- if use php ; then
- for s in $(php_get_slots); do
- UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
- done
- fi
-
- if use python ; then
- for a in ${PYTHON_ABIS} ; do
- python${a} uwsgiconfig.py --plugin plugins/python gentoo python${a/.} || die "building plugin for python-${a} failed"
- done
- fi
-
- if use ruby ; then
- ruby-ng_src_compile
- fi
-
- if use spooler ; then
- python uwsgiconfig.py --plugin plugins/spooler gentoo || die "building plugin for spooler failed"
- fi
-
- if use apache2 ; then
- for m in Ruwsgi uwsgi ; do
- APXS2_ARGS="-c mod_${m}.c"
- apache-module_src_compile
- done
- fi
-}
-
-src_install() {
- dobin uwsgi
- pax-mark m "${D}"/usr/bin/uwsgi
-
- insinto /usr/$(get_libdir)/uwsgi
- doins "${T}/plugins"/*.so
-
- use lua && dosym uwsgi /usr/bin/uwsgi_lua
-
- use perl && dosym uwsgi /usr/bin/uwsgi_perl
-
- if use php ; then
- for a in ${PYTHON_ABIS} ; do
- dosym uwsgi /usr/bin/uwsgi_${s/.}
- done
- fi
-
- if use python ; then
- python_execute_function install_python_lib
- for a in ${PYTHON_ABIS} ; do
- dosym uwsgi /usr/bin/uwsgi_python${a/.}
- done
- fi
-
- if use apache2; then
- for m in Ruwsgi uwsgi ; do
- APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
- apache-module_src_install
- done
- fi
-
- newinitd "${FILESDIR}"/uwsgi.initd uwsgi
- newconfd "${FILESDIR}"/uwsgi.confd uwsgi
- keepdir /etc/"${PN}".d
- use spooler && keepdir /var/spool/"${PN}"
-}
-
-pkg_postinst() {
- if use apache2 ; then
- elog "Two Apache modules have been installed: mod_uwsgi and mod_Ruwsgi."
- elog "You can enable them with -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
- elog "Both have the same configuration interface and define the same symbols."
- elog "Therefore you can enable only one of them at a time."
- elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky."
- elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
- fi
-
- elog "Append the following options to the uwsgi call to load the respective language plugin:"
- use erlang && elog " '--plugins erlang' for erlang"
- use lua && elog " '--plugins lua' for lua"
- use perl && elog " '--plugins psgi' for perl"
-
- if use php ; then
- for s in $(php_get_slots); do
- elog " '--plugins ${s/.}' for ${s}"
- done
- fi
-
- if use python ; then
- for a in ${PYTHON_ABIS} ; do
- elog " '--plugins python${a/.}' for python-${a}"
- done
- fi
-
- if use ruby ; then
- for ruby in $USE_RUBY; do
- use ruby_targets_${ruby} && elog " '--plugins rack_${ruby/.}' for ${ruby}"
- if [[ "${ruby}" == *ruby19 ]] ; then
- elog " '--plugins fibre' for ruby-1.9 fibres"
- fi
- done
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-15 7:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-14 8:09 [gentoo-commits] dev/ultrabug:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/ Alexys Jacob
-- strict thread matches above, loose matches on Subject: below --
2012-05-15 7:43 Alexys Jacob
2012-03-12 8:44 Alexys Jacob
2012-03-07 12:18 Alexys Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox