Date: Monday, October 27, 2014 @ 11:39:00 Author: svenstaro Revision: 121466
upgpkg: uwsgi 2.0.7-5 Restructure and simplify package (Fixes FS#42190) Modified: uwsgi/trunk/PKGBUILD uwsgi/trunk/archlinux.ini ---------------+ PKGBUILD | 204 ++++++++++++-------------------------------------------- archlinux.ini | 18 ---- 2 files changed, 50 insertions(+), 172 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-10-27 10:28:44 UTC (rev 121465) +++ PKGBUILD 2014-10-27 10:39:00 UTC (rev 121466) @@ -7,33 +7,25 @@ pkgbase=uwsgi pkgname=(uwsgi - uwsgi-plugin-common - uwsgi-plugin-rack - uwsgi-plugin-psgi - uwsgi-plugin-python2 - uwsgi-plugin-python - uwsgi-plugin-pypy - uwsgi-plugin-nagios - uwsgi-plugin-router - uwsgi-plugin-php - uwsgi-plugin-lua51 - uwsgi-plugin-carbon - uwsgi-plugin-rrdtool - uwsgi-plugin-pam - uwsgi-plugin-zergpool - ) - #uwsgi-plugin-erlang - #uwsgi-plugin-admin + uwsgi-plugin-rack + uwsgi-plugin-psgi + uwsgi-plugin-python2 + uwsgi-plugin-python + uwsgi-plugin-pypy + uwsgi-plugin-php + uwsgi-plugin-lua51 + uwsgi-plugin-jvm + uwsgi-plugin-mono) pkgver=2.0.7 -pkgrel=4 +pkgrel=5 arch=(i686 x86_64) url="http://projects.unbit.it/$pkgbase"; license=(GPL2) backup=('etc/uwsgi/emperor.ini') conflicts=(python-$pkgbase) -makedepends=(gcc python python2 ruby python2-greenlet php-embed curl libxml2 libyaml +makedepends=(gcc python python2 ruby python2-greenlet python-greenlet php-embed curl libxml2 libyaml perl lua51 pcre libedit openssl bzip2 gmp pam java-environment=7 - jansson classpath pypy) + jansson classpath pypy mono python2-gevent) source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz archlinux.ini tmpfilesd @@ -47,7 +39,7 @@ emperor.uwsgi.socket) md5sums=('c18da6536f2f47a204814225ba695042' - 'dec47bb8bb0dc8caf79331151879f3a0' + 'e4d8e243b2faff21ec1353e9b1408103' '752475ee32286acfbafa49b898616817' '15d698b5417923c2610842a86ec471a1' 'ea381549fe65a5d72fa1abb5ceb7d3ef' @@ -74,9 +66,11 @@ pushd $srcdir/$pkgbase-$pkgver python uwsgiconfig.py --build archlinux + python uwsgiconfig.py --plugin plugins/python archlinux python + python uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet python2 uwsgiconfig.py --plugin plugins/python archlinux python2 - python2 uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet - python2 uwsgiconfig.py --plugin plugins/gevent archlinux gevent + python2 uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet2 + python2 uwsgiconfig.py --plugin plugins/gevent archlinux gevent2 python2 uwsgiconfig.py --plugin plugins/pypy archlinux pypy } @@ -91,179 +85,75 @@ install -Dm644 $srcdir/emperor.uwsgi.service $pkgdir/usr/lib/systemd/system/emperor.uwsgi.service install -Dm644 $srcdir/emperor.uwsgi.socket $pkgdir/usr/lib/systemd/system/emperor.uwsgi.socket install -Dm644 $srcdir/emperor.ini $pkgdir/etc/uwsgi/emperor.ini - install -Dm755 systemd_logger_plugin.so $pkgdir/usr/lib/uwsgi/systemd_logger_plugin.so install -Dm644 $srcdir/tmpfilesd $pkgdir/usr/lib/tmpfiles.d/uwsgi.conf } -package_uwsgi-plugin-common(){ - depends=(uwsgi) - pkgdesc="Common plugins for uWSGI" - install -dm755 $pkgdir/usr/bin - for plugin in transformation_chunked transformation_gzip transformation_offload transformation_template transformation_tofile transformation_toupper cache cgi rpc ugreen; do - install -Dm755 $pkgbase-$pkgver/${plugin}_plugin.so $pkgdir/usr/lib/uwsgi/${plugin}_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_$plugin - done - install -Dm755 $pkgbase-$pkgver/corerouter_plugin.so $pkgdir/usr/lib/uwsgi/ - -} - -package_uwsgi-plugin-rack(){ - depends=(ruby uwsgi-plugin-common) +package_uwsgi-plugin-rack() { + depends=(ruby) pkgdesc="Ruby rack plugin" - install -dm755 $pkgdir/usr/bin install -Dm755 $pkgbase-$pkgver/rack_plugin.so $pkgdir/usr/lib/uwsgi/rack_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} install -Dm755 $pkgbase-$pkgver/fiber_plugin.so $pkgdir/usr/lib/uwsgi/fiber_plugin.so install -Dm755 $pkgbase-$pkgver/rbthreads_plugin.so $pkgdir/usr/lib/uwsgi/rbthreads_plugin.so } -package_uwsgi-plugin-psgi(){ - depends=(perl uwsgi-plugin-common) +package_uwsgi-plugin-psgi() { + depends=(perl) pkgdesc="Perl psgi plugin" - install -dm755 $pkgdir/usr/bin install -Dm755 $pkgbase-$pkgver/psgi_plugin.so $pkgdir/usr/lib/uwsgi/psgi_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} } -package_uwsgi-plugin-python2(){ - depends=(uwsgi-plugin-common python2-gevent python2-gevent) +package_uwsgi-plugin-python2() { + depends=(python2-gevent python2-greenlet) pkgdesc="Plugin for Python2 support" - replace=(uswgi-plugin-greenlet) - cd $srcdir/$pkgbase-$pkgver - install -dm755 $pkgdir/usr/bin - install -Dm755 $srcdir/$pkgbase-$pkgver/python2_plugin.so $pkgdir/usr/lib/uwsgi/python2_plugin.so - install -Dm755 greenlet_plugin.so $pkgdir/usr/lib/uwsgi/greenlet_plugin.so - install -Dm755 gevent_plugin.so $pkgdir/usr/lib/uwsgi/gevent_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} - install -Dm644 uwsgidecorators.py $pkgdir/usr/lib/python2.7/site-packages/uwsgidecorators.py + install -Dm755 $pkgbase-$pkgver/python2_plugin.so $pkgdir/usr/lib/uwsgi/python2_plugin.so + install -Dm755 $pkgbase-$pkgver/greenlet2_plugin.so $pkgdir/usr/lib/uwsgi/greenlet2_plugin.so + install -Dm755 $pkgbase-$pkgver/gevent2_plugin.so $pkgdir/usr/lib/uwsgi/gevent2_plugin.so + install -Dm644 $pkgbase-$pkgver/uwsgidecorators.py $pkgdir/usr/lib/python2.7/site-packages/uwsgidecorators.py python2 -m compileall $pkgdir/usr/lib/python2.7/site-packages/ python2 -O -m compileall $pkgdir/usr/lib/python2.7/site-packages/ } -package_uwsgi-plugin-python(){ - depends=(python uwsgi-plugin-common) +package_uwsgi-plugin-python() { + depends=(python python-greenlet) pkgdesc="Plugin for Python support" - install -dm755 $pkgdir/usr/bin - cd $srcdir/$pkgbase-$pkgver - install -Dm755 $srcdir/$pkgbase-$pkgver/python_plugin.so $pkgdir/usr/lib/uwsgi/python_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} - install -Dm644 uwsgidecorators.py $pkgdir/usr/lib/python3.4/site-packages/uwsgidecorators.py + install -Dm755 $pkgbase-$pkgver/python_plugin.so $pkgdir/usr/lib/uwsgi/python_plugin.so + install -Dm755 $pkgbase-$pkgver/greenlet_plugin.so $pkgdir/usr/lib/uwsgi/greenlet_plugin.so + install -Dm644 $pkgbase-$pkgver/uwsgidecorators.py $pkgdir/usr/lib/python3.4/site-packages/uwsgidecorators.py python -m compileall $pkgdir/usr/lib/python3.4/site-packages/ python -O -m compileall $pkgdir/usr/lib/python3.4/site-packages/ } -package_uwsgi-plugin-pypy(){ - depends=(pypy uwsgi-plugin-common) +package_uwsgi-plugin-pypy() { + depends=(pypy) pkgdesc="Plugin for PyPy support" - install -dm755 $pkgdir/usr/bin - cd $srcdir/$pkgbase-$pkgver - install -Dm755 $srcdir/$pkgbase-$pkgver/pypy_plugin.so $pkgdir/usr/lib/uwsgi/pypy_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} - install -Dm644 uwsgidecorators.py $pkgdir/opt/pypy/site-packages/uwsgidecorators.py + install -Dm755 $pkgbase-$pkgver/pypy_plugin.so $pkgdir/usr/lib/uwsgi/pypy_plugin.so + install -Dm644 $pkgbase-$pkgver/uwsgidecorators.py $pkgdir/opt/pypy/site-packages/uwsgidecorators.py pypy -m compileall $pkgdir/opt/pypy/site-packages/ pypy -O -m compileall $pkgdir/opt/pypy/site-packages/ } -package_uwsgi-plugin-nagios(){ - depends=( uwsgi-plugin-common) - pkgdesc="Plugin for Nagios support" - install -dm755 $pkgdir/usr/bin - install -Dm755 $pkgbase-$pkgver/nagios_plugin.so $pkgdir/usr/lib/uwsgi/nagios_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} -} - -package_uwsgi-plugin-router(){ - depends=( uwsgi-plugin-common) - pkgdesc="Plugin for Router support" - install -dm755 $pkgdir/usr/lib/uwsgi - install -dm755 $pkgdir/usr/bin - cd $pkgbase-$pkgver - - for file in router_*_plugin.so fastrouter_plugin.so sslrouter_plugin.so rawrouter_plugin.so; do - install -Dm755 $file $pkgdir/usr/lib/uwsgi/$file - done - install -Dm755 router_basicauth_plugin.so $pkgdir/usr/lib/uwsgi/basicauth_plugin.so -} - -#package_uwsgi-plugin-admin(){ -# depends=( uwsgi-plugin-common) -# pkgdesc="Plugin for Admin support" -# install -dm755 $pkgdir/usr/bin -# install -Dm755 $pkgbase-$pkgver/admin_plugin.so $pkgdir/usr/lib/uwsgi/admin_plugin.so -# ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} -#} - -package_uwsgi-plugin-lua51(){ - depends=(lua51 uwsgi-plugin-common) +package_uwsgi-plugin-lua51() { + depends=(lua51) pkgdesc="Plugin for Lua support" - install -dm755 $pkgdir/usr/bin - install -dm755 $pkgdir/usr/bin install -Dm755 $pkgbase-$pkgver/lua_plugin.so $pkgdir/usr/lib/uwsgi/lua_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_lua } -package_uwsgi-plugin-php(){ - depends=(uwsgi-plugin-common php-embed libyaml jansson) - replace=(uswgi-plugin-php) +package_uwsgi-plugin-php() { + depends=(php-embed libyaml jansson) pkgdesc="Plugin for PHP support" - install -dm755 $pkgdir/usr/bin install -Dm755 $pkgbase-$pkgver/php_plugin.so $pkgdir/usr/lib/uwsgi/php_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} } -package_uwsgi-plugin-carbon(){ - depends=(uwsgi-plugin-common) - pkgdesc="Plugin for Carbon support" - install -dm755 $pkgdir/usr/bin - install -Dm755 $pkgbase-$pkgver/carbon_plugin.so $pkgdir/usr/lib/uwsgi/carbon_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} -} - -package_uwsgi-plugin-rrdtool(){ - depends=(uwsgi-plugin-common rrdtool) - pkgdesc="Plugin for Rrdtool support" - install -dm755 $pkgdir/usr/bin - install -Dm755 $pkgbase-$pkgver/rrdtool_plugin.so $pkgdir/usr/lib/uwsgi/rrdtool_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} -} - -#package_uwsgi-plugin-erlang(){ -# depends=(uwsgi-plugin-common erlang) -# pkgdesc="Plugin for Erlang support" -# install -dm755 $pkgdir/usr/bin -# install -Dm755 $pkgbase-$pkgver/erlang_plugin.so $pkgdir/usr/lib/uwsgi/erlang_plugin.so -# ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} -#} - - -package_uwsgi-plugin-pam(){ - depends=(uwsgi-plugin-common) - pkgdesc="Plugin for Pam support" - install -dm755 $pkgdir/usr/bin - install -Dm755 $pkgbase-$pkgver/pam_plugin.so $pkgdir/usr/lib/uwsgi/pam_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} -} - -package_uwsgi-plugin-jvm(){ - depends=(uwsgi-plugin-common java-environment=7 classpath) +package_uwsgi-plugin-jvm() { + depends=(java-environment=7 classpath) pkgdesc="Plugin for Jvm support" - install -dm755 $pkgdir/usr/bin install -Dm644 $pkgbase-$pkgver/plugins/jvm/uwsgi.jar $pkgdir/usr/share/java/uwsgi.jar install -Dm755 $pkgbase-$pkgver/jvm_plugin.so $pkgdir/usr/lib/uwsgi/jvm_plugin.so } -package_uwsgi-plugin-zergpool(){ - depends=(uwsgi-plugin-common) - pkgdesc="Plugin for zergpool support" - install -dm755 $pkgdir/usr/bin - install -Dm755 $pkgbase-$pkgver/zergpool_plugin.so $pkgdir/usr/lib/uwsgi/zergpool_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} +package_uwsgi-plugin-mono() { + depends=(mono) + pkgdesc="Plugin for mono support" + install -Dm755 $pkgbase-$pkgver/plugins/mono/uwsgi.dll $pkgdir/usr/lib/mono/2.0/uwsgi.dll + install -Dm755 $pkgbase-$pkgver/mono_plugin.so $pkgdir/usr/lib/uwsgi/mono_plugin.so } - -package_uwsgi-plugin-gevent() { - depends=(uwsgi-plugin-common gevent) - pkgdesc="Plugin for gevent support" - install -dm755 $pkgdir/usr/bin - install -Dm755 $pkgbase-$pkgver/gevent_plugin.so $pkgdir/usr/lib/uwsgi/gevent_plugin.so - ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-} -} Modified: archlinux.ini =================================================================== --- archlinux.ini 2014-10-27 10:28:44 UTC (rev 121465) +++ archlinux.ini 2014-10-27 10:39:00 UTC (rev 121466) @@ -1,17 +1,5 @@ [uwsgi] -inherit = core -bin_name = uwsgi -xml = true -yaml = true -json = true -pcre = true -routing = true -debug = false -sqlite3 = true -ssl = true -xml_implementation = libxml2 -yaml_implementation = auto -malloc_implementation = libc -embedded_plugins = echo, ping, http, corerouter plugin_dir = /usr/lib/uwsgi -plugins = echo, ping, http, rack, psgi, corerouter, rbthreads, fiber, python, nagios, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter, transformation_chunked, transformation_gzip, transformation_offload, transformation_template, transformation_tofile, transformation_toupper +plugins = rack, rbthreads, fiber, psgi, lua, php, jvm, mono +main_plugin = systemd_logger,pam +inherit = base
