[arch-commits] Commit in uwsgi/repos/community-i686 (24 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Fri Jul 24 19:03:02 UTC 2015


    Date: Friday, July 24, 2015 @ 21:03:01
  Author: svenstaro
Revision: 137390

archrelease: copy trunk to community-i686

Added:
  uwsgi/repos/community-i686/PKGBUILD
    (from rev 137389, uwsgi/trunk/PKGBUILD)
  uwsgi/repos/community-i686/archlinux.ini
    (from rev 137389, uwsgi/trunk/archlinux.ini)
  uwsgi/repos/community-i686/emperor.ini
    (from rev 137389, uwsgi/trunk/emperor.ini)
  uwsgi/repos/community-i686/emperor.uwsgi.service
    (from rev 137389, uwsgi/trunk/emperor.uwsgi.service)
  uwsgi/repos/community-i686/emperor.uwsgi.socket
    (from rev 137389, uwsgi/trunk/emperor.uwsgi.socket)
  uwsgi/repos/community-i686/tmpfilesd
    (from rev 137389, uwsgi/trunk/tmpfilesd)
  uwsgi/repos/community-i686/uwsgi.install
    (from rev 137389, uwsgi/trunk/uwsgi.install)
  uwsgi/repos/community-i686/uwsgi_at.service
    (from rev 137389, uwsgi/trunk/uwsgi_at.service)
  uwsgi/repos/community-i686/uwsgi_at.socket
    (from rev 137389, uwsgi/trunk/uwsgi_at.socket)
  uwsgi/repos/community-i686/uwsgi_fix_rpath.patch
    (from rev 137389, uwsgi/trunk/uwsgi_fix_rpath.patch)
  uwsgi/repos/community-i686/uwsgi_ruby20_compatibility.patch
    (from rev 137389, uwsgi/trunk/uwsgi_ruby20_compatibility.patch)
  uwsgi/repos/community-i686/uwsgi_trick_chroot.patch
    (from rev 137389, uwsgi/trunk/uwsgi_trick_chroot.patch)
Deleted:
  uwsgi/repos/community-i686/PKGBUILD
  uwsgi/repos/community-i686/archlinux.ini
  uwsgi/repos/community-i686/emperor.ini
  uwsgi/repos/community-i686/emperor.uwsgi.service
  uwsgi/repos/community-i686/emperor.uwsgi.socket
  uwsgi/repos/community-i686/tmpfilesd
  uwsgi/repos/community-i686/uwsgi.install
  uwsgi/repos/community-i686/uwsgi_at.service
  uwsgi/repos/community-i686/uwsgi_at.socket
  uwsgi/repos/community-i686/uwsgi_fix_rpath.patch
  uwsgi/repos/community-i686/uwsgi_ruby20_compatibility.patch
  uwsgi/repos/community-i686/uwsgi_trick_chroot.patch

----------------------------------+
 PKGBUILD                         |  392 ++++++++++++++++++-------------------
 archlinux.ini                    |   10 
 emperor.ini                      |    8 
 emperor.uwsgi.service            |   32 +--
 emperor.uwsgi.socket             |   18 -
 tmpfilesd                        |    2 
 uwsgi.install                    |   24 +-
 uwsgi_at.service                 |   32 +--
 uwsgi_at.socket                  |   18 -
 uwsgi_fix_rpath.patch            |  132 ++++++------
 uwsgi_ruby20_compatibility.patch |   84 +++----
 uwsgi_trick_chroot.patch         |   32 +--
 12 files changed, 392 insertions(+), 392 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-24 19:02:48 UTC (rev 137389)
+++ PKGBUILD	2015-07-24 19:03:01 UTC (rev 137390)
@@ -1,196 +0,0 @@
-# $Id$
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Valentin Hăloiu <vially.ichb+aur at gmail.com>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Kevin Zuber <uKev at knet.eu>
-# Contributor: Vsevolod Balashov <vsevolod at balashov.name>
-# Contributor: David Runge <dave at sleepmap.de>
-
-pkgbase=uwsgi
-pkgname=(uwsgi
-         uwsgi-plugin-rack
-         uwsgi-plugin-psgi
-         uwsgi-plugin-cgi
-         uwsgi-plugin-python2
-         uwsgi-plugin-python
-         uwsgi-plugin-pypy
-         uwsgi-plugin-php
-         uwsgi-plugin-lua51
-         uwsgi-plugin-jvm
-         uwsgi-plugin-mono
-         uwsgi-plugin-webdav
-         mod_proxy_uwsgi)
-pkgver=2.0.10
-pkgrel=3
-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 python-greenlet php-embed curl libxml2 libyaml
-             perl lua51 pcre libedit openssl bzip2 gmp pam java-environment=7
-             jansson classpath pypy mono python2-gevent apache)
-source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
-        archlinux.ini
-        tmpfilesd
-        uwsgi_at.service
-        uwsgi_at.socket
-        uwsgi_fix_rpath.patch
-        uwsgi_ruby20_compatibility.patch
-        uwsgi_trick_chroot.patch
-        emperor.ini
-        emperor.uwsgi.service
-        emperor.uwsgi.socket)
-
-md5sums=('7a9be0db5f6a8d4150dc5e9e0517ce80'
-         '9aced0faffc5fc04afccf946e8a2a886'
-         '752475ee32286acfbafa49b898616817'
-         'feaf107977aec047101acdbf06810f30'
-         'ea381549fe65a5d72fa1abb5ceb7d3ef'
-         '1a4516d5cdcf5b95b036f4eae2d0c152'
-         '4d09535ce379c8acd76160f35d5d6b55'
-         '0c09a52fdb88f08c36a8b380f451ce6d'
-         '5fa14ddea9a3dae17b5be28468d47b80'
-         '25dfcc365241f16d7ea16f7143698b53'
-         '3ab4486e02f5c217566fb6c8d469c246')
-
-prepare() {
-    cd $srcdir/$pkgbase-$pkgver
-    cp $srcdir/archlinux.ini buildconf/archlinux.ini
-    #sed -i 's/LIBS .*-lphp5.*/LIBS = []/' plugins/php/uwsgiplugin.py
-    for patch in uwsgi_fix_rpath.patch uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch; do
-        patch -Np1 -i $srcdir/$patch
-    done
-    rm -rf plugins/ruby
-    mv plugins/ruby{19,}
-    sed -i 's:\(ruby\)19:\1:' plugins/ruby/uwsgiplugin.py
-}
-
-build() {
-    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
-    python uwsgiconfig.py --plugin plugins/asyncio archlinux asyncio
-    python2 uwsgiconfig.py --plugin plugins/python archlinux python2
-    python2 uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet2
-    python2 uwsgiconfig.py --plugin plugins/gevent archlinux gevent2
-    python2 uwsgiconfig.py --plugin plugins/pypy archlinux pypy
-
-    pushd $srcdir/$pkgbase-$pkgver/apache2
-    /usr/bin/apxs -c mod_proxy_uwsgi.c
-}
-
-package_uwsgi() {
-    pkgdesc="A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"
-    depends=(python2 libxml2 jansson libyaml systemd)
-    install=uwsgi.install
-    cd $srcdir/$pkgbase-$pkgver
-    install -Dm755 uwsgi $pkgdir/usr/bin/uwsgi
-    install -Dm644 $srcdir/uwsgi_at.service $pkgdir/usr/lib/systemd/system/uwsgi at .service
-    install -Dm644 $srcdir/uwsgi_at.socket $pkgdir/usr/lib/systemd/system/uwsgi at .socket
-    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 -Dm644 $srcdir/tmpfilesd $pkgdir/usr/lib/tmpfiles.d/uwsgi.conf
-}
-
-package_uwsgi-plugin-cgi() {
-    depends=(uwsgi)
-    pkgdesc="CGI plugin"
-    install -Dm755 $pkgbase-$pkgver/cgi_plugin.so $pkgdir/usr/lib/uwsgi/cgi_plugin.so
-}
-
-package_uwsgi-plugin-rack() {
-    depends=(uwsgi ruby)
-    pkgdesc="Ruby rack plugin"
-    install -Dm755 $pkgbase-$pkgver/rack_plugin.so $pkgdir/usr/lib/uwsgi/rack_plugin.so
-    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=(uwsgi perl)
-    pkgdesc="Perl psgi plugin"
-    install -Dm755 $pkgbase-$pkgver/psgi_plugin.so $pkgdir/usr/lib/uwsgi/psgi_plugin.so
-# template start; name=perl-binary-module-dependency; version=1;
-if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
-	_perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
-	_perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
-	depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
-fi
-# template end;
-}
-
-package_uwsgi-plugin-python2() {
-    depends=(uwsgi python2-gevent python2-greenlet)
-    pkgdesc="Plugin for Python2 support"
-    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=(uwsgi python python-greenlet)
-    pkgdesc="Plugin for Python support"
-    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 -Dm755 $pkgbase-$pkgver/asyncio_plugin.so $pkgdir/usr/lib/uwsgi/asyncio_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=(uwsgi pypy)
-    pkgdesc="Plugin for PyPy support"
-    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-lua51() {
-    depends=(uwsgi lua51)
-    pkgdesc="Plugin for Lua support"
-    install -Dm755 $pkgbase-$pkgver/lua_plugin.so $pkgdir/usr/lib/uwsgi/lua_plugin.so
-}
-
-package_uwsgi-plugin-php() {
-    depends=(uwsgi php-embed libyaml jansson)
-    pkgdesc="Plugin for PHP support"
-    install -Dm755 $pkgbase-$pkgver/php_plugin.so $pkgdir/usr/lib/uwsgi/php_plugin.so
-}
-
-package_uwsgi-plugin-jvm() {
-    depends=(uwsgi java-environment=7 classpath)
-    pkgdesc="Plugin for Jvm support"
-    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-mono() {
-    depends=(uwsgi 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-webdav() {
-    depends=(uwsgi)
-    pkgdesc="Plugin for webdav support"
-    install -Dm755 $pkgbase-$pkgver/webdav_plugin.so $pkgdir/usr/lib/uwsgi/webdav_plugin.so
-}
-
-package_mod_proxy_uwsgi(){
-    depends=(uwsgi apache)
-    pkgdesc="Apache uWSGI proxy module"
-    install -Dm755 \
-        $pkgbase-$pkgver/apache2/.libs/mod_proxy_uwsgi.so \
-        $pkgdir/usr/lib/httpd/modules/mod_proxy_uwsgi.so
-}

Copied: uwsgi/repos/community-i686/PKGBUILD (from rev 137389, uwsgi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-07-24 19:03:01 UTC (rev 137390)
@@ -0,0 +1,196 @@
+# $Id$
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Valentin Hăloiu <vially.ichb+aur at gmail.com>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Kevin Zuber <uKev at knet.eu>
+# Contributor: Vsevolod Balashov <vsevolod at balashov.name>
+# Contributor: David Runge <dave at sleepmap.de>
+
+pkgbase=uwsgi
+pkgname=(uwsgi
+         uwsgi-plugin-rack
+         uwsgi-plugin-psgi
+         uwsgi-plugin-cgi
+         uwsgi-plugin-python2
+         uwsgi-plugin-python
+         uwsgi-plugin-pypy
+         uwsgi-plugin-php
+         uwsgi-plugin-lua51
+         uwsgi-plugin-jvm
+         uwsgi-plugin-mono
+         uwsgi-plugin-webdav
+         mod_proxy_uwsgi)
+pkgver=2.0.11.1
+pkgrel=1
+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 python-greenlet php-embed curl libxml2 libyaml
+             perl lua51 pcre libedit openssl bzip2 gmp pam java-environment=7
+             jansson classpath pypy mono python2-gevent apache)
+source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
+        archlinux.ini
+        tmpfilesd
+        uwsgi_at.service
+        uwsgi_at.socket
+        uwsgi_fix_rpath.patch
+        uwsgi_ruby20_compatibility.patch
+        uwsgi_trick_chroot.patch
+        emperor.ini
+        emperor.uwsgi.service
+        emperor.uwsgi.socket)
+
+md5sums=('087ba7b53bd4afc0f0218f5eb3398809'
+         '9aced0faffc5fc04afccf946e8a2a886'
+         '752475ee32286acfbafa49b898616817'
+         'feaf107977aec047101acdbf06810f30'
+         'ea381549fe65a5d72fa1abb5ceb7d3ef'
+         '1a4516d5cdcf5b95b036f4eae2d0c152'
+         '4d09535ce379c8acd76160f35d5d6b55'
+         '0c09a52fdb88f08c36a8b380f451ce6d'
+         '5fa14ddea9a3dae17b5be28468d47b80'
+         '25dfcc365241f16d7ea16f7143698b53'
+         '3ab4486e02f5c217566fb6c8d469c246')
+
+prepare() {
+    cd $srcdir/$pkgbase-$pkgver
+    cp $srcdir/archlinux.ini buildconf/archlinux.ini
+    #sed -i 's/LIBS .*-lphp5.*/LIBS = []/' plugins/php/uwsgiplugin.py
+    for patch in uwsgi_fix_rpath.patch uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch; do
+        patch -Np1 -i $srcdir/$patch
+    done
+    rm -rf plugins/ruby
+    mv plugins/ruby{19,}
+    sed -i 's:\(ruby\)19:\1:' plugins/ruby/uwsgiplugin.py
+}
+
+build() {
+    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
+    python uwsgiconfig.py --plugin plugins/asyncio archlinux asyncio
+    python2 uwsgiconfig.py --plugin plugins/python archlinux python2
+    python2 uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet2
+    python2 uwsgiconfig.py --plugin plugins/gevent archlinux gevent2
+    python2 uwsgiconfig.py --plugin plugins/pypy archlinux pypy
+
+    pushd $srcdir/$pkgbase-$pkgver/apache2
+    /usr/bin/apxs -c mod_proxy_uwsgi.c
+}
+
+package_uwsgi() {
+    pkgdesc="A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"
+    depends=(python2 libxml2 jansson libyaml systemd)
+    install=uwsgi.install
+    cd $srcdir/$pkgbase-$pkgver
+    install -Dm755 uwsgi $pkgdir/usr/bin/uwsgi
+    install -Dm644 $srcdir/uwsgi_at.service $pkgdir/usr/lib/systemd/system/uwsgi at .service
+    install -Dm644 $srcdir/uwsgi_at.socket $pkgdir/usr/lib/systemd/system/uwsgi at .socket
+    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 -Dm644 $srcdir/tmpfilesd $pkgdir/usr/lib/tmpfiles.d/uwsgi.conf
+}
+
+package_uwsgi-plugin-cgi() {
+    depends=(uwsgi)
+    pkgdesc="CGI plugin"
+    install -Dm755 $pkgbase-$pkgver/cgi_plugin.so $pkgdir/usr/lib/uwsgi/cgi_plugin.so
+}
+
+package_uwsgi-plugin-rack() {
+    depends=(uwsgi ruby)
+    pkgdesc="Ruby rack plugin"
+    install -Dm755 $pkgbase-$pkgver/rack_plugin.so $pkgdir/usr/lib/uwsgi/rack_plugin.so
+    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=(uwsgi perl)
+    pkgdesc="Perl psgi plugin"
+    install -Dm755 $pkgbase-$pkgver/psgi_plugin.so $pkgdir/usr/lib/uwsgi/psgi_plugin.so
+# template start; name=perl-binary-module-dependency; version=1;
+if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
+	_perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
+	_perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
+	depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
+fi
+# template end;
+}
+
+package_uwsgi-plugin-python2() {
+    depends=(uwsgi python2-gevent python2-greenlet)
+    pkgdesc="Plugin for Python2 support"
+    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=(uwsgi python python-greenlet)
+    pkgdesc="Plugin for Python support"
+    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 -Dm755 $pkgbase-$pkgver/asyncio_plugin.so $pkgdir/usr/lib/uwsgi/asyncio_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=(uwsgi pypy)
+    pkgdesc="Plugin for PyPy support"
+    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-lua51() {
+    depends=(uwsgi lua51)
+    pkgdesc="Plugin for Lua support"
+    install -Dm755 $pkgbase-$pkgver/lua_plugin.so $pkgdir/usr/lib/uwsgi/lua_plugin.so
+}
+
+package_uwsgi-plugin-php() {
+    depends=(uwsgi php-embed libyaml jansson)
+    pkgdesc="Plugin for PHP support"
+    install -Dm755 $pkgbase-$pkgver/php_plugin.so $pkgdir/usr/lib/uwsgi/php_plugin.so
+}
+
+package_uwsgi-plugin-jvm() {
+    depends=(uwsgi java-environment=7 classpath)
+    pkgdesc="Plugin for Jvm support"
+    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-mono() {
+    depends=(uwsgi 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-webdav() {
+    depends=(uwsgi)
+    pkgdesc="Plugin for webdav support"
+    install -Dm755 $pkgbase-$pkgver/webdav_plugin.so $pkgdir/usr/lib/uwsgi/webdav_plugin.so
+}
+
+package_mod_proxy_uwsgi(){
+    depends=(uwsgi apache)
+    pkgdesc="Apache uWSGI proxy module"
+    install -Dm755 \
+        $pkgbase-$pkgver/apache2/.libs/mod_proxy_uwsgi.so \
+        $pkgdir/usr/lib/httpd/modules/mod_proxy_uwsgi.so
+}

Deleted: archlinux.ini
===================================================================
--- archlinux.ini	2015-07-24 19:02:48 UTC (rev 137389)
+++ archlinux.ini	2015-07-24 19:03:01 UTC (rev 137390)
@@ -1,5 +0,0 @@
-[uwsgi]
-plugin_dir = /usr/lib/uwsgi
-plugins = rack, rbthreads, fiber, psgi, lua, php, jvm, mono, cgi, webdav
-main_plugin = systemd_logger,pam
-inherit = base

Copied: uwsgi/repos/community-i686/archlinux.ini (from rev 137389, uwsgi/trunk/archlinux.ini)
===================================================================
--- archlinux.ini	                        (rev 0)
+++ archlinux.ini	2015-07-24 19:03:01 UTC (rev 137390)
@@ -0,0 +1,5 @@
+[uwsgi]
+plugin_dir = /usr/lib/uwsgi
+plugins = rack, rbthreads, fiber, psgi, lua, php, jvm, mono, cgi, webdav
+main_plugin = systemd_logger,pam
+inherit = base

Deleted: emperor.ini
===================================================================
--- emperor.ini	2015-07-24 19:02:48 UTC (rev 137389)
+++ emperor.ini	2015-07-24 19:03:01 UTC (rev 137390)
@@ -1,4 +0,0 @@
-[uwsgi]
-emperor = /etc/uwsgi/vassals
-uid = http
-gid = http

Copied: uwsgi/repos/community-i686/emperor.ini (from rev 137389, uwsgi/trunk/emperor.ini)
===================================================================
--- emperor.ini	                        (rev 0)
+++ emperor.ini	2015-07-24 19:03:01 UTC (rev 137390)
@@ -0,0 +1,4 @@
+[uwsgi]
+emperor = /etc/uwsgi/vassals
+uid = http
+gid = http

Deleted: emperor.uwsgi.service
===================================================================
--- emperor.uwsgi.service	2015-07-24 19:02:48 UTC (rev 137389)
+++ emperor.uwsgi.service	2015-07-24 19:03:01 UTC (rev 137390)
@@ -1,16 +0,0 @@
-[Unit]
-Description=uWSGI Emperor
-After=syslog.target
-
-[Service]
-ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/emperor.ini
-ExecReload=/bin/kill -HUP $MAINPID
-ExecStop=/bin/kill -INT $MAINPID
-Restart=always
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-KillSignal=SIGQUIT
-
-[Install]
-WantedBy=multi-user.target

Copied: uwsgi/repos/community-i686/emperor.uwsgi.service (from rev 137389, uwsgi/trunk/emperor.uwsgi.service)
===================================================================
--- emperor.uwsgi.service	                        (rev 0)
+++ emperor.uwsgi.service	2015-07-24 19:03:01 UTC (rev 137390)
@@ -0,0 +1,16 @@
+[Unit]
+Description=uWSGI Emperor
+After=syslog.target
+
+[Service]
+ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/emperor.ini
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStop=/bin/kill -INT $MAINPID
+Restart=always
+Type=notify
+StandardError=syslog
+NotifyAccess=all
+KillSignal=SIGQUIT
+
+[Install]
+WantedBy=multi-user.target

Deleted: emperor.uwsgi.socket
===================================================================
--- emperor.uwsgi.socket	2015-07-24 19:02:48 UTC (rev 137389)
+++ emperor.uwsgi.socket	2015-07-24 19:03:01 UTC (rev 137390)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Socket for uWSGI Emperor
-
-[Socket]
-# Change this to your uwsgi application port or unix socket location
-ListenStream=/run/uwsgi/emperor.sock
-
-[Install]
-WantedBy=sockets.target

Copied: uwsgi/repos/community-i686/emperor.uwsgi.socket (from rev 137389, uwsgi/trunk/emperor.uwsgi.socket)
===================================================================
--- emperor.uwsgi.socket	                        (rev 0)
+++ emperor.uwsgi.socket	2015-07-24 19:03:01 UTC (rev 137390)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Socket for uWSGI Emperor
+
+[Socket]
+# Change this to your uwsgi application port or unix socket location
+ListenStream=/run/uwsgi/emperor.sock
+
+[Install]
+WantedBy=sockets.target

Deleted: tmpfilesd
===================================================================
--- tmpfilesd	2015-07-24 19:02:48 UTC (rev 137389)
+++ tmpfilesd	2015-07-24 19:03:01 UTC (rev 137390)
@@ -1 +0,0 @@
-d /run/uwsgi 0775 root http - - 

Copied: uwsgi/repos/community-i686/tmpfilesd (from rev 137389, uwsgi/trunk/tmpfilesd)
===================================================================
--- tmpfilesd	                        (rev 0)
+++ tmpfilesd	2015-07-24 19:03:01 UTC (rev 137390)
@@ -0,0 +1 @@
+d /run/uwsgi 0775 root http - - 

Deleted: uwsgi.install
===================================================================
--- uwsgi.install	2015-07-24 19:02:48 UTC (rev 137389)
+++ uwsgi.install	2015-07-24 19:03:01 UTC (rev 137390)
@@ -1,12 +0,0 @@
-post_install(){
-    systemd-tmpfiles --create /usr/lib/tmpfiles.d/uwsgi.conf
-}
-post_update(){
-    echo "To use uwsgi at .socket and uwsgi at .service:"
-    echo "\tAll you need to do is put the name of your .ini file after the @ sign"
-    echo "\tYou can use either the .socket or .service, but if you use the .socket"
-    echo "\tuwsgi@<sameinifile>.service won't be started until the first time your http"
-    echo "\tserver touches the socket. You will also not need to specify the socket in"
-    echo "\tthe .ini file or in the .service file.  Systemd will handle listening to"
-    echo "\tthe socket for you."
-}

Copied: uwsgi/repos/community-i686/uwsgi.install (from rev 137389, uwsgi/trunk/uwsgi.install)
===================================================================
--- uwsgi.install	                        (rev 0)
+++ uwsgi.install	2015-07-24 19:03:01 UTC (rev 137390)
@@ -0,0 +1,12 @@
+post_install(){
+    systemd-tmpfiles --create /usr/lib/tmpfiles.d/uwsgi.conf
+}
+post_update(){
+    echo "To use uwsgi at .socket and uwsgi at .service:"
+    echo "\tAll you need to do is put the name of your .ini file after the @ sign"
+    echo "\tYou can use either the .socket or .service, but if you use the .socket"
+    echo "\tuwsgi@<sameinifile>.service won't be started until the first time your http"
+    echo "\tserver touches the socket. You will also not need to specify the socket in"
+    echo "\tthe .ini file or in the .service file.  Systemd will handle listening to"
+    echo "\tthe socket for you."
+}

Deleted: uwsgi_at.service
===================================================================
--- uwsgi_at.service	2015-07-24 19:02:48 UTC (rev 137389)
+++ uwsgi_at.service	2015-07-24 19:03:01 UTC (rev 137390)
@@ -1,16 +0,0 @@
-[Unit]
-Description=uWSGI service unit
-After=syslog.target
-
-[Service]
-ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/%I.ini
-ExecReload=/bin/kill -HUP $MAINPID
-ExecStop=/bin/kill -INT $MAINPID
-Restart=always
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-KillSignal=SIGQUIT
-
-[Install]
-WantedBy=multi-user.target

Copied: uwsgi/repos/community-i686/uwsgi_at.service (from rev 137389, uwsgi/trunk/uwsgi_at.service)
===================================================================
--- uwsgi_at.service	                        (rev 0)
+++ uwsgi_at.service	2015-07-24 19:03:01 UTC (rev 137390)
@@ -0,0 +1,16 @@
+[Unit]
+Description=uWSGI service unit
+After=syslog.target
+
+[Service]
+ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/%I.ini
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStop=/bin/kill -INT $MAINPID
+Restart=always
+Type=notify
+StandardError=syslog
+NotifyAccess=all
+KillSignal=SIGQUIT
+
+[Install]
+WantedBy=multi-user.target

Deleted: uwsgi_at.socket
===================================================================
--- uwsgi_at.socket	2015-07-24 19:02:48 UTC (rev 137389)
+++ uwsgi_at.socket	2015-07-24 19:03:01 UTC (rev 137390)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Socket for uWSGI %I
-
-[Socket]
-# Change this to your uwsgi application port or unix socket location
-ListenStream=/run/uwsgi/%I.sock
-
-[Install]
-WantedBy=sockets.target

Copied: uwsgi/repos/community-i686/uwsgi_at.socket (from rev 137389, uwsgi/trunk/uwsgi_at.socket)
===================================================================
--- uwsgi_at.socket	                        (rev 0)
+++ uwsgi_at.socket	2015-07-24 19:03:01 UTC (rev 137390)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Socket for uWSGI %I
+
+[Socket]
+# Change this to your uwsgi application port or unix socket location
+ListenStream=/run/uwsgi/%I.sock
+
+[Install]
+WantedBy=sockets.target

Deleted: uwsgi_fix_rpath.patch
===================================================================
--- uwsgi_fix_rpath.patch	2015-07-24 19:02:48 UTC (rev 137389)
+++ uwsgi_fix_rpath.patch	2015-07-24 19:03:01 UTC (rev 137390)
@@ -1,66 +0,0 @@
-diff --git a/plugins/jvm/uwsgiplugin.py b/plugins/jvm/uwsgiplugin.py
-index ac7eb3e..0911288 100644
---- a/plugins/jvm/uwsgiplugin.py
-+++ b/plugins/jvm/uwsgiplugin.py
-@@ -59,11 +59,6 @@ if "-framework JavaVM" in JVM_LIBPATH:
- 
- GCC_LIST = ['jvm_plugin']
- 
--if 'LD_RUN_PATH' in os.environ:
--    os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH[0][2:]
--else:
--    os.environ['LD_RUN_PATH'] = JVM_LIBPATH[0][2:]
--
- def post_build(config):
-     if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0:
-         os._exit(1)
-diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py
-index fb9e5bb..fd12c91 100644
---- a/plugins/php/uwsgiplugin.py
-+++ b/plugins/php/uwsgiplugin.py
-@@ -22,7 +22,6 @@ CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-error=sign-co
- LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
- if ld_run_path:
-     LDFLAGS.append('-L%s' % ld_run_path)
--    os.environ['LD_RUN_PATH'] = ld_run_path
- 
- LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5']
- 
-diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py
-index c4f03e1..8d4b2e0 100644
---- a/plugins/python/uwsgiplugin.py
-+++ b/plugins/python/uwsgiplugin.py
-@@ -45,10 +45,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.environ:
-     else:
-         try:
-             LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR'))
--            os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR'))
-         except:
-             LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX)
--            os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX
- 
-         LIBS.append('-lpython%s' % get_python_version())
- else:
-diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py
-index 8dee214..2375bc9 100644
---- a/plugins/rack/uwsgiplugin.py
-+++ b/plugins/rack/uwsgiplugin.py
-@@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBS']\""
- 
- if has_shared == 'yes':
-     LDFLAGS.append('-L' + libpath )
--    os.environ['LD_RUN_PATH'] = libpath
-     LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip())
- else:
-     GCC_LIST.append("%s/%s" % (libpath, os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBRUBY_A']\"" % rbconfig).read().rstrip()))
-diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py
-index ecea48d..4f35984 100644
---- a/plugins/ruby19/uwsgiplugin.py
-+++ b/plugins/ruby19/uwsgiplugin.py
-@@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LDFLAG
- 
- libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip()
- LDFLAGS.append('-L' + libpath )
--os.environ['LD_RUN_PATH'] = libpath
- LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split()
- 

Copied: uwsgi/repos/community-i686/uwsgi_fix_rpath.patch (from rev 137389, uwsgi/trunk/uwsgi_fix_rpath.patch)
===================================================================
--- uwsgi_fix_rpath.patch	                        (rev 0)
+++ uwsgi_fix_rpath.patch	2015-07-24 19:03:01 UTC (rev 137390)
@@ -0,0 +1,66 @@
+diff --git a/plugins/jvm/uwsgiplugin.py b/plugins/jvm/uwsgiplugin.py
+index ac7eb3e..0911288 100644
+--- a/plugins/jvm/uwsgiplugin.py
++++ b/plugins/jvm/uwsgiplugin.py
+@@ -59,11 +59,6 @@ if "-framework JavaVM" in JVM_LIBPATH:
+ 
+ GCC_LIST = ['jvm_plugin']
+ 
+-if 'LD_RUN_PATH' in os.environ:
+-    os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH[0][2:]
+-else:
+-    os.environ['LD_RUN_PATH'] = JVM_LIBPATH[0][2:]
+-
+ def post_build(config):
+     if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0:
+         os._exit(1)
+diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py
+index fb9e5bb..fd12c91 100644
+--- a/plugins/php/uwsgiplugin.py
++++ b/plugins/php/uwsgiplugin.py
+@@ -22,7 +22,6 @@ CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-error=sign-co
+ LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split()
+ if ld_run_path:
+     LDFLAGS.append('-L%s' % ld_run_path)
+-    os.environ['LD_RUN_PATH'] = ld_run_path
+ 
+ LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp5']
+ 
+diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py
+index c4f03e1..8d4b2e0 100644
+--- a/plugins/python/uwsgiplugin.py
++++ b/plugins/python/uwsgiplugin.py
+@@ -45,10 +45,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.environ:
+     else:
+         try:
+             LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR'))
+-            os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR'))
+         except:
+             LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX)
+-            os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX
+ 
+         LIBS.append('-lpython%s' % get_python_version())
+ else:
+diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py
+index 8dee214..2375bc9 100644
+--- a/plugins/rack/uwsgiplugin.py
++++ b/plugins/rack/uwsgiplugin.py
+@@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBS']\""
+ 
+ if has_shared == 'yes':
+     LDFLAGS.append('-L' + libpath )
+-    os.environ['LD_RUN_PATH'] = libpath
+     LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip())
+ else:
+     GCC_LIST.append("%s/%s" % (libpath, os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LIBRUBY_A']\"" % rbconfig).read().rstrip()))
+diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py
+index ecea48d..4f35984 100644
+--- a/plugins/ruby19/uwsgiplugin.py
++++ b/plugins/ruby19/uwsgiplugin.py
+@@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['LDFLAG
+ 
+ libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip()
+ LDFLAGS.append('-L' + libpath )
+-os.environ['LD_RUN_PATH'] = libpath
+ LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split()
+ 

Deleted: uwsgi_ruby20_compatibility.patch
===================================================================
--- uwsgi_ruby20_compatibility.patch	2015-07-24 19:02:48 UTC (rev 137389)
+++ uwsgi_ruby20_compatibility.patch	2015-07-24 19:03:01 UTC (rev 137390)
@@ -1,42 +0,0 @@
-diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py
-index 2375bc9..b908417 100644
---- a/plugins/rack/uwsgiplugin.py
-+++ b/plugins/rack/uwsgiplugin.py
-@@ -10,13 +10,14 @@ except:
- rbconfig = 'Config'
- 
- version = os.popen(RUBYPATH + " -e \"print RUBY_VERSION\"").read().rstrip()
--v = version.split('.')
- 
- GCC_LIST = ['rack_plugin', 'rack_api']
- 
--if (v[0] == '1' and v[1] == '9') or v[0] >= '2':
-+if version >= '1.9':
-     CFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['CFLAGS']\"").read().rstrip().split()
-     CFLAGS.append('-DRUBY19')
-+    if version >= '2.0':
-+        CFLAGS.append('-DRUBY20')
-     CFLAGS.append('-Wno-unused-parameter')
-     rbconfig = 'RbConfig'	 
- else:
-diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py
-index 4f35984..156018f 100644
---- a/plugins/ruby19/uwsgiplugin.py
-+++ b/plugins/ruby19/uwsgiplugin.py
-@@ -10,13 +10,14 @@ except:
- rbconfig = 'Config'
- 
- version = os.popen(RUBYPATH + " -e \"print RUBY_VERSION\"").read().rstrip()
--v = version.split('.')
- 
- GCC_LIST = ['../rack/rack_plugin', '../rack/rack_api']
- 
--if v[0] == '1' and v[1] == '9':
-+if version >= '1.9':
-     CFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['CFLAGS']\"").read().rstrip().split()
-     CFLAGS.append('-DRUBY19')
-+    if version >= '2.0':
-+        CFLAGS.append('-DRUBY20')
-     CFLAGS.append('-Wno-unused-parameter')
-     rbconfig = 'RbConfig'	 
- else:

Copied: uwsgi/repos/community-i686/uwsgi_ruby20_compatibility.patch (from rev 137389, uwsgi/trunk/uwsgi_ruby20_compatibility.patch)
===================================================================
--- uwsgi_ruby20_compatibility.patch	                        (rev 0)
+++ uwsgi_ruby20_compatibility.patch	2015-07-24 19:03:01 UTC (rev 137390)
@@ -0,0 +1,42 @@
+diff --git a/plugins/rack/uwsgiplugin.py b/plugins/rack/uwsgiplugin.py
+index 2375bc9..b908417 100644
+--- a/plugins/rack/uwsgiplugin.py
++++ b/plugins/rack/uwsgiplugin.py
+@@ -10,13 +10,14 @@ except:
+ rbconfig = 'Config'
+ 
+ version = os.popen(RUBYPATH + " -e \"print RUBY_VERSION\"").read().rstrip()
+-v = version.split('.')
+ 
+ GCC_LIST = ['rack_plugin', 'rack_api']
+ 
+-if (v[0] == '1' and v[1] == '9') or v[0] >= '2':
++if version >= '1.9':
+     CFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['CFLAGS']\"").read().rstrip().split()
+     CFLAGS.append('-DRUBY19')
++    if version >= '2.0':
++        CFLAGS.append('-DRUBY20')
+     CFLAGS.append('-Wno-unused-parameter')
+     rbconfig = 'RbConfig'	 
+ else:
+diff --git a/plugins/ruby19/uwsgiplugin.py b/plugins/ruby19/uwsgiplugin.py
+index 4f35984..156018f 100644
+--- a/plugins/ruby19/uwsgiplugin.py
++++ b/plugins/ruby19/uwsgiplugin.py
+@@ -10,13 +10,14 @@ except:
+ rbconfig = 'Config'
+ 
+ version = os.popen(RUBYPATH + " -e \"print RUBY_VERSION\"").read().rstrip()
+-v = version.split('.')
+ 
+ GCC_LIST = ['../rack/rack_plugin', '../rack/rack_api']
+ 
+-if v[0] == '1' and v[1] == '9':
++if version >= '1.9':
+     CFLAGS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['CFLAGS']\"").read().rstrip().split()
+     CFLAGS.append('-DRUBY19')
++    if version >= '2.0':
++        CFLAGS.append('-DRUBY20')
+     CFLAGS.append('-Wno-unused-parameter')
+     rbconfig = 'RbConfig'	 
+ else:

Deleted: uwsgi_trick_chroot.patch
===================================================================
--- uwsgi_trick_chroot.patch	2015-07-24 19:02:48 UTC (rev 137389)
+++ uwsgi_trick_chroot.patch	2015-07-24 19:03:01 UTC (rev 137390)
@@ -1,16 +0,0 @@
-diff --git a/uwsgiconfig.py b/uwsgiconfig.py
-index e447123..4d55f2c 100644
---- a/uwsgiconfig.py
-+++ b/uwsgiconfig.py
-@@ -1129,10 +1129,7 @@ def build_plugin(path, uc, cflags, ldflags, libs, name = None):
-     except:
-         pass
- 
--    if uc:
--        plugin_dest = uc.get('plugin_dir') + '/' + name + '_plugin'
--    else:
--        plugin_dest = name + '_plugin'
-+    plugin_dest = name + '_plugin'
- 
-     shared_flag = '-shared'
- 

Copied: uwsgi/repos/community-i686/uwsgi_trick_chroot.patch (from rev 137389, uwsgi/trunk/uwsgi_trick_chroot.patch)
===================================================================
--- uwsgi_trick_chroot.patch	                        (rev 0)
+++ uwsgi_trick_chroot.patch	2015-07-24 19:03:01 UTC (rev 137390)
@@ -0,0 +1,16 @@
+diff --git a/uwsgiconfig.py b/uwsgiconfig.py
+index e447123..4d55f2c 100644
+--- a/uwsgiconfig.py
++++ b/uwsgiconfig.py
+@@ -1129,10 +1129,7 @@ def build_plugin(path, uc, cflags, ldflags, libs, name = None):
+     except:
+         pass
+ 
+-    if uc:
+-        plugin_dest = uc.get('plugin_dir') + '/' + name + '_plugin'
+-    else:
+-        plugin_dest = name + '_plugin'
++    plugin_dest = name + '_plugin'
+ 
+     shared_flag = '-shared'
+ 



More information about the arch-commits mailing list