* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2011-11-21 10:56 Tiziano Müller
0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-11-21 10:56 UTC (permalink / raw
To: gentoo-commits
commit: 943162c8dd859c9b97d6f325f90dfcc1d61941da
Author: Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Mon Nov 21 10:56:25 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 10:56:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=943162c8
Use upstream's way to package python plugins. Version bump.
---
www-servers/uwsgi/Manifest | 10 +-
.../uwsgi/files/uwsgi-0.9.8-no-werror.patch | 11 --
.../uwsgi/files/uwsgi-0.9.8.3-fix-destdir.patch | 11 --
www-servers/uwsgi/uwsgi-0.9.8.6.ebuild | 109 +++++++++++-------
.../{uwsgi-0.9.8.6.ebuild => uwsgi-1.0_rc6.ebuild} | 119 +++++++++++++-------
5 files changed, 151 insertions(+), 109 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 768001c..d5ec9d4 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,4 +1,3 @@
-MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
AUX uwsgi-0.9.8-fix-psgi-flags.patch 640 RMD160 6556801682d2c35e30b394812bf3c695b3f234da SHA1 6e305e2d1d9c8b3f5f0d41b72bcd058a2a1d0cc1 SHA256 f27db595c0c9e9002163d978fc5f7075e1aa8fd453395ac6c43848b1a96bdb42
AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
@@ -6,7 +5,10 @@ AUX uwsgi-0.9.8.3-fix-destdir.patch 385 RMD160 86e055c560079c61035107943d63c48d3
AUX uwsgi-9999-fix-destdir.patch 385 RMD160 86e055c560079c61035107943d63c48d3689c35c SHA1 44b54276acf2ea61da824bf8aab054e662cdc8aa SHA256 b9fcaf3b7a76ab7a5150b85df4a39ecf578a7f181d9880c36d1e6e876bcb0ed7
AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094ce9cf3b55f1c418f1602e0451462103a5117174a4
AUX uwsgi.initd 2388 RMD160 32dcbde8f29c55f3aba996396880d543fc51f97d SHA1 24276db0dd82a5b5cdd756772ed81ae5c86e6e45 SHA256 6497afcc6208d54f01ef853bff0ee33eb4f5f63e0eb3e024bc206ee78966986b
-MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
-EBUILD uwsgi-0.9.8.6.ebuild 3720 RMD160 50df26197402d355939a599d2229a86e9c14bbfb SHA1 a5902c32a7a2ef598fbd1bb35bed2bceabdd0336 SHA256 198eaa5873b5a7815e8e9831d5756f7636f12ed066bf1b99adc273cc7e8e1583
-EBUILD uwsgi-9999.ebuild 3714 RMD160 eb0a5686a9620fc309649c47b1c912dcb7a2948b SHA1 c45150e52d072f8b63ebb40fa3cf5c4d8cb67b6f SHA256 74251b3da8ff0d99aa12ee0905b4b20fe3ab581afd7054a6c8fb09a2d6622c64
DIST uwsgi-0.9.8.6.tar.gz 359620 RMD160 78b92fe3a9b272ca5a2704b0db7d1956b9149a0b SHA1 bb835c3c14310640b24ebdbcf0aa91e8ce8bd5a6 SHA256 14379c0055063dbfbc4ce9ba10dfd6eec827286a462300d98947174d9694d981
+DIST uwsgi-1.0-rc6.tar.gz 441757 RMD160 67ba49700adc523a73ce9cc49ce86d742352c32e SHA1 bc2da6d7572222bf13cb6f3423e7dd4d38b7e3ce SHA256 e3878ac5fef7a9c4e5ebffe4c79a424c2aff34ebc5f6a6b2f88f16cb515552e2
+EBUILD uwsgi-0.9.8.6.ebuild 4304 RMD160 ce533908cedae761db93ae26b811ae09e12847fc SHA1 29710c3c36fe5cffb34c180f9c6a48d7ace001e5 SHA256 5bf9203180bfa41622cad1f8c414b0a00af7b901e70017784f7648be43316b28
+EBUILD uwsgi-1.0_rc6.ebuild 4494 RMD160 7bdd37f424fe0d24595fcae20219cbdb98222006 SHA1 a0580b78bcd9a682d93ef8443f3d23f08d4dfbb1 SHA256 3022965197bf679019c3be27acbb274df31da095afeea2b06658c136bb7e86aa
+EBUILD uwsgi-9999.ebuild 3714 RMD160 eb0a5686a9620fc309649c47b1c912dcb7a2948b SHA1 c45150e52d072f8b63ebb40fa3cf5c4d8cb67b6f SHA256 74251b3da8ff0d99aa12ee0905b4b20fe3ab581afd7054a6c8fb09a2d6622c64
+MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
+MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
diff --git a/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch b/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch
deleted file mode 100644
index f55d6bb..0000000
--- a/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- uwsgiconfig.py 2011-06-07 18:38:50.000000000 +0400
-+++ uwsgiconfig.py 2011-06-05 10:28:03.000000000 +0400
-@@ -176,7 +176,7 @@
- if uwsgi_os == 'Linux':
- self.gcc_list.append('lib/linux_ns')
- self.gcc_list.append('lib/netlink')
-- self.cflags = ['-O2', '-Wall', '-Werror', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split()
-+ self.cflags = ['-O2', '-Wall', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split()
- try:
- gcc_version = str(spcall("%s -dumpversion" % GCC))
- except:
diff --git a/www-servers/uwsgi/files/uwsgi-0.9.8.3-fix-destdir.patch b/www-servers/uwsgi/files/uwsgi-0.9.8.3-fix-destdir.patch
deleted file mode 100644
index a7c47b6..0000000
--- a/www-servers/uwsgi/files/uwsgi-0.9.8.3-fix-destdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- uwsgiconfig.py.orig 2011-08-08 17:56:14.649325030 +0200
-+++ uwsgiconfig.py 2011-08-08 17:58:00.085329500 +0200
-@@ -670,7 +670,7 @@
- else:
- p_cflags.append("-D%s_plugin=%s_plugin" % (up.NAME, name))
-
-- plugin_dest = uc.get('plugin_dir') + '/' + name + '_plugin'
-+ plugin_dest = uc.get('plugin_build_dir') + '/' + name + '_plugin'
-
- shared_flag = '-shared'
-
diff --git a/www-servers/uwsgi/uwsgi-0.9.8.6.ebuild b/www-servers/uwsgi/uwsgi-0.9.8.6.ebuild
index 7bc3bf3..04fd42a 100644
--- a/www-servers/uwsgi/uwsgi-0.9.8.6.ebuild
+++ b/www-servers/uwsgi/uwsgi-0.9.8.6.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.8.ebuild,v 1.1 2011/06/08 18:00:13 maksbotan Exp $
+# $Header: $
-EAPI="3"
-PYTHON_DEPEND="*"
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.4:2.7 3:3.1:3.2"
SUPPORT_PYTHON_ABIS="1"
-inherit eutils python toolchain-funcs apache-module
+inherit apache-module python multilib
DESCRIPTION="uWSGI server for Python web applications"
HOMEPAGE="http://projects.unbit.it/uwsgi/"
@@ -15,32 +15,26 @@ SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug json ldap lua pcre perl ruby sqlite +xml yaml zeromq"
+IUSE="apache2 debug json ldap lua +nagios +pcre perl python rrdtool sqlite +xml yaml zeromq"
-RDEPEND="json? ( dev-libs/jansson )
+CDEPEND="json? ( dev-libs/jansson )
ldap? ( net-nds/openldap )
lua? ( dev-lang/lua )
pcre? ( dev-libs/libpcre )
perl? ( dev-lang/perl )
- ruby? ( dev-lang/ruby )
sqlite? ( dev-db/sqlite:3 )
xml? ( dev-libs/libxml2 )
yaml? ( dev-libs/libyaml )
zeromq? ( net-libs/zeromq )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+ rrdtool? ( net-analyzer/rrdtool )"
APXS2_S="${S}/apache2"
APACHE2_MOD_CONF="42_mod_${PN}"
want_apache2_2
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-0.9.8-no-werror.patch \
- "${FILESDIR}"/${PN}-0.9.8.3-fix-destdir.patch
- python_copy_sources
-}
-
use_true_false() {
if use $1 ; then
echo "true"
@@ -49,15 +43,29 @@ use_true_false() {
fi
}
+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() {
- configure() {
- local plugins
- use lua && plugins+=", lua"
- use perl && plugins+=", psgi"
- use ruby && plugins+=", rack"
- plugins="${plugins:1}"
-
- cat > "buildconf/default.ini" << EOF
+ local plugins=""
+ use nagios && plugins+=", nagios"
+ use rrdtool && plugins+=", rrdtool"
+
+ cat > "buildconf/gentoo.ini" << EOF
[uwsgi]
xml = $(use_true_false xml)
ini = true
@@ -83,12 +91,13 @@ unbit = false
xml_implementation = libxml2
yaml_implementation = libyaml
malloc_implementation = libc
-plugins = ${plugins}
+plugins =
bin_name = uwsgi
append_version =
-plugin_build_dir = plugins
plugin_dir = /usr/$(get_libdir)/uwsgi
-embedded_plugins = python, ping, cache, nagios, rpc, fastrouter, http, ugreen
+plugin_build_dir = ${T}/plugins
+embedded_plugins = ping, cache, rpc, fastrouter, http, ugreen, ${plugins:1}
+as_shared_library = false
locking = auto
event = auto
@@ -104,12 +113,26 @@ paste = true
web3 = true
EOF
- }
- python_execute_function -s configure
}
src_compile() {
- python_src_compile CC="$(tc-getCC)"
+ 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/perl gentoo || die "building plugin for perl failed"
+ fi
+
+ if use python ; then
+ for a in ${PYTHON_ABIS} ; do
+ python uwsgiconfig.py --plugin plugins/python${a/.} gentoo || die "building plugin for python-${a} failed"
+ done
+ fi
if use apache2 ; then
for m in Ruwsgi uwsgi ; do
@@ -120,16 +143,20 @@ src_compile() {
}
src_install() {
- installation() {
- newbin uwsgi uwsgi-${PYTHON_ABI}
- if use lua || use perl || use ruby ; then
- insinto /usr/$(get_libdir)/uwsgi
- doins plugins/*.so
- fi
- }
- python_execute_function -s installation
+ dobin uwsgi
- python_generate_wrapper_scripts "${ED}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 python ; then
+ 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
@@ -152,8 +179,8 @@ pkg_postinst() {
elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
fi
- if use lua || use perl || use ruby ; then
- elog "The lua, perl and ruby modules are built as plugins."
- elog "Use '--plugins lua', '--plugins psgi' or '--plugins rack' to load them."
+ if use lua || use perl || use python; then
+ elog "The lua, perl and python modules are built as plugins."
+ elog "Use '--plugins lua', '--plugins psgi' or '--plugins python27' to load them."
fi
}
diff --git a/www-servers/uwsgi/uwsgi-0.9.8.6.ebuild b/www-servers/uwsgi/uwsgi-1.0_rc6.ebuild
similarity index 54%
copy from www-servers/uwsgi/uwsgi-0.9.8.6.ebuild
copy to www-servers/uwsgi/uwsgi-1.0_rc6.ebuild
index 7bc3bf3..0641b06 100644
--- a/www-servers/uwsgi/uwsgi-0.9.8.6.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.0_rc6.ebuild
@@ -1,23 +1,25 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.8.ebuild,v 1.1 2011/06/08 18:00:13 maksbotan Exp $
+# $Header: $
-EAPI="3"
-PYTHON_DEPEND="*"
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.4:2.7 3:3.1:3.2"
SUPPORT_PYTHON_ABIS="1"
-inherit eutils python toolchain-funcs apache-module
+MY_P="${P/_/-}"
+
+inherit apache-module python multilib
DESCRIPTION="uWSGI server for Python web applications"
HOMEPAGE="http://projects.unbit.it/uwsgi/"
-SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz"
+SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug json ldap lua pcre perl ruby sqlite +xml yaml zeromq"
+IUSE="apache2 +carbon debug json ldap lua +nagios +pcre perl python ruby rrdtool sqlite +xml yaml zeromq"
-RDEPEND="json? ( dev-libs/jansson )
+CDEPEND="json? ( dev-libs/jansson )
ldap? ( net-nds/openldap )
lua? ( dev-lang/lua )
pcre? ( dev-libs/libpcre )
@@ -27,19 +29,16 @@ RDEPEND="json? ( dev-libs/jansson )
xml? ( dev-libs/libxml2 )
yaml? ( dev-libs/libyaml )
zeromq? ( net-libs/zeromq )"
-DEPEND="${RDEPEND}
+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
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-0.9.8-no-werror.patch \
- "${FILESDIR}"/${PN}-0.9.8.3-fix-destdir.patch
- python_copy_sources
-}
+want_apache2_2
use_true_false() {
if use $1 ; then
@@ -49,15 +48,30 @@ use_true_false() {
fi
}
+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() {
- configure() {
- local plugins
- use lua && plugins+=", lua"
- use perl && plugins+=", psgi"
- use ruby && plugins+=", rack"
- plugins="${plugins:1}"
-
- cat > "buildconf/default.ini" << EOF
+ local plugins=""
+ use carbon && plugins+=", carbon"
+ use nagios && plugins+=", nagios"
+ use rrdtool && plugins+=", rrdtool"
+
+ cat > "buildconf/gentoo.ini" << EOF
[uwsgi]
xml = $(use_true_false xml)
ini = true
@@ -83,12 +97,13 @@ unbit = false
xml_implementation = libxml2
yaml_implementation = libyaml
malloc_implementation = libc
-plugins = ${plugins}
+plugins =
bin_name = uwsgi
append_version =
-plugin_build_dir = plugins
plugin_dir = /usr/$(get_libdir)/uwsgi
-embedded_plugins = python, ping, cache, nagios, rpc, fastrouter, http, ugreen
+plugin_build_dir = ${T}/plugins
+embedded_plugins = ping, cache, rpc, fastrouter, http, ugreen, signal, ${plugins:1}
+as_shared_library = false
locking = auto
event = auto
@@ -98,18 +113,34 @@ filemonitor = auto
embed_files =
embed_config =
-
[python]
paste = true
web3 = true
-
EOF
- }
- python_execute_function -s configure
}
src_compile() {
- python_src_compile CC="$(tc-getCC)"
+ 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/perl gentoo || die "building plugin for perl failed"
+ fi
+
+ if use python ; then
+ for a in ${PYTHON_ABIS} ; do
+ python uwsgiconfig.py --plugin plugins/python${a/.} gentoo || die "building plugin for python-${a} failed"
+ done
+ fi
+
+ if use ruby ; then
+ echo "TODO"
+ fi
if use apache2 ; then
for m in Ruwsgi uwsgi ; do
@@ -120,16 +151,20 @@ src_compile() {
}
src_install() {
- installation() {
- newbin uwsgi uwsgi-${PYTHON_ABI}
- if use lua || use perl || use ruby ; then
- insinto /usr/$(get_libdir)/uwsgi
- doins plugins/*.so
- fi
- }
- python_execute_function -s installation
+ dobin uwsgi
+
+ insinto /usr/$(get_libdir)/uwsgi
+ doins "${T}/plugins"/*.so
+
+ use lua && dosym uwsgi /usr/bin/uwsgi_lua
- python_generate_wrapper_scripts "${ED}usr/bin/uwsgi"
+ use perl && dosym uwsgi /usr/bin/uwsgi_perl
+
+ if use python ; then
+ 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
@@ -152,8 +187,8 @@ pkg_postinst() {
elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
fi
- if use lua || use perl || use ruby ; then
+ 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' or '--plugins rack' to load them."
+ elog "Use '--plugins lua', '--plugins psgi', '--plugins rack' or '--plugins python27' to load them."
fi
}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2012-04-23 7:49 Tiziano Müller
0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2012-04-23 7:49 UTC (permalink / raw
To: gentoo-commits
commit: 1629c0e0f4bc9d7a84ce00760498b4dc74b7cf62
Author: Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Mon Apr 23 06:30:04 2012 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 06:36:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=1629c0e0
Pulled updates from Ultrabug. Build more plugins and add PHP support.
---
www-servers/uwsgi/Manifest | 11 +-
www-servers/uwsgi/files/1.1.2-threaded-php.patch | 40 +++++
www-servers/uwsgi/files/uwsgi.confd | 34 ++--
www-servers/uwsgi/files/uwsgi.initd | 118 ++++++++-----
www-servers/uwsgi/uwsgi-0.9.8.6.ebuild | 186 --------------------
.../{uwsgi-1.0.4.ebuild => uwsgi-1.1.2.ebuild} | 65 ++++++--
6 files changed, 194 insertions(+), 260 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index afa2c38..40b070f 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,10 +1,9 @@
+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 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094ce9cf3b55f1c418f1602e0451462103a5117174a4
-AUX uwsgi.initd 2386 RMD160 a799175f2b94eb96dc19ff9b8b4d5c18a52cbd38 SHA1 ffa1870c2e14871764447bc97e6d7b9f24364a28 SHA256 d523238595e83b7f82001dea41ffa3298836fd0027859ed3e1bf4f84d75e1370
-DIST uwsgi-0.9.8.6.tar.gz 359620 RMD160 78b92fe3a9b272ca5a2704b0db7d1956b9149a0b SHA1 bb835c3c14310640b24ebdbcf0aa91e8ce8bd5a6 SHA256 14379c0055063dbfbc4ce9ba10dfd6eec827286a462300d98947174d9694d981
-DIST uwsgi-1.0.4.tar.gz 465762 RMD160 afc67a752fb0055cb87769219a60b9e8f09acfcc SHA1 ba2e249e962acbdc9a3e7c3c86b2ceb9019503f6 SHA256 3267c48fdfce41766a237eb696eaaa6ee8d90672b483dbfc746663ddc8383b8d
-EBUILD uwsgi-0.9.8.6.ebuild 4304 RMD160 ce533908cedae761db93ae26b811ae09e12847fc SHA1 29710c3c36fe5cffb34c180f9c6a48d7ace001e5 SHA256 5bf9203180bfa41622cad1f8c414b0a00af7b901e70017784f7648be43316b28
-EBUILD uwsgi-1.0.4.ebuild 5303 RMD160 657947aa39bb28ce8f2e4d8229617474c8431f50 SHA1 3a54351ee06a32fbc3b79f272a9b24bfea2313d4 SHA256 6968941db8836ddfb4bbcb1ba54c4f0f580bcc9f8ba0f52e149133c802465b5f
+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 6524 RMD160 afb8c1a773f22e2c957148b82ddb47b14fc2034a SHA1 5137ee230f82190623b3f10dec6e31f7f4b1d402 SHA256 09dc9f03b3e058063765b9fbb6f93df29da596d91f8d2a86d9a40e1d977c89bb
EBUILD uwsgi-9999.ebuild 5244 RMD160 d4e039a853ae5e78b7a969c6cd3c14b2047a0caa SHA1 5463d445d460fa649cb1f90a2d16c170a0f7ddae SHA256 d0a9ddac405f57588009d4e6c87f08033cc405b60433aeb44b4f41bc153e99f4
MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
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/files/uwsgi.confd b/www-servers/uwsgi/files/uwsgi.confd
index e08f688..5d1fc5c 100644
--- a/www-servers/uwsgi/files/uwsgi.confd
+++ b/www-servers/uwsgi/files/uwsgi.confd
@@ -1,51 +1,53 @@
# 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 $
-# DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
+# 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
-#
-#UWSGI_SOCKET=127.0.0.1:1234
+# Example : UWSGI_SOCKET=127.0.0.1:1234
+UWSGI_SOCKET=
-# Enable threads?
+# Enable threads? (1 = yes, 0 = no). The default is 0
#
-#UWSGI_THREADS=1
+UWSGI_THREADS=0
# The path to your uWSGI application.
#
-#UWSGI_PROGRAM=
+UWSGI_PROGRAM=
# The path to your uWSGI xml config file.
#
-#UWSGI_XML_CONFIG=
+UWSGI_XML_CONFIG=
# The number of child processes to spawn. The default is 1.
#
-#UWSGI_CHILDREN=1
+UWSGI_PROCESSES=1
-# The log file path. If empty logging is disabled
+# The log file path. If empty, log only errors
#
-#UWSGI_LOG_FILE=
+UWSGI_LOG_FILE=
# If you want to run your application inside a chroot then specify the
# directory here. Leave this blank otherwise.
#
-#UWSGI_CHROOT=
+UWSGI_CHROOT=
# If you want to run your application from a specific directiory specify
# it here. Leave this blank otherwise.
#
-# UWSGI_DIR=
+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=
+UWSGI_USER=
-# Run the uwsgi emperor which loads vassals dynamically
+# Run the uwsgi emperor which loads vassals dynamically from this PATH
# see http://projects.unbit.it/uwsgi/wiki/Emperor
-#UWSGI_EMPEROR=
+# The advised Gentoo folder is /etc/uwsgi.d/
+UWSGI_EMPEROR_PATH=
# Additional options you might want to pass to uWSGI
#
-#UWSGI_EXTRA_OPTIONS=
+UWSGI_EXTRA_OPTIONS=
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
index bb3ba6d..5b6335a 100644
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -9,37 +9,53 @@ UWSGI_EXEC=/usr/bin/uwsgi
PIDPATH=/var/run/uwsgi
PIDFILE="${PIDPATH}/${PROGNAME}.pid"
-opts="${opts} reload"
+extra_started_commands="${opts} reload stats"
depend() {
need net
}
-start() {
- mkdir -p "/var/run/uwsgi"
-
+start_emperor() {
local OPTIONS
+ OPTIONS="--emperor ${UWSGI_EMPEROR_PATH} --daemonize"
- if [ "${SVCNAME}" = "uwsgi" ]; then
- 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
+ if [ -n "${UWSGI_LOG_FILE}" ]; then
+ OPTIONS="${OPTIONS} ${UWSGI_LOG_FILE}"
+ else
+ OPTIONS="${OPTIONS} /dev/null --disable-logging"
fi
- OPTIONS="--daemonize"
+ [ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
+ [ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
- if [ -n "$UWSGI_LOG_FILE" ]; then
- OPTIONS="${OPTIONS} $UWSGI_LOG_FILE"
+ 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
@@ -48,49 +64,71 @@ start() {
OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}"
fi
- if [ -n "${UWSGI_CHILDREN}" ]; then
- OPTIONS="${OPTIONS} --processes ${UWSGI_CHILDREN}"
+ if [ -n "${UWSGI_PROCESSES}" ]; then
+ OPTIONS="${OPTIONS} --processes ${UWSGI_PROCESSES}"
fi
if [ -n "${UWSGI_CHROOT}" ]; then
OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}"
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 [ -n "${UWSGI_PROGRAM}" ]; then
- OPTIONS="${OPTIONS} --wsgi-file ${UWSGI_PROGRAM}"
+ OPTIONS="${OPTIONS} --file ${UWSGI_PROGRAM}"
fi
if [ -n "${UWSGI_XML_CONFIG}" ]; then
OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
fi
- if [ -n "${UWSGI_EMPEROR}" ] ; then
- OPTIONS="${OPTIONS} --emperor ${UWSGI_EMPEROR}"
- else
- OPTIONS="${OPTIONS} --master"
- fi
-
ebegin "Starting uWSGI application ${PROGNAME}"
cd "${UWSGI_DIR}" && \
- start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}"
- eend $?
+ 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() {
- ebegin "Stopping uWSGI application ${PROGNAME}"
- start-stop-daemon --stop --pidfile "${PIDFILE}" --signal 3
+ 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() {
- elog "Reloading uWSGI"
- start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
- eend $?
+ 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-0.9.8.6.ebuild b/www-servers/uwsgi/uwsgi-0.9.8.6.ebuild
deleted file mode 100644
index 04fd42a..0000000
--- a/www-servers/uwsgi/uwsgi-0.9.8.6.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# 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"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit apache-module python multilib
-
-DESCRIPTION="uWSGI server for Python web applications"
-HOMEPAGE="http://projects.unbit.it/uwsgi/"
-SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 debug json ldap lua +nagios +pcre perl python rrdtool sqlite +xml yaml zeromq"
-
-CDEPEND="json? ( dev-libs/jansson )
- ldap? ( net-nds/openldap )
- lua? ( dev-lang/lua )
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl )
- sqlite? ( dev-db/sqlite:3 )
- xml? ( dev-libs/libxml2 )
- yaml? ( dev-libs/libyaml )
- zeromq? ( net-libs/zeromq )"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig"
-RDEPEND="${CDEPEND}
- rrdtool? ( net-analyzer/rrdtool )"
-
-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
-}
-
-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 nagios && plugins+=", nagios"
- use rrdtool && plugins+=", rrdtool"
-
- 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, ${plugins:1}
-as_shared_library = false
-
-locking = auto
-event = auto
-timer = auto
-filemonitor = auto
-
-embed_files =
-
-embed_config =
-
-[python]
-paste = true
-web3 = true
-
-EOF
-}
-
-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/perl gentoo || die "building plugin for perl failed"
- fi
-
- if use python ; then
- for a in ${PYTHON_ABIS} ; do
- python uwsgiconfig.py --plugin plugins/python${a/.} gentoo || die "building plugin for python-${a} failed"
- done
- 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
- 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
-}
-
-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 python; then
- elog "The lua, perl and python modules are built as plugins."
- elog "Use '--plugins lua', '--plugins psgi' or '--plugins python27' to load them."
- fi
-}
diff --git a/www-servers/uwsgi/uwsgi-1.0.4.ebuild b/www-servers/uwsgi/uwsgi-1.1.2.ebuild
similarity index 70%
rename from www-servers/uwsgi/uwsgi-1.0.4.ebuild
rename to www-servers/uwsgi/uwsgi-1.1.2.ebuild
index ad2a719..982c9ac 100644
--- a/www-servers/uwsgi/uwsgi-1.0.4.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.1.2.ebuild
@@ -1,16 +1,21 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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"
+PHP_EXT_OPTIONAL_USE="php"
MY_P="${P/_/-}"
-inherit apache-module python multilib 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/"
@@ -19,17 +24,20 @@ 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 +pcre perl python ruby rrdtool sqlite +uuid +xml yaml zeromq"
+IUSE="apache2 +caps +carbon debug graylog2 json ldap lua +nagios perl +pcre php python rrdtool rsyslog ruby spooler sqlite syslog +uuid +xml yaml zeromq"
+REQUIRED_USE="|| ( lua perl php python ruby )"
-CDEPEND="uuid? ( sys-apps/util-linux )
- caps? ( sys-libs/libcap )
+CDEPEND="caps? ( sys-libs/libcap )
json? ( dev-libs/jansson )
+ graylog2? ( sys-libs/zlib )
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 )"
@@ -62,6 +70,8 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}/${PV}-threaded-php.patch"
+
sed -i \
-e "s|'-O2', ||" \
-e "s|'-Werror', ||" \
@@ -70,14 +80,21 @@ src_prepare() {
sed -i \
-e 's|python\([0-9].[0-9]\)-config|python-config-\1|' \
- plugins/python??/uwsgiplugin.py || die "sed failed"
+ 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]
@@ -110,7 +127,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, ${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
@@ -118,7 +135,7 @@ event = auto
timer = auto
filemonitor = auto
-embed_files =
+embed_files =
embed_config =
[python]
@@ -132,14 +149,18 @@ 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
}
+install_python_lib() {
+ insinto $(python_get_sitedir)
+ doins uwsgidecorators.py
+}
+
src_compile() {
python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
@@ -153,9 +174,15 @@ 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 uwsgiconfig.py --plugin plugins/python${a/.} gentoo || die "building plugin for python-${a} failed"
+ python${a} uwsgiconfig.py --plugin plugins/python gentoo python${a/.} || die "building plugin for python-${a} failed"
done
fi
@@ -163,6 +190,10 @@ src_compile() {
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"
@@ -173,6 +204,7 @@ src_compile() {
src_install() {
dobin uwsgi
+ pax-mark m "${D}"/usr/bin/uwsgi
insinto /usr/$(get_libdir)/uwsgi
doins "${T}/plugins"/*.so
@@ -181,7 +213,14 @@ 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
dosym uwsgi /usr/bin/uwsgi_python${a/.}
done
@@ -196,6 +235,8 @@ src_install() {
newinitd "${FILESDIR}"/uwsgi.initd uwsgi
newconfd "${FILESDIR}"/uwsgi.confd uwsgi
+ keepdir /etc/"${PN}".d
+ use spooler && keepdir /var/spool/"${PN}"
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2011-11-29 18:52 Tiziano Müller
0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-11-29 18:52 UTC (permalink / raw
To: gentoo-commits
commit: a0481da457074bce07aebbe3cd1a2f9e10e885ed
Author: Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Tue Nov 29 18:52:44 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 18:52:44 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=a0481da4
dropped all patches, merged changes to live ebuild
---
www-servers/uwsgi/Manifest | 8 +-
.../uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch | 13 ---
.../uwsgi/files/uwsgi-9999-fix-destdir.patch | 11 --
www-servers/uwsgi/files/uwsgi.initd | 2 +-
www-servers/uwsgi/uwsgi-9999.ebuild | 110 +++++++++++++-------
5 files changed, 73 insertions(+), 71 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index d5ec9d4..579f9cc 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,14 +1,10 @@
AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
-AUX uwsgi-0.9.8-fix-psgi-flags.patch 640 RMD160 6556801682d2c35e30b394812bf3c695b3f234da SHA1 6e305e2d1d9c8b3f5f0d41b72bcd058a2a1d0cc1 SHA256 f27db595c0c9e9002163d978fc5f7075e1aa8fd453395ac6c43848b1a96bdb42
-AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
-AUX uwsgi-0.9.8.3-fix-destdir.patch 385 RMD160 86e055c560079c61035107943d63c48d3689c35c SHA1 44b54276acf2ea61da824bf8aab054e662cdc8aa SHA256 b9fcaf3b7a76ab7a5150b85df4a39ecf578a7f181d9880c36d1e6e876bcb0ed7
-AUX uwsgi-9999-fix-destdir.patch 385 RMD160 86e055c560079c61035107943d63c48d3689c35c SHA1 44b54276acf2ea61da824bf8aab054e662cdc8aa SHA256 b9fcaf3b7a76ab7a5150b85df4a39ecf578a7f181d9880c36d1e6e876bcb0ed7
AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094ce9cf3b55f1c418f1602e0451462103a5117174a4
-AUX uwsgi.initd 2388 RMD160 32dcbde8f29c55f3aba996396880d543fc51f97d SHA1 24276db0dd82a5b5cdd756772ed81ae5c86e6e45 SHA256 6497afcc6208d54f01ef853bff0ee33eb4f5f63e0eb3e024bc206ee78966986b
+AUX uwsgi.initd 2386 RMD160 a799175f2b94eb96dc19ff9b8b4d5c18a52cbd38 SHA1 ffa1870c2e14871764447bc97e6d7b9f24364a28 SHA256 d523238595e83b7f82001dea41ffa3298836fd0027859ed3e1bf4f84d75e1370
DIST uwsgi-0.9.8.6.tar.gz 359620 RMD160 78b92fe3a9b272ca5a2704b0db7d1956b9149a0b SHA1 bb835c3c14310640b24ebdbcf0aa91e8ce8bd5a6 SHA256 14379c0055063dbfbc4ce9ba10dfd6eec827286a462300d98947174d9694d981
DIST uwsgi-1.0-rc6.tar.gz 441757 RMD160 67ba49700adc523a73ce9cc49ce86d742352c32e SHA1 bc2da6d7572222bf13cb6f3423e7dd4d38b7e3ce SHA256 e3878ac5fef7a9c4e5ebffe4c79a424c2aff34ebc5f6a6b2f88f16cb515552e2
EBUILD uwsgi-0.9.8.6.ebuild 4304 RMD160 ce533908cedae761db93ae26b811ae09e12847fc SHA1 29710c3c36fe5cffb34c180f9c6a48d7ace001e5 SHA256 5bf9203180bfa41622cad1f8c414b0a00af7b901e70017784f7648be43316b28
EBUILD uwsgi-1.0_rc6.ebuild 4494 RMD160 7bdd37f424fe0d24595fcae20219cbdb98222006 SHA1 a0580b78bcd9a682d93ef8443f3d23f08d4dfbb1 SHA256 3022965197bf679019c3be27acbb274df31da095afeea2b06658c136bb7e86aa
-EBUILD uwsgi-9999.ebuild 3714 RMD160 eb0a5686a9620fc309649c47b1c912dcb7a2948b SHA1 c45150e52d072f8b63ebb40fa3cf5c4d8cb67b6f SHA256 74251b3da8ff0d99aa12ee0905b4b20fe3ab581afd7054a6c8fb09a2d6622c64
+EBUILD uwsgi-9999.ebuild 4443 RMD160 114d797de425d0d5b3bfe23cfbc426aa9567fc99 SHA1 e26121b379a91b18edb6fcd2d94a5ef6377f0282 SHA256 37dc74d9d4d4224d419bca0f3805e7a936a303867cc94f6d26c8103a7dc3d45c
MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
diff --git a/www-servers/uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch b/www-servers/uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch
deleted file mode 100644
index a65e6d2..0000000
--- a/www-servers/uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/plugins/psgi/uwsgiplugin.py b/plugins/psgi/uwsgiplugin.py
-index 9100824..8651fbb 100644
---- a/plugins/psgi/uwsgiplugin.py
-+++ b/plugins/psgi/uwsgiplugin.py
-@@ -2,6 +2,6 @@ import os,sys
-
- NAME='psgi'
- CFLAGS = [os.popen('perl -MExtUtils::Embed -e ccopts').read().rstrip()]
--LDFLAGS = [os.popen('perl -MExtUtils::Embed -e ldopts').read().rstrip()]
--LIBS = []
-+LDFLAGS = [os.popen('perl -MExtUtils::Embed -e ldopts | | grep -E "\-W\S+"').read().rstrip()]
-+LIBS = [os.popen('perl -MExtUtils::Embed -e ldopts | grep -o -E "\-[L].*"').read().rstrip()]
- GCC_LIST = ['uwsgi_plmodule', 'psgi_loader', 'psgi_response', 'psgi_plugin']
diff --git a/www-servers/uwsgi/files/uwsgi-9999-fix-destdir.patch b/www-servers/uwsgi/files/uwsgi-9999-fix-destdir.patch
deleted file mode 100644
index a7c47b6..0000000
--- a/www-servers/uwsgi/files/uwsgi-9999-fix-destdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- uwsgiconfig.py.orig 2011-08-08 17:56:14.649325030 +0200
-+++ uwsgiconfig.py 2011-08-08 17:58:00.085329500 +0200
-@@ -670,7 +670,7 @@
- else:
- p_cflags.append("-D%s_plugin=%s_plugin" % (up.NAME, name))
-
-- plugin_dest = uc.get('plugin_dir') + '/' + name + '_plugin'
-+ plugin_dest = uc.get('plugin_build_dir') + '/' + name + '_plugin'
-
- shared_flag = '-shared'
-
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
index f203af4..bb3ba6d 100644
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -22,7 +22,7 @@ start() {
if [ "${SVCNAME}" = "uwsgi" ]; then
eerror "You are not supposed to run this script directly. Create a symlink"
- eerror "for the FastCGI application you want to run as well as a copy of the"
+ 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"
diff --git a/www-servers/uwsgi/uwsgi-9999.ebuild b/www-servers/uwsgi/uwsgi-9999.ebuild
index 9a8d231..917af91 100644
--- a/www-servers/uwsgi/uwsgi-9999.ebuild
+++ b/www-servers/uwsgi/uwsgi-9999.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.8.ebuild,v 1.1 2011/06/08 18:00:13 maksbotan Exp $
+# $Header: $
-EAPI="3"
-PYTHON_DEPEND="*"
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.4:2.7 3:3.1:3.2"
SUPPORT_PYTHON_ABIS="1"
-inherit eutils python toolchain-funcs apache-module multilib mercurial
+inherit apache-module python multilib mercurial
DESCRIPTION="uWSGI server for Python web applications"
HOMEPAGE="http://projects.unbit.it/uwsgi/"
@@ -15,9 +15,9 @@ EHG_REPO_URI="http://projects.unbit.it/hg/uwsgi"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="debug json ldap lua pcre perl ruby sqlite +xml yaml zeromq"
+IUSE="apache2 +carbon debug json ldap lua +nagios +pcre perl python ruby rrdtool sqlite +xml yaml zeromq"
-RDEPEND="json? ( dev-libs/jansson )
+CDEPEND="json? ( dev-libs/jansson )
ldap? ( net-nds/openldap )
lua? ( dev-lang/lua )
pcre? ( dev-libs/libpcre )
@@ -27,21 +27,15 @@ RDEPEND="json? ( dev-libs/jansson )
xml? ( dev-libs/libxml2 )
yaml? ( dev-libs/libyaml )
zeromq? ( net-libs/zeromq )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+ rrdtool? ( net-analyzer/rrdtool )"
APXS2_S="${S}/apache2"
APACHE2_MOD_CONF="42_mod_${PN}"
want_apache2_2
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-0.9.8-no-werror.patch \
- "${FILESDIR}"/${P}-fix-destdir.patch
-
- python_copy_sources
-}
-
use_true_false() {
if use $1 ; then
echo "true"
@@ -50,15 +44,29 @@ use_true_false() {
fi
}
+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() {
- configure() {
- local plugins
- use lua && plugins+=", lua"
- use perl && plugins+=", psgi"
- use ruby && plugins+=", rack"
- plugins="${plugins:1}"
-
- cat > "buildconf/default.ini" << EOF
+ local plugins=""
+ use carbon && plugins+=", carbon"
+ use nagios && plugins+=", nagios"
+ use rrdtool && plugins+=", rrdtool"
+
+ cat > "buildconf/gentoo.ini" << EOF
[uwsgi]
xml = $(use_true_false xml)
ini = true
@@ -84,12 +92,13 @@ unbit = false
xml_implementation = libxml2
yaml_implementation = libyaml
malloc_implementation = libc
-plugins = ${plugins}
+plugins =
bin_name = uwsgi
append_version =
-plugin_build_dir = plugins
plugin_dir = /usr/$(get_libdir)/uwsgi
-embedded_plugins = python, ping, cache, nagios, rpc, fastrouter, http, ugreen
+plugin_build_dir = ${T}/plugins
+embedded_plugins = ping, cache, rpc, fastrouter, http, ugreen, signal, ${plugins:1}
+as_shared_library = false
locking = auto
event = auto
@@ -105,12 +114,30 @@ paste = true
web3 = true
EOF
- }
- python_execute_function -s configure
}
src_compile() {
- python_src_compile CC="$(tc-getCC)"
+ 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/perl gentoo || die "building plugin for perl failed"
+ fi
+
+ if use python ; then
+ for a in ${PYTHON_ABIS} ; do
+ python uwsgiconfig.py --plugin plugins/python${a/.} gentoo || die "building plugin for python-${a} failed"
+ done
+ fi
+
+ if use ruby ; then
+ echo "TODO"
+ fi
if use apache2 ; then
for m in Ruwsgi uwsgi ; do
@@ -121,17 +148,20 @@ src_compile() {
}
src_install() {
- installation() {
- newbin uwsgi uwsgi-${PYTHON_ABI}
+ dobin uwsgi
+
+ insinto /usr/$(get_libdir)/uwsgi
+ doins "${T}/plugins"/*.so
+
+ use lua && dosym uwsgi /usr/bin/uwsgi_lua
- if use lua || use perl || use ruby ; then
- insinto /usr/$(get_libdir)/uwsgi
- doins plugins/*.so
- fi
- }
- python_execute_function -s installation
+ use perl && dosym uwsgi /usr/bin/uwsgi_perl
- python_generate_wrapper_scripts "${ED}usr/bin/uwsgi"
+ if use python ; then
+ 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
@@ -155,8 +185,8 @@ pkg_postinst() {
elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
fi
- if use lua || use perl || use ruby ; then
+ 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' or '--plugins rack' to load them."
+ elog "Use '--plugins lua', '--plugins psgi', '--plugins rack' or '--plugins python27' to load them."
fi
}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2011-08-09 13:09 Tiziano Müller
0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-08-09 13:09 UTC (permalink / raw
To: gentoo-commits
commit: bb10d85de8ee1c5b775b458200a009aa47e74447
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 9 13:07:33 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue Aug 9 13:07:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=bb10d85d
added missing patch. fixed path for emperor mode.
---
www-servers/uwsgi/Manifest | 2 +-
.../uwsgi/files/uwsgi-0.9.8.3-fix-destdir.patch | 11 +++++++++++
www-servers/uwsgi/files/uwsgi.initd | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index bc78864..c56eff0 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -5,7 +5,7 @@ AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8
AUX uwsgi-0.9.8.3-fix-destdir.patch 385 RMD160 86e055c560079c61035107943d63c48d3689c35c SHA1 44b54276acf2ea61da824bf8aab054e662cdc8aa SHA256 b9fcaf3b7a76ab7a5150b85df4a39ecf578a7f181d9880c36d1e6e876bcb0ed7
AUX uwsgi-9999-fix-destdir.patch 385 RMD160 86e055c560079c61035107943d63c48d3689c35c SHA1 44b54276acf2ea61da824bf8aab054e662cdc8aa SHA256 b9fcaf3b7a76ab7a5150b85df4a39ecf578a7f181d9880c36d1e6e876bcb0ed7
AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094ce9cf3b55f1c418f1602e0451462103a5117174a4
-AUX uwsgi.initd 2392 RMD160 d90a00358cfafc341889882989593ee567c3b153 SHA1 af23d4a1646560acd7a9d82dc2ac98196392075a SHA256 98859da43ac2def62b9b7d8527207481cdb4fbfbb17e9de6a1f2853d3271654d
+AUX uwsgi.initd 2388 RMD160 32dcbde8f29c55f3aba996396880d543fc51f97d SHA1 24276db0dd82a5b5cdd756772ed81ae5c86e6e45 SHA256 6497afcc6208d54f01ef853bff0ee33eb4f5f63e0eb3e024bc206ee78966986b
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
EBUILD uwsgi-0.9.8.3.ebuild 3711 RMD160 14fd09a139622efb649d074278012a767f03f109 SHA1 c147fc37bd3736856459b0679451b32431fb075b SHA256 6aeec7ee47c38c937193926cc8b809e26b6aa2b05c3c29602b44e93c26ad1022
EBUILD uwsgi-9999.ebuild 3714 RMD160 eb0a5686a9620fc309649c47b1c912dcb7a2948b SHA1 c45150e52d072f8b63ebb40fa3cf5c4d8cb67b6f SHA256 74251b3da8ff0d99aa12ee0905b4b20fe3ab581afd7054a6c8fb09a2d6622c64
diff --git a/www-servers/uwsgi/files/uwsgi-0.9.8.3-fix-destdir.patch b/www-servers/uwsgi/files/uwsgi-0.9.8.3-fix-destdir.patch
new file mode 100644
index 0000000..a7c47b6
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi-0.9.8.3-fix-destdir.patch
@@ -0,0 +1,11 @@
+--- uwsgiconfig.py.orig 2011-08-08 17:56:14.649325030 +0200
++++ uwsgiconfig.py 2011-08-08 17:58:00.085329500 +0200
+@@ -670,7 +670,7 @@
+ else:
+ p_cflags.append("-D%s_plugin=%s_plugin" % (up.NAME, name))
+
+- plugin_dest = uc.get('plugin_dir') + '/' + name + '_plugin'
++ plugin_dest = uc.get('plugin_build_dir') + '/' + name + '_plugin'
+
+ shared_flag = '-shared'
+
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
index 5877449..f203af4 100644
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -72,7 +72,7 @@ start() {
fi
if [ -n "${UWSGI_EMPEROR}" ] ; then
- OPTIONS="${OPTIONS} --emperor \"${UWSGI_EMPEROR}\""
+ OPTIONS="${OPTIONS} --emperor ${UWSGI_EMPEROR}"
else
OPTIONS="${OPTIONS} --master"
fi
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2011-08-09 10:02 Tiziano Müller
0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-08-09 10:02 UTC (permalink / raw
To: gentoo-commits
commit: cbe548d673af5f78f7ec32ebc87ddc87511515aa
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 8 16:06:21 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Mon Aug 8 16:06:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=cbe548d6
Fix building and installing plugins.
---
www-servers/uwsgi/Manifest | 5 ++-
.../uwsgi/files/uwsgi-9999-fix-destdir.patch | 11 +++++++++
www-servers/uwsgi/files/uwsgi.initd | 8 ++++++
www-servers/uwsgi/uwsgi-9999.ebuild | 24 +++++++++++++++----
4 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index b04b601..13ba6bf 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -2,9 +2,10 @@ MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4b
AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
AUX uwsgi-0.9.8-fix-psgi-flags.patch 640 RMD160 6556801682d2c35e30b394812bf3c695b3f234da SHA1 6e305e2d1d9c8b3f5f0d41b72bcd058a2a1d0cc1 SHA256 f27db595c0c9e9002163d978fc5f7075e1aa8fd453395ac6c43848b1a96bdb42
AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
+AUX uwsgi-9999-fix-destdir.patch 385 RMD160 86e055c560079c61035107943d63c48d3689c35c SHA1 44b54276acf2ea61da824bf8aab054e662cdc8aa SHA256 b9fcaf3b7a76ab7a5150b85df4a39ecf578a7f181d9880c36d1e6e876bcb0ed7
AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094ce9cf3b55f1c418f1602e0451462103a5117174a4
-AUX uwsgi.initd 2258 RMD160 567652a6d348494e8f74c002a4af48c361fe4202 SHA1 7119489ea985984735fc11e9f1414cc737d3c09e SHA256 38df43560b1a4de0bef8b3455bec46942917c97465da9ab167a4fc33ab1d53f8
+AUX uwsgi.initd 2392 RMD160 d90a00358cfafc341889882989593ee567c3b153 SHA1 af23d4a1646560acd7a9d82dc2ac98196392075a SHA256 98859da43ac2def62b9b7d8527207481cdb4fbfbb17e9de6a1f2853d3271654d
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
EBUILD uwsgi-0.9.8.3.ebuild 3329 RMD160 21e4b09e5fb03a56bfdd2256367992244de8396c SHA1 8aab4fe9a179c896615d66a3b1b487338e640744 SHA256 fc595c2be57e1e2a8ff92fdd1e79470be7abc104f2167e7326af560bfe6bc65f
-EBUILD uwsgi-9999.ebuild 3396 RMD160 8d77416b104053e16e133a4e75c59f2a7bbb66b1 SHA1 35c54016e8ea95302f304a3b516586d9750f5a5f SHA256 3896af58a9a0b915a9d84910595db9e015f13e952bc89fdb2ea006d0d97c941c
+EBUILD uwsgi-9999.ebuild 3701 RMD160 12064bd8202d62b224b6bb20739461a7c68bd003 SHA1 619c859ebb2e70ea545ee31ec9725bd9da966d65 SHA256 58bd6e5bc09b03ce9bc82c21e61c55536de61c985dde11befad0bb6c72d83245
DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f
diff --git a/www-servers/uwsgi/files/uwsgi-9999-fix-destdir.patch b/www-servers/uwsgi/files/uwsgi-9999-fix-destdir.patch
new file mode 100644
index 0000000..a7c47b6
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi-9999-fix-destdir.patch
@@ -0,0 +1,11 @@
+--- uwsgiconfig.py.orig 2011-08-08 17:56:14.649325030 +0200
++++ uwsgiconfig.py 2011-08-08 17:58:00.085329500 +0200
+@@ -670,7 +670,7 @@
+ else:
+ p_cflags.append("-D%s_plugin=%s_plugin" % (up.NAME, name))
+
+- plugin_dest = uc.get('plugin_dir') + '/' + name + '_plugin'
++ plugin_dest = uc.get('plugin_build_dir') + '/' + name + '_plugin'
+
+ shared_flag = '-shared'
+
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
index 580f967..5877449 100644
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -9,6 +9,8 @@ UWSGI_EXEC=/usr/bin/uwsgi
PIDPATH=/var/run/uwsgi
PIDFILE="${PIDPATH}/${PROGNAME}.pid"
+opts="${opts} reload"
+
depend() {
need net
}
@@ -86,3 +88,9 @@ stop() {
start-stop-daemon --stop --pidfile "${PIDFILE}" --signal 3
eend $?
}
+
+reload() {
+ elog "Reloading uWSGI"
+ start-stop-daemon --signal HUP --pidfile "${PIDFILE}"
+ eend $?
+}
diff --git a/www-servers/uwsgi/uwsgi-9999.ebuild b/www-servers/uwsgi/uwsgi-9999.ebuild
index f2d9356..80ed927 100644
--- a/www-servers/uwsgi/uwsgi-9999.ebuild
+++ b/www-servers/uwsgi/uwsgi-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
PYTHON_DEPEND="*"
SUPPORT_PYTHON_ABIS="1"
-inherit eutils python toolchain-funcs apache-module mercurial
+inherit eutils python toolchain-funcs apache-module multilib mercurial
DESCRIPTION="uWSGI server for Python web applications"
HOMEPAGE="http://projects.unbit.it/uwsgi/"
@@ -37,7 +37,8 @@ want_apache2_2
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-0.9.8-no-werror.patch \
- "${FILESDIR}"/${PN}-0.9.8-fix-psgi-flags.patch
+ "${FILESDIR}"/${P}-fix-destdir.patch
+
python_copy_sources
}
@@ -55,6 +56,7 @@ src_configure() {
use lua && plugins+=", lua"
use perl && plugins+=", psgi"
use ruby && plugins+=", rack"
+ plugins="${plugins:1}"
cat > "buildconf/default.ini" << EOF
[uwsgi]
@@ -82,11 +84,12 @@ unbit = false
xml_implementation = libxml2
yaml_implementation = libyaml
malloc_implementation = libc
-plugins = python, ping, cache, nagios, rpc, fastrouter, http, ugreen${plugins}
+plugins = ${plugins}
bin_name = uwsgi
append_version =
-plugin_dir = plugins
-#embedded_plugins = python, ping, cache, nagios, rpc, fastrouter, http, ugreen${plugins}
+plugin_build_dir = plugins
+plugin_dir = /usr/$(get_libdir)/uwsgi
+embedded_plugins = python, ping, cache, nagios, rpc, fastrouter, http, ugreen
locking = auto
event = auto
@@ -120,6 +123,11 @@ src_compile() {
src_install() {
installation() {
newbin uwsgi uwsgi-${PYTHON_ABI}
+
+ if use lua || use perl || use ruby ; then
+ insinto /usr/$(get_libdir)/uwsgi
+ doins plugins/*.so
+ fi
}
python_execute_function -s installation
@@ -134,6 +142,7 @@ src_install() {
newinitd "${FILESDIR}"/uwsgi.initd uwsgi
newconfd "${FILESDIR}"/uwsgi.confd uwsgi
+
}
pkg_postinst() {
@@ -145,4 +154,9 @@ pkg_postinst() {
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 ; then
+ elog "The lua, perl and ruby modules are built as real plugins."
+ elog "Use '--plugins lua', '--plugins psgi' or '--plugins rack' to load them."
+ fi
}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2011-08-02 9:42 Tiziano Müller
0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-08-02 9:42 UTC (permalink / raw
To: gentoo-commits
commit: d940aac04e7ed489deecbe75d764e53179b44041
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 09:40:57 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 09:40:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=d940aac0
fix automagic deps, added support for ruby, perl, lua, whatnotelse
---
www-servers/uwsgi/Manifest | 3 +-
.../uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch | 13 +++
www-servers/uwsgi/uwsgi-0.9.8.3.ebuild | 89 +++++++++++++++++++-
3 files changed, 100 insertions(+), 5 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 413f93c..122f081 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,8 +1,9 @@
MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
+AUX uwsgi-0.9.8-fix-psgi-flags.patch 640 RMD160 6556801682d2c35e30b394812bf3c695b3f234da SHA1 6e305e2d1d9c8b3f5f0d41b72bcd058a2a1d0cc1 SHA256 f27db595c0c9e9002163d978fc5f7075e1aa8fd453395ac6c43848b1a96bdb42
AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094ce9cf3b55f1c418f1602e0451462103a5117174a4
AUX uwsgi.initd 2258 RMD160 567652a6d348494e8f74c002a4af48c361fe4202 SHA1 7119489ea985984735fc11e9f1414cc737d3c09e SHA256 38df43560b1a4de0bef8b3455bec46942917c97465da9ab167a4fc33ab1d53f8
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
-EBUILD uwsgi-0.9.8.3.ebuild 1841 RMD160 efc9d251734d8c15a1108a654f49304def8e9009 SHA1 db42a0a23a42b4cbd1110ae3e2da9a6b72e86645 SHA256 d15343367daa297e17f81265afc19b73e793c26582d7b2cd10ff839b4c694d15
+EBUILD uwsgi-0.9.8.3.ebuild 3429 RMD160 c536eb7c5cab127332b279f2412a1475c348dabf SHA1 ac9a120e9a5224e48cf728c2e062111db35f1f30 SHA256 cf4bef79ec1dc3db05238526d22c0991f96cc7bcdebe43fa260f429ae32ec40f
DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f
diff --git a/www-servers/uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch b/www-servers/uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch
new file mode 100644
index 0000000..a65e6d2
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi-0.9.8-fix-psgi-flags.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/psgi/uwsgiplugin.py b/plugins/psgi/uwsgiplugin.py
+index 9100824..8651fbb 100644
+--- a/plugins/psgi/uwsgiplugin.py
++++ b/plugins/psgi/uwsgiplugin.py
+@@ -2,6 +2,6 @@ import os,sys
+
+ NAME='psgi'
+ CFLAGS = [os.popen('perl -MExtUtils::Embed -e ccopts').read().rstrip()]
+-LDFLAGS = [os.popen('perl -MExtUtils::Embed -e ldopts').read().rstrip()]
+-LIBS = []
++LDFLAGS = [os.popen('perl -MExtUtils::Embed -e ldopts | | grep -E "\-W\S+"').read().rstrip()]
++LIBS = [os.popen('perl -MExtUtils::Embed -e ldopts | grep -o -E "\-[L].*"').read().rstrip()]
+ GCC_LIST = ['uwsgi_plmodule', 'psgi_loader', 'psgi_response', 'psgi_plugin']
diff --git a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
index c5b45f5..137ff2a 100644
--- a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
+++ b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
@@ -15,20 +15,101 @@ SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="expat json ldap lua pcre perl ruby sqlite +xml yaml zeromq"
-RDEPEND="dev-libs/libxml2"
-DEPEND="${RDEPEND}"
+RDEPEND="expat? ( dev-libs/expat )
+ json? ( dev-libs/jansson )
+ ldap? ( net-nds/openldap )
+ lua? ( dev-lang/lua )
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl )
+ ruby? ( dev-lang/ruby )
+ sqlite? ( dev-db/sqlite:3 )
+ xml? ( !expat? ( dev-libs/libxml2 ) )
+ yaml? ( dev-libs/libyaml )
+ zeromq? ( net-libs/zeromq )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
APXS2_S="${S}/apache2"
APACHE2_MOD_CONF="42_mod_${PN}"
want_apache2_2
src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.9.8-no-werror.patch
+ epatch \
+ "${FILESDIR}"/${PN}-0.9.8-no-werror.patch \
+ "${FILESDIR}"/${PN}-0.9.8-fix-psgi-flags.patch
python_copy_sources
}
+use_true_false() {
+ if use $1 ; then
+ echo "true"
+ else
+ echo "false"
+ fi
+}
+
+src_configure() {
+ configure() {
+ local plugins
+ use lua && plugins+=", lua"
+ use perl && plugins+=", psgi"
+ use ruby && plugins+=", rack"
+
+ local xmlimpl="libxml2"
+ use expat && xmlimpl="expat"
+
+ cat > "buildconf/default.ini" << EOF
+[uwsgi]
+xml = $(use_true_false xml)
+ini = true
+yaml = true
+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 = ${xmlimpl}
+yaml_implementation = libyaml
+malloc_implementation = libc
+plugins =
+bin_name = uwsgi
+append_version =
+plugin_dir = .
+embedded_plugins = python, ping, cache, nagios, rpc, fastrouter, http, ugreen${plugins}
+
+locking = auto
+event = auto
+timer = auto
+filemonitor = auto
+
+embed_files =
+
+embed_config =
+
+[python]
+paste = true
+web3 = true
+
+EOF
+ }
+ python_execute_function -s configure
+}
+
src_compile() {
python_src_compile CC="$(tc-getCC)"
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2011-07-31 13:48 Tiziano Müller
0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-07-31 13:48 UTC (permalink / raw
To: gentoo-commits
commit: b02518b9327b399c18fa56ff309b73a46e5d16a0
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 13:46:25 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 13:46:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=b02518b9
follow naming convention of other variables
---
www-servers/uwsgi/Manifest | 4 ++--
www-servers/uwsgi/files/uwsgi.confd | 4 ++++
www-servers/uwsgi/files/uwsgi.initd | 4 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index ce87e07..413f93c 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,8 +1,8 @@
MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
-AUX uwsgi.confd 1124 RMD160 74ee67f07a8f68c73ad3ca92859902743a7d54df SHA1 af8e198008a363071476af23dba9d9fdcb6abe44 SHA256 6da06c6407a1919621d4134b41d95205f585197828e5e0e2bccd475787fce0a7
-AUX uwsgi.initd 2256 RMD160 b649df65c3e0d3276306fb02ef7640ce6848a2eb SHA1 c915948f1af3b60998b7ff65443ebc90bc372b00 SHA256 e36f6f7979e2961402b0a7c51b62f89c48126e1228d1b45db15cb51bbc9f754e
+AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094ce9cf3b55f1c418f1602e0451462103a5117174a4
+AUX uwsgi.initd 2258 RMD160 567652a6d348494e8f74c002a4af48c361fe4202 SHA1 7119489ea985984735fc11e9f1414cc737d3c09e SHA256 38df43560b1a4de0bef8b3455bec46942917c97465da9ab167a4fc33ab1d53f8
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
EBUILD uwsgi-0.9.8.3.ebuild 1841 RMD160 efc9d251734d8c15a1108a654f49304def8e9009 SHA1 db42a0a23a42b4cbd1110ae3e2da9a6b72e86645 SHA256 d15343367daa297e17f81265afc19b73e793c26582d7b2cd10ff839b4c694d15
DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f
diff --git a/www-servers/uwsgi/files/uwsgi.confd b/www-servers/uwsgi/files/uwsgi.confd
index 2c04ca2..e08f688 100644
--- a/www-servers/uwsgi/files/uwsgi.confd
+++ b/www-servers/uwsgi/files/uwsgi.confd
@@ -42,6 +42,10 @@
#
#UWSGI_USER=
+# Run the uwsgi emperor which loads vassals dynamically
+# see http://projects.unbit.it/uwsgi/wiki/Emperor
+#UWSGI_EMPEROR=
+
# 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
index 64fb91b..580f967 100644
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -69,8 +69,8 @@ start() {
OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
fi
- if [ -n "${EMPEROR_PATH}" ] ; then
- OPTIONS="${OPTIONS} --emperor \"${EMPEROR_PATH}\""
+ if [ -n "${UWSGI_EMPEROR}" ] ; then
+ OPTIONS="${OPTIONS} --emperor \"${UWSGI_EMPEROR}\""
else
OPTIONS="${OPTIONS} --master"
fi
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2011-07-31 13:41 Tiziano Müller
0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-07-31 13:41 UTC (permalink / raw
To: gentoo-commits
commit: 76c2dc75284b2ba0733cac17673ca8a399e54301
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 13:39:39 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 13:39:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=76c2dc75
make the init.d script recognize the emperor mode
---
www-servers/uwsgi/Manifest | 4 ++--
www-servers/uwsgi/files/uwsgi.confd | 16 ++++++++--------
www-servers/uwsgi/files/uwsgi.initd | 8 +++++++-
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 48a306b..ce87e07 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,8 +1,8 @@
MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
-AUX uwsgi.confd 1116 RMD160 e13ddecb06cf4efaf75216ec657db99a4abbbddf SHA1 9df38c84bc2d612803629a6a2e6bd9a3a5568d33 SHA256 3c238b934f8db9eae87f77dc3d131499e442526d5e45438b5461c0d7590b772f
-AUX uwsgi.initd 2112 RMD160 cb71ca5b5f27c5ee918e02c0dd562e6b79ec7543 SHA1 fbfc9c17941962d917ab549108581b2e9d016217 SHA256 635f30cc4a414cbb50c96a500432d2da35bfbb7ab715dce010783f0db7e2d9f0
+AUX uwsgi.confd 1124 RMD160 74ee67f07a8f68c73ad3ca92859902743a7d54df SHA1 af8e198008a363071476af23dba9d9fdcb6abe44 SHA256 6da06c6407a1919621d4134b41d95205f585197828e5e0e2bccd475787fce0a7
+AUX uwsgi.initd 2256 RMD160 b649df65c3e0d3276306fb02ef7640ce6848a2eb SHA1 c915948f1af3b60998b7ff65443ebc90bc372b00 SHA256 e36f6f7979e2961402b0a7c51b62f89c48126e1228d1b45db15cb51bbc9f754e
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
EBUILD uwsgi-0.9.8.3.ebuild 1841 RMD160 efc9d251734d8c15a1108a654f49304def8e9009 SHA1 db42a0a23a42b4cbd1110ae3e2da9a6b72e86645 SHA256 d15343367daa297e17f81265afc19b73e793c26582d7b2cd10ff839b4c694d15
DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f
diff --git a/www-servers/uwsgi/files/uwsgi.confd b/www-servers/uwsgi/files/uwsgi.confd
index 11152da..2c04ca2 100644
--- a/www-servers/uwsgi/files/uwsgi.confd
+++ b/www-servers/uwsgi/files/uwsgi.confd
@@ -5,32 +5,32 @@
# Path (or name) of UNIX/TCP socket to bind to
#
-UWSGI_SOCKET=127.0.0.1:1234
+#UWSGI_SOCKET=127.0.0.1:1234
# Enable threads?
#
-UWSGI_THREADS=1
+#UWSGI_THREADS=1
# The path to your uWSGI application.
#
-UWSGI_PROGRAM=
+#UWSGI_PROGRAM=
# The path to your uWSGI xml config file.
#
-UWSGI_XML_CONFIG=
+#UWSGI_XML_CONFIG=
# The number of child processes to spawn. The default is 1.
#
-UWSGI_CHILDREN=1
+#UWSGI_CHILDREN=1
# The log file path. If empty logging is disabled
#
-UWSGI_LOG_FILE=
+#UWSGI_LOG_FILE=
# If you want to run your application inside a chroot then specify the
# directory here. Leave this blank otherwise.
#
-UWSGI_CHROOT=
+#UWSGI_CHROOT=
# If you want to run your application from a specific directiory specify
# it here. Leave this blank otherwise.
@@ -40,7 +40,7 @@ UWSGI_CHROOT=
# 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=
+#UWSGI_USER=
# Additional options you might want to pass to uWSGI
#
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
index aced947..64fb91b 100644
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -30,7 +30,7 @@ start() {
return 1
fi
- OPTIONS="--master --daemonize"
+ OPTIONS="--daemonize"
if [ -n "$UWSGI_LOG_FILE" ]; then
OPTIONS="${OPTIONS} $UWSGI_LOG_FILE"
@@ -69,6 +69,12 @@ start() {
OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
fi
+ if [ -n "${EMPEROR_PATH}" ] ; then
+ OPTIONS="${OPTIONS} --emperor \"${EMPEROR_PATH}\""
+ else
+ OPTIONS="${OPTIONS} --master"
+ fi
+
ebegin "Starting uWSGI application ${PROGNAME}"
cd "${UWSGI_DIR}" && \
start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}"
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2011-07-31 13:27 Tiziano Müller
0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-07-31 13:27 UTC (permalink / raw
To: gentoo-commits
commit: 22d968b77a59a44fcf311fe4362ade6e51fda6bc
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 13:26:05 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 13:26:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=22d968b7
fixed path creation in init.d script
---
www-servers/uwsgi/Manifest | 2 +-
www-servers/uwsgi/files/uwsgi.initd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 813744a..48a306b 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -2,7 +2,7 @@ MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4b
AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
AUX uwsgi.confd 1116 RMD160 e13ddecb06cf4efaf75216ec657db99a4abbbddf SHA1 9df38c84bc2d612803629a6a2e6bd9a3a5568d33 SHA256 3c238b934f8db9eae87f77dc3d131499e442526d5e45438b5461c0d7590b772f
-AUX uwsgi.initd 2109 RMD160 47777360891b810eb53a15f15bece33958692d37 SHA1 f22692601568597b261ddcdc5ee9def525bc19e8 SHA256 cda6ffcff61184b3d50beb8c58d2aa62f56aad552660feb6df5dd84d8e4f758a
+AUX uwsgi.initd 2112 RMD160 cb71ca5b5f27c5ee918e02c0dd562e6b79ec7543 SHA1 fbfc9c17941962d917ab549108581b2e9d016217 SHA256 635f30cc4a414cbb50c96a500432d2da35bfbb7ab715dce010783f0db7e2d9f0
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
EBUILD uwsgi-0.9.8.3.ebuild 1841 RMD160 efc9d251734d8c15a1108a654f49304def8e9009 SHA1 db42a0a23a42b4cbd1110ae3e2da9a6b72e86645 SHA256 d15343367daa297e17f81265afc19b73e793c26582d7b2cd10ff839b4c694d15
DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
index ec8dd46..aced947 100644
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -14,7 +14,7 @@ depend() {
}
start() {
- mkdir "/var/run/uwsgi"
+ mkdir -p "/var/run/uwsgi"
local OPTIONS
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2011-07-31 13:23 Tiziano Müller
0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-07-31 13:23 UTC (permalink / raw
To: gentoo-commits
commit: 57806610d17ef4ddeb092bf207fef5938510a329
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 12:14:53 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 12:14:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=57806610
Added version bump.
---
www-servers/uwsgi/Manifest | 11 +-
www-servers/uwsgi/files/0.9.6.5-gentoo-gcc.patch | 13 --
www-servers/uwsgi/files/42_mod_uwsgi.conf | 7 +
...wsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch | 51 --------
.../uwsgi/files/uwsgi-0.9.5-respect_flags.patch | 127 --------------------
.../uwsgi/files/uwsgi-0.9.8-no-werror.patch | 11 ++
www-servers/uwsgi/files/uwsgi.confd | 47 +++++++
www-servers/uwsgi/files/uwsgi.initd | 101 ++++++++++++++++
www-servers/uwsgi/uwsgi-0.9.6.5.ebuild | 46 -------
www-servers/uwsgi/uwsgi-0.9.8.3.ebuild | 72 +++++++++++
10 files changed, 244 insertions(+), 242 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 79e693c..e44697a 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,7 +1,8 @@
MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
-AUX 0.9.6.5-gentoo-gcc.patch 408 RMD160 d437d759d571724da35e0010c7e18282469e9bff SHA1 dd32829dc95ca77bb00aaa542b979ec7df917487 SHA256 a4b91449527946744c30974bd2dad75c34030da71ecdf15d3486a89eb2617f51
-AUX uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch 1202 RMD160 9c32ba693bd7bbdd6fae90c5b43118b8e0f882bc SHA1 cab74b61086c39e9f77e217b88361197c0069b98 SHA256 3903cf208ba14578aaf5cb95306191b97ed0b973047cad02321d4416d03a47f5
-AUX uwsgi-0.9.5-respect_flags.patch 3985 RMD160 1787075a4decad7376e1772231a65e0ef5737537 SHA1 456031bc53a80ca5423a149b7c8013c3bb9338fe SHA256 5af3f880b7104b5fb4c8612d92fab9074b1d5ecc556aeea0775a82a82c4be80e
+AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
+AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
+AUX uwsgi.confd 1116 RMD160 e13ddecb06cf4efaf75216ec657db99a4abbbddf SHA1 9df38c84bc2d612803629a6a2e6bd9a3a5568d33 SHA256 3c238b934f8db9eae87f77dc3d131499e442526d5e45438b5461c0d7590b772f
+AUX uwsgi.initd 2705 RMD160 96ee8102823eddfcfc17da14882aed17c7ca5249 SHA1 35365c5ca755cd650424c826488ac85b067e4575 SHA256 328087fe8a36e91155c1173cfddc257f4479b1588bc56689b42a0fc74707bed4
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
-EBUILD uwsgi-0.9.6.5.ebuild 1090 RMD160 4010f9f335772176930bd82297ffdcd8843368e9 SHA1 1c3fd2eadfcd1e0f14e2dd97c4cd0eb4020caaca SHA256 25598b27206aaef170e4adcdab1040493a93bb2f945fbe7a3d45cf5994afd1b2
-DIST uwsgi-0.9.6.5.tar.gz 152165 RMD160 0c33445aec79778bf663e3cead7c574956032c43 SHA1 ba05b3f6fa5019253ad4d09dae04654e8e36205d SHA256 8f4099be19c36ed484a4f1508e83e4170ce3ca1c32f3dd5591cd191223904bca
+EBUILD uwsgi-0.9.8.3.ebuild 1870 RMD160 53ae8621ac13e000fc29e1ab6e37fcfab87f8434 SHA1 a1a3ad0e9cd8db43aae9f07ee2077b3c3e9cab56 SHA256 08a663229cd0510fa3eb4ccc16aa68343b7097f7436c7c37e4f6880b4b00c698
+DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f
diff --git a/www-servers/uwsgi/files/0.9.6.5-gentoo-gcc.patch b/www-servers/uwsgi/files/0.9.6.5-gentoo-gcc.patch
deleted file mode 100644
index ae196b1..0000000
--- a/www-servers/uwsgi/files/0.9.6.5-gentoo-gcc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/uwsgiconfig.py b/uwsgiconfig.py
-index c06882c..2efc46c 100644
---- a/uwsgiconfig.py
-+++ b/uwsgiconfig.py
-@@ -84,7 +84,7 @@ def spcall2(cmd):
- else:
- return None
-
--gcc_version = str(spcall2("%s -v" % GCC)).split('\n')[-1].split()[2]
-+gcc_version = str(spcall2("%s -v" % GCC)).split('\n')[-1].split()[4]
-
- gcc_major = int(gcc_version.split('.')[0])
- gcc_minor = int(gcc_version.split('.')[1])
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-0.9.5-fix_uwsgiconfig.py_indentation.patch b/www-servers/uwsgi/files/uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch
deleted file mode 100644
index e02f497..0000000
--- a/www-servers/uwsgi/files/uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- uwsgiconfig.py
-+++ uwsgiconfig.py
-@@ -68,9 +68,9 @@
- p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
-
- if p.wait() == 0:
-- return p.stdout.read().rstrip().decode()
-+ return p.stdout.read().rstrip().decode()
- else:
-- return None
-+ return None
-
- def add_o(x):
- if x == 'uwsgi':
-@@ -149,11 +149,11 @@
- kvm_list = ['FreeBSD', 'OpenBSD', 'NetBSD', 'DragonFly']
-
- if uwsgi_os == 'SunOS':
-- ldflags.append('-lsendfile')
-+ ldflags.append('-lsendfile')
- ldflags.remove('-rdynamic')
-
- if uwsgi_os in kvm_list:
-- ldflags.append('-lkvm')
-+ ldflags.append('-lkvm')
-
- if uwsgi_os == 'OpenBSD':
- UGREEN = False
-@@ -245,8 +245,8 @@
- gcc_list.append('erlang')
-
- if SCTP:
-- ldflags.append("-lsctp")
-- cflags.append("-DUWSGI_SCTP")
-+ ldflags.append("-lsctp")
-+ cflags.append("-DUWSGI_SCTP")
-
- if SPOOLER:
- depends_on("SPOOLER", ['EMBEDDED'])
-@@ -294,9 +294,9 @@
- sys.exit(1)
-
- if cmd == '--cflags':
-- print(' '.join(cflags))
-+ print(' '.join(cflags))
- if cmd == '--ldflags':
-- print(' '.join(ldflags))
-+ print(' '.join(ldflags))
- elif cmd == '--build':
- parse_vars()
- build_uwsgi(UWSGI_BIN_NAME)
diff --git a/www-servers/uwsgi/files/uwsgi-0.9.5-respect_flags.patch b/www-servers/uwsgi/files/uwsgi-0.9.5-respect_flags.patch
deleted file mode 100644
index c3f740d..0000000
--- a/www-servers/uwsgi/files/uwsgi-0.9.5-respect_flags.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- uwsgiconfig.py
-+++ uwsgiconfig.py
-@@ -20,7 +20,6 @@
- PLUGINS = []
- UNBIT=False
- UWSGI_BIN_NAME = 'uwsgi'
--GCC='gcc'
-
- # specific compilation flags
- # libxml2 or expat
-@@ -46,17 +45,22 @@
-
- from distutils import sysconfig
-
-+GCC = os.environ.get('CC', sysconfig.get_config_var('CC'))
-+if not GCC:
-+ GCC = 'gcc'
-+
- gcc_list = ['utils', 'pyutils', 'protocol', 'socket', 'logging', 'wsgi_handlers', 'wsgi_headers', 'uwsgi_handlers', 'uwsgi']
-
- # large file support
- try:
-- cflags = ['-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + sysconfig.get_config_var('CFLAGS').split()
-+ cflags = ['-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split()
- except:
- print("You need python headers to build uWSGI.")
- sys.exit(1)
-
- cflags = cflags + ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True) ]
--ldflags = ['-lpthread', '-rdynamic'] + sysconfig.get_config_var('LIBS').split() + sysconfig.get_config_var('SYSLIBS').split()
-+ldflags = os.environ.get("LDFLAGS", "").split()
-+libs = ['-lpthread', '-rdynamic'] + sysconfig.get_config_var('LIBS').split() + sysconfig.get_config_var('SYSLIBS').split()
-
- def depends_on(what, dep):
- for d in dep:
-@@ -97,7 +101,7 @@
- print(plugin)
-
- print("*** uWSGI linking ***")
-- ldline = "%s -o %s %s %s" % (GCC, bin_name, ' '.join(map(add_o, gcc_list)), ' '.join(ldflags))
-+ ldline = "%s -o %s %s %s %s" % (GCC, bin_name, ' '.join(ldflags), ' '.join(map(add_o, gcc_list)), ' '.join(libs))
- print(ldline)
- ret = os.system(ldline)
- if ret != 0:
-@@ -141,19 +145,19 @@
- version = sys.version_info
- uver = "%d.%d" % (version[0], version[1])
-
-- ldflags.append('-lpython' + uver)
-+ libs.append('-lpython' + uver)
-
- if str(PYLIB_PATH) != '':
-- ldflags.insert(0,'-L' + PYLIB_PATH)
-+ libs.insert(0,'-L' + PYLIB_PATH)
-
- kvm_list = ['FreeBSD', 'OpenBSD', 'NetBSD', 'DragonFly']
-
- if uwsgi_os == 'SunOS':
-- ldflags.append('-lsendfile')
-- ldflags.remove('-rdynamic')
-+ libs.append('-lsendfile')
-+ libs.remove('-rdynamic')
-
- if uwsgi_os in kvm_list:
-- ldflags.append('-lkvm')
-+ libs.append('-lkvm')
-
- if uwsgi_os == 'OpenBSD':
- UGREEN = False
-@@ -221,7 +225,7 @@
- print("*** libxml2 headers unavailable. uWSGI build is interrupted. You have to install libxml2 development package or use libexpat or disable XML")
- sys.exit(1)
- else:
-- ldflags.append(xmlconf)
-+ libs.append(xmlconf)
- xmlconf = spcall("xml2-config --cflags")
- if xmlconf is None:
- print("*** libxml2 headers unavailable. uWSGI build is interrupted. You have to install libxml2 development package or use libexpat or disable XML")
-@@ -232,20 +236,20 @@
- gcc_list.append('xmlconf')
- elif XML_IMPLEMENTATION == 'expat':
- cflags.append("-DUWSGI_XML -DUWSGI_XML_EXPAT")
-- ldflags.append('-lexpat')
-+ libs.append('-lexpat')
- gcc_list.append('xmlconf')
-
-
- if ERLANG:
- depends_on("ERLANG", ['EMBEDDED'])
- cflags.append("-DUWSGI_ERLANG")
-- ldflags.append(ERLANG_LDFLAGS)
-+ libs.append(ERLANG_LDFLAGS)
- if str(ERLANG_CFLAGS) != '':
- cflags.append(ERLANG_CFLAGS)
- gcc_list.append('erlang')
-
- if SCTP:
-- ldflags.append("-lsctp")
-+ libs.append("-lsctp")
- cflags.append("-DUWSGI_SCTP")
-
- if SPOOLER:
-@@ -263,13 +267,13 @@
- import uwsgiplugin as up
-
- cflags.append(up.CFLAGS)
-- ldflags.append(up.LDFLAGS)
-+ libs.append(up.LDFLAGS)
-
- cflags.insert(0, '-I.')
-
- plugin_base = path + '/' + up.NAME + '_plugin'
-
-- gccline = "%s -fPIC -shared -o %s.so %s %s.c %s" % (GCC, plugin_base, ' '.join(cflags), plugin_base, ' '.join(ldflags))
-+ gccline = "%s -fPIC -shared -o %s.so %s %s %s.c %s" % (GCC, plugin_base, ' '.join(cflags), ' '.join(ldflags), plugin_base, ' '.join(libs))
- print(gccline)
-
- ret = os.system(gccline)
-@@ -297,6 +301,8 @@
- print(' '.join(cflags))
- if cmd == '--ldflags':
- print(' '.join(ldflags))
-+ if cmd == '--libs':
-+ print(' '.join(libs))
- elif cmd == '--build':
- parse_vars()
- build_uwsgi(UWSGI_BIN_NAME)
diff --git a/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch b/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch
new file mode 100644
index 0000000..f55d6bb
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch
@@ -0,0 +1,11 @@
+--- uwsgiconfig.py 2011-06-07 18:38:50.000000000 +0400
++++ uwsgiconfig.py 2011-06-05 10:28:03.000000000 +0400
+@@ -176,7 +176,7 @@
+ if uwsgi_os == 'Linux':
+ self.gcc_list.append('lib/linux_ns')
+ self.gcc_list.append('lib/netlink')
+- self.cflags = ['-O2', '-Wall', '-Werror', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split()
++ self.cflags = ['-O2', '-Wall', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split()
+ try:
+ gcc_version = str(spcall("%s -dumpversion" % GCC))
+ except:
diff --git a/www-servers/uwsgi/files/uwsgi.confd b/www-servers/uwsgi/files/uwsgi.confd
new file mode 100644
index 0000000..11152da
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi.confd
@@ -0,0 +1,47 @@
+# 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 $
+
+# DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
+
+# Path (or name) of UNIX/TCP socket to bind to
+#
+UWSGI_SOCKET=127.0.0.1:1234
+
+# Enable threads?
+#
+UWSGI_THREADS=1
+
+# 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_CHILDREN=1
+
+# The log file path. If empty logging is disabled
+#
+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=
+
+# 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..3fedecc
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -0,0 +1,101 @@
+#!/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"
+
+depend() {
+ need net
+}
+
+start() {
+ local OPTIONS
+
+ if [ "${SVCNAME}" = "uwsgi" ]; then
+ eerror "You are not supposed to run this script directly. Create a symlink"
+ eerror "for the FastCGI 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
+
+ if [ -z "${UWSGI_SOCKET}" ]; then
+ eerror "You need to specify path (or name) of UNIX/TCP socket to bind to"
+ eerror "in UWSGI_SOCKET"
+ return 1
+ fi
+
+ if [ -z "${UWSGI_PROGRAM}" ] && [ -z "${UWSGI_XML_CONFIG}" ]; then
+ eerror "You need to specify which \$UWSGI_PROGRAM or \$UWSGI_XML_CONFIG"
+ eerror "you want to start."
+ eerror "Please adjust /etc/conf.d/uwsgi.${PROGNAME}"
+ return 1
+ fi
+
+ if [ -n "${UWSGI_PROGRAM}" ] && [ -n "${UWSGI_XML_CONFIG}" ]; then
+ eerror "Only one of the two may be defined:"
+ eerror " UWSGI_PROGRAM=${UWSGI_PROGRAM}"
+ eerror " UWSGI_XML_CONFIG=${UWSGI_XML_CONFIG}"
+ return 1
+ fi
+
+
+ OPTIONS="--master --daemonize"
+
+ if [ -n "$UWSGI_LOG_FILE" ]; then
+ OPTIONS="${OPTIONS} $UWSGI_LOG_FILE"
+ else
+ OPTIONS="${OPTIONS} /dev/null --disable-logging"
+ 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_CHILDREN}" ]; then
+ OPTIONS="${OPTIONS} --processes ${UWSGI_CHILDREN}"
+ fi
+
+ if [ -n "${UWSGI_CHROOT}" ]; then
+ OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}"
+ 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 [ -n "${UWSGI_PROGRAM}" ]; then
+ OPTIONS="${OPTIONS} --wsgi-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}"
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping uWSGI application ${PROGNAME}"
+ start-stop-daemon --stop --pidfile "${PIDFILE}" --signal 3
+ eend $?
+}
diff --git a/www-servers/uwsgi/uwsgi-0.9.6.5.ebuild b/www-servers/uwsgi/uwsgi-0.9.6.5.ebuild
deleted file mode 100644
index 951eb8a..0000000
--- a/www-servers/uwsgi/uwsgi-0.9.6.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.5.ebuild,v 1.1 2010/05/03 19:24:28 hollow Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python toolchain-funcs
-
-DESCRIPTION="uWSGI server for Python web applications"
-HOMEPAGE="http://projects.unbit.it/uwsgi/"
-SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # Python 3 requires constant indentation.
-# epatch "${FILESDIR}/${PN}-0.9.5-fix_uwsgiconfig.py_indentation.patch"
-
- # Respect CC, CFLAGS and LDFLAGS.
-# epatch "${FILESDIR}/${PN}-0.9.5-respect_flags.patch"
-
- epatch "${FILESDIR}/${PV}-gentoo-gcc.patch"
-
- python_copy_sources
-}
-
-src_compile() {
- python_src_compile CC="$(tc-getCC)"
-}
-
-src_install() {
- installation() {
- newbin uwsgi uwsgi-${PYTHON_ABI}
- }
- python_execute_function -s installation
-
- python_generate_wrapper_scripts "${ED}usr/bin/uwsgi"
-}
diff --git a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
new file mode 100644
index 0000000..10c82a8
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.8.ebuild,v 1.1 2011/06/08 18:00:13 maksbotan Exp $
+
+EAPI="3"
+PYTHON_DEPEND="*"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python toolchain-funcs apache-module
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="42_mod_${PN}"
+want_apache2_2
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.9.8-no-werror.patch
+ python_copy_sources
+}
+
+src_compile() {
+ python_src_compile CC="$(tc-getCC)"
+
+ if use apache2 ; then
+ for m in Ruwsgi uwsgi ; do
+ APXS2_ARGS="-c mod_${m}.c"
+ apache-module_src_compile
+ done
+ fi
+}
+
+src_install() {
+ installation() {
+ newbin uwsgi uwsgi-${PYTHON_ABI}
+ }
+ python_execute_function -s installation
+
+ python_generate_wrapper_scripts "${ED}usr/bin/uwsgi"
+
+ 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
+ mkdir "${ED}"/var/run/uwsgi
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
@ 2011-07-31 13:23 Tiziano Müller
0 siblings, 0 replies; 11+ messages in thread
From: Tiziano Müller @ 2011-07-31 13:23 UTC (permalink / raw
To: gentoo-commits
commit: 60c252e51d04a4fb204a4baa31824d99a9aa0f6f
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 13:21:38 2011 +0000
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 13:21:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=60c252e5
make the init.d-script useable, let it create /var/run/uwsgi
---
www-servers/uwsgi/Manifest | 4 ++--
www-servers/uwsgi/files/uwsgi.initd | 23 ++---------------------
www-servers/uwsgi/uwsgi-0.9.8.3.ebuild | 1 -
3 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index e44697a..813744a 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -2,7 +2,7 @@ MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4b
AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
AUX uwsgi.confd 1116 RMD160 e13ddecb06cf4efaf75216ec657db99a4abbbddf SHA1 9df38c84bc2d612803629a6a2e6bd9a3a5568d33 SHA256 3c238b934f8db9eae87f77dc3d131499e442526d5e45438b5461c0d7590b772f
-AUX uwsgi.initd 2705 RMD160 96ee8102823eddfcfc17da14882aed17c7ca5249 SHA1 35365c5ca755cd650424c826488ac85b067e4575 SHA256 328087fe8a36e91155c1173cfddc257f4479b1588bc56689b42a0fc74707bed4
+AUX uwsgi.initd 2109 RMD160 47777360891b810eb53a15f15bece33958692d37 SHA1 f22692601568597b261ddcdc5ee9def525bc19e8 SHA256 cda6ffcff61184b3d50beb8c58d2aa62f56aad552660feb6df5dd84d8e4f758a
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
-EBUILD uwsgi-0.9.8.3.ebuild 1870 RMD160 53ae8621ac13e000fc29e1ab6e37fcfab87f8434 SHA1 a1a3ad0e9cd8db43aae9f07ee2077b3c3e9cab56 SHA256 08a663229cd0510fa3eb4ccc16aa68343b7097f7436c7c37e4f6880b4b00c698
+EBUILD uwsgi-0.9.8.3.ebuild 1841 RMD160 efc9d251734d8c15a1108a654f49304def8e9009 SHA1 db42a0a23a42b4cbd1110ae3e2da9a6b72e86645 SHA256 d15343367daa297e17f81265afc19b73e793c26582d7b2cd10ff839b4c694d15
DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
index 3fedecc..ec8dd46 100644
--- a/www-servers/uwsgi/files/uwsgi.initd
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -14,6 +14,8 @@ depend() {
}
start() {
+ mkdir "/var/run/uwsgi"
+
local OPTIONS
if [ "${SVCNAME}" = "uwsgi" ]; then
@@ -28,27 +30,6 @@ start() {
return 1
fi
- if [ -z "${UWSGI_SOCKET}" ]; then
- eerror "You need to specify path (or name) of UNIX/TCP socket to bind to"
- eerror "in UWSGI_SOCKET"
- return 1
- fi
-
- if [ -z "${UWSGI_PROGRAM}" ] && [ -z "${UWSGI_XML_CONFIG}" ]; then
- eerror "You need to specify which \$UWSGI_PROGRAM or \$UWSGI_XML_CONFIG"
- eerror "you want to start."
- eerror "Please adjust /etc/conf.d/uwsgi.${PROGNAME}"
- return 1
- fi
-
- if [ -n "${UWSGI_PROGRAM}" ] && [ -n "${UWSGI_XML_CONFIG}" ]; then
- eerror "Only one of the two may be defined:"
- eerror " UWSGI_PROGRAM=${UWSGI_PROGRAM}"
- eerror " UWSGI_XML_CONFIG=${UWSGI_XML_CONFIG}"
- return 1
- fi
-
-
OPTIONS="--master --daemonize"
if [ -n "$UWSGI_LOG_FILE" ]; then
diff --git a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
index 10c82a8..c5b45f5 100644
--- a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
+++ b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
@@ -57,7 +57,6 @@ src_install() {
newinitd "${FILESDIR}"/uwsgi.initd uwsgi
newconfd "${FILESDIR}"/uwsgi.confd uwsgi
- mkdir "${ED}"/var/run/uwsgi
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-04-23 7:49 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-21 10:56 [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/ Tiziano Müller
-- strict thread matches above, loose matches on Subject: below --
2012-04-23 7:49 Tiziano Müller
2011-11-29 18:52 Tiziano Müller
2011-08-09 13:09 Tiziano Müller
2011-08-09 10:02 Tiziano Müller
2011-08-02 9:42 Tiziano Müller
2011-07-31 13:48 Tiziano Müller
2011-07-31 13:41 Tiziano Müller
2011-07-31 13:27 Tiziano Müller
2011-07-31 13:23 Tiziano Müller
2011-07-31 13:23 Tiziano Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox