Date: Sunday, December 28, 2014 @ 20:11:16
Author: svenstaro
Revision: 124759
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
uwsgi/repos/community-staging-i686/
uwsgi/repos/community-staging-i686/PKGBUILD
(from rev 124758, uwsgi/trunk/PKGBUILD)
uwsgi/repos/community-staging-i686/archlinux.ini
(from rev 124758, uwsgi/trunk/archlinux.ini)
uwsgi/repos/community-staging-i686/emperor.ini
(from rev 124758, uwsgi/trunk/emperor.ini)
uwsgi/repos/community-staging-i686/emperor.uwsgi.service
(from rev 124758, uwsgi/trunk/emperor.uwsgi.service)
uwsgi/repos/community-staging-i686/emperor.uwsgi.socket
(from rev 124758, uwsgi/trunk/emperor.uwsgi.socket)
uwsgi/repos/community-staging-i686/tmpfilesd
(from rev 124758, uwsgi/trunk/tmpfilesd)
uwsgi/repos/community-staging-i686/uwsgi.install
(from rev 124758, uwsgi/trunk/uwsgi.install)
uwsgi/repos/community-staging-i686/uwsgi_at.service
(from rev 124758, uwsgi/trunk/uwsgi_at.service)
uwsgi/repos/community-staging-i686/uwsgi_at.socket
(from rev 124758, uwsgi/trunk/uwsgi_at.socket)
uwsgi/repos/community-staging-i686/uwsgi_fix_rpath.patch
(from rev 124758, uwsgi/trunk/uwsgi_fix_rpath.patch)
uwsgi/repos/community-staging-i686/uwsgi_ruby20_compatibility.patch
(from rev 124758, uwsgi/trunk/uwsgi_ruby20_compatibility.patch)
uwsgi/repos/community-staging-i686/uwsgi_trick_chroot.patch
(from rev 124758, uwsgi/trunk/uwsgi_trick_chroot.patch)
uwsgi/repos/community-staging-x86_64/
uwsgi/repos/community-staging-x86_64/PKGBUILD
(from rev 124758, uwsgi/trunk/PKGBUILD)
uwsgi/repos/community-staging-x86_64/archlinux.ini
(from rev 124758, uwsgi/trunk/archlinux.ini)
uwsgi/repos/community-staging-x86_64/emperor.ini
(from rev 124758, uwsgi/trunk/emperor.ini)
uwsgi/repos/community-staging-x86_64/emperor.uwsgi.service
(from rev 124758, uwsgi/trunk/emperor.uwsgi.service)
uwsgi/repos/community-staging-x86_64/emperor.uwsgi.socket
(from rev 124758, uwsgi/trunk/emperor.uwsgi.socket)
uwsgi/repos/community-staging-x86_64/tmpfilesd
(from rev 124758, uwsgi/trunk/tmpfilesd)
uwsgi/repos/community-staging-x86_64/uwsgi.install
(from rev 124758, uwsgi/trunk/uwsgi.install)
uwsgi/repos/community-staging-x86_64/uwsgi_at.service
(from rev 124758, uwsgi/trunk/uwsgi_at.service)
uwsgi/repos/community-staging-x86_64/uwsgi_at.socket
(from rev 124758, uwsgi/trunk/uwsgi_at.socket)
uwsgi/repos/community-staging-x86_64/uwsgi_fix_rpath.patch
(from rev 124758, uwsgi/trunk/uwsgi_fix_rpath.patch)
uwsgi/repos/community-staging-x86_64/uwsgi_ruby20_compatibility.patch
(from rev 124758, uwsgi/trunk/uwsgi_ruby20_compatibility.patch)
uwsgi/repos/community-staging-x86_64/uwsgi_trick_chroot.patch
(from rev 124758, uwsgi/trunk/uwsgi_trick_chroot.patch)
-----------------------------------------------------------+
community-staging-i686/PKGBUILD | 168 ++++++++++++
community-staging-i686/archlinux.ini | 5
community-staging-i686/emperor.ini | 4
community-staging-i686/emperor.uwsgi.service | 16 +
community-staging-i686/emperor.uwsgi.socket | 9
community-staging-i686/tmpfilesd | 1
community-staging-i686/uwsgi.install | 12
community-staging-i686/uwsgi_at.service | 16 +
community-staging-i686/uwsgi_at.socket | 9
community-staging-i686/uwsgi_fix_rpath.patch | 66 ++++
community-staging-i686/uwsgi_ruby20_compatibility.patch | 42 +++
community-staging-i686/uwsgi_trick_chroot.patch | 16 +
community-staging-x86_64/PKGBUILD | 168 ++++++++++++
community-staging-x86_64/archlinux.ini | 5
community-staging-x86_64/emperor.ini | 4
community-staging-x86_64/emperor.uwsgi.service | 16 +
community-staging-x86_64/emperor.uwsgi.socket | 9
community-staging-x86_64/tmpfilesd | 1
community-staging-x86_64/uwsgi.install | 12
community-staging-x86_64/uwsgi_at.service | 16 +
community-staging-x86_64/uwsgi_at.socket | 9
community-staging-x86_64/uwsgi_fix_rpath.patch | 66 ++++
community-staging-x86_64/uwsgi_ruby20_compatibility.patch | 42 +++
community-staging-x86_64/uwsgi_trick_chroot.patch | 16 +
24 files changed, 728 insertions(+)
Copied: uwsgi/repos/community-staging-i686/PKGBUILD (from rev 124758,
uwsgi/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2014-12-28 19:11:16 UTC (rev 124759)
@@ -0,0 +1,168 @@
+# $Id$
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
+# Contributor: Valentin Hăloiu <vially.ichb+...@gmail.com>
+# Contributor: Angel Velasquez <an...@archlinux.org>
+# Contributor: Kevin Zuber <u...@knet.eu>
+# Contributor: Vsevolod Balashov <vsevo...@balashov.name>
+# Contributor: David Runge <d...@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)
+pkgver=2.0.8
+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 python-greenlet
php-embed curl libxml2 libyaml
+ perl lua51 pcre libedit openssl bzip2 gmp pam java-environment=7
+ jansson classpath pypy mono python2-gevent)
+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=('356b71060aa4c1f0e888dbca03567bd5'
+ '30d101f1190ef83b4cc79a2cc079be7e'
+ '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
+ 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
+}
+
+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@.service
+ install -Dm644 $srcdir/uwsgi_at.socket
$pkgdir/usr/lib/systemd/system/uwsgi@.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
+}
+
+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 -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
+}
Copied: uwsgi/repos/community-staging-i686/archlinux.ini (from rev 124758,
uwsgi/trunk/archlinux.ini)
===================================================================
--- community-staging-i686/archlinux.ini (rev 0)
+++ community-staging-i686/archlinux.ini 2014-12-28 19:11:16 UTC (rev
124759)
@@ -0,0 +1,5 @@
+[uwsgi]
+plugin_dir = /usr/lib/uwsgi
+plugins = rack, rbthreads, fiber, psgi, lua, php, jvm, mono, cgi
+main_plugin = systemd_logger,pam
+inherit = base
Copied: uwsgi/repos/community-staging-i686/emperor.ini (from rev 124758,
uwsgi/trunk/emperor.ini)
===================================================================
--- community-staging-i686/emperor.ini (rev 0)
+++ community-staging-i686/emperor.ini 2014-12-28 19:11:16 UTC (rev 124759)
@@ -0,0 +1,4 @@
+[uwsgi]
+emperor = /etc/uwsgi/vassals
+uid = http
+gid = http
Copied: uwsgi/repos/community-staging-i686/emperor.uwsgi.service (from rev
124758, uwsgi/trunk/emperor.uwsgi.service)
===================================================================
--- community-staging-i686/emperor.uwsgi.service
(rev 0)
+++ community-staging-i686/emperor.uwsgi.service 2014-12-28 19:11:16 UTC
(rev 124759)
@@ -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
Copied: uwsgi/repos/community-staging-i686/emperor.uwsgi.socket (from rev
124758, uwsgi/trunk/emperor.uwsgi.socket)
===================================================================
--- community-staging-i686/emperor.uwsgi.socket (rev 0)
+++ community-staging-i686/emperor.uwsgi.socket 2014-12-28 19:11:16 UTC (rev
124759)
@@ -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
Copied: uwsgi/repos/community-staging-i686/tmpfilesd (from rev 124758,
uwsgi/trunk/tmpfilesd)
===================================================================
--- community-staging-i686/tmpfilesd (rev 0)
+++ community-staging-i686/tmpfilesd 2014-12-28 19:11:16 UTC (rev 124759)
@@ -0,0 +1 @@
+d /run/uwsgi 0775 root http - -
Copied: uwsgi/repos/community-staging-i686/uwsgi.install (from rev 124758,
uwsgi/trunk/uwsgi.install)
===================================================================
--- community-staging-i686/uwsgi.install (rev 0)
+++ community-staging-i686/uwsgi.install 2014-12-28 19:11:16 UTC (rev
124759)
@@ -0,0 +1,12 @@
+post_install(){
+ systemd-tmpfiles --create /usr/lib/tmpfiles.d/uwsgi.conf
+}
+post_update(){
+ echo "To use uwsgi@.socket and uwsgi@.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-staging-i686/uwsgi_at.service (from rev 124758,
uwsgi/trunk/uwsgi_at.service)
===================================================================
--- community-staging-i686/uwsgi_at.service (rev 0)
+++ community-staging-i686/uwsgi_at.service 2014-12-28 19:11:16 UTC (rev
124759)
@@ -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
Copied: uwsgi/repos/community-staging-i686/uwsgi_at.socket (from rev 124758,
uwsgi/trunk/uwsgi_at.socket)
===================================================================
--- community-staging-i686/uwsgi_at.socket (rev 0)
+++ community-staging-i686/uwsgi_at.socket 2014-12-28 19:11:16 UTC (rev
124759)
@@ -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
Copied: uwsgi/repos/community-staging-i686/uwsgi_fix_rpath.patch (from rev
124758, uwsgi/trunk/uwsgi_fix_rpath.patch)
===================================================================
--- community-staging-i686/uwsgi_fix_rpath.patch
(rev 0)
+++ community-staging-i686/uwsgi_fix_rpath.patch 2014-12-28 19:11:16 UTC
(rev 124759)
@@ -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()
+
Copied: uwsgi/repos/community-staging-i686/uwsgi_ruby20_compatibility.patch
(from rev 124758, uwsgi/trunk/uwsgi_ruby20_compatibility.patch)
===================================================================
--- community-staging-i686/uwsgi_ruby20_compatibility.patch
(rev 0)
+++ community-staging-i686/uwsgi_ruby20_compatibility.patch 2014-12-28
19:11:16 UTC (rev 124759)
@@ -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:
Copied: uwsgi/repos/community-staging-i686/uwsgi_trick_chroot.patch (from rev
124758, uwsgi/trunk/uwsgi_trick_chroot.patch)
===================================================================
--- community-staging-i686/uwsgi_trick_chroot.patch
(rev 0)
+++ community-staging-i686/uwsgi_trick_chroot.patch 2014-12-28 19:11:16 UTC
(rev 124759)
@@ -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'
+
Copied: uwsgi/repos/community-staging-x86_64/PKGBUILD (from rev 124758,
uwsgi/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2014-12-28 19:11:16 UTC (rev 124759)
@@ -0,0 +1,168 @@
+# $Id$
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
+# Contributor: Valentin Hăloiu <vially.ichb+...@gmail.com>
+# Contributor: Angel Velasquez <an...@archlinux.org>
+# Contributor: Kevin Zuber <u...@knet.eu>
+# Contributor: Vsevolod Balashov <vsevo...@balashov.name>
+# Contributor: David Runge <d...@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)
+pkgver=2.0.8
+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 python-greenlet
php-embed curl libxml2 libyaml
+ perl lua51 pcre libedit openssl bzip2 gmp pam java-environment=7
+ jansson classpath pypy mono python2-gevent)
+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=('356b71060aa4c1f0e888dbca03567bd5'
+ '30d101f1190ef83b4cc79a2cc079be7e'
+ '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
+ 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
+}
+
+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@.service
+ install -Dm644 $srcdir/uwsgi_at.socket
$pkgdir/usr/lib/systemd/system/uwsgi@.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
+}
+
+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 -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
+}
Copied: uwsgi/repos/community-staging-x86_64/archlinux.ini (from rev 124758,
uwsgi/trunk/archlinux.ini)
===================================================================
--- community-staging-x86_64/archlinux.ini (rev 0)
+++ community-staging-x86_64/archlinux.ini 2014-12-28 19:11:16 UTC (rev
124759)
@@ -0,0 +1,5 @@
+[uwsgi]
+plugin_dir = /usr/lib/uwsgi
+plugins = rack, rbthreads, fiber, psgi, lua, php, jvm, mono, cgi
+main_plugin = systemd_logger,pam
+inherit = base
Copied: uwsgi/repos/community-staging-x86_64/emperor.ini (from rev 124758,
uwsgi/trunk/emperor.ini)
===================================================================
--- community-staging-x86_64/emperor.ini (rev 0)
+++ community-staging-x86_64/emperor.ini 2014-12-28 19:11:16 UTC (rev
124759)
@@ -0,0 +1,4 @@
+[uwsgi]
+emperor = /etc/uwsgi/vassals
+uid = http
+gid = http
Copied: uwsgi/repos/community-staging-x86_64/emperor.uwsgi.service (from rev
124758, uwsgi/trunk/emperor.uwsgi.service)
===================================================================
--- community-staging-x86_64/emperor.uwsgi.service
(rev 0)
+++ community-staging-x86_64/emperor.uwsgi.service 2014-12-28 19:11:16 UTC
(rev 124759)
@@ -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
Copied: uwsgi/repos/community-staging-x86_64/emperor.uwsgi.socket (from rev
124758, uwsgi/trunk/emperor.uwsgi.socket)
===================================================================
--- community-staging-x86_64/emperor.uwsgi.socket
(rev 0)
+++ community-staging-x86_64/emperor.uwsgi.socket 2014-12-28 19:11:16 UTC
(rev 124759)
@@ -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
Copied: uwsgi/repos/community-staging-x86_64/tmpfilesd (from rev 124758,
uwsgi/trunk/tmpfilesd)
===================================================================
--- community-staging-x86_64/tmpfilesd (rev 0)
+++ community-staging-x86_64/tmpfilesd 2014-12-28 19:11:16 UTC (rev 124759)
@@ -0,0 +1 @@
+d /run/uwsgi 0775 root http - -
Copied: uwsgi/repos/community-staging-x86_64/uwsgi.install (from rev 124758,
uwsgi/trunk/uwsgi.install)
===================================================================
--- community-staging-x86_64/uwsgi.install (rev 0)
+++ community-staging-x86_64/uwsgi.install 2014-12-28 19:11:16 UTC (rev
124759)
@@ -0,0 +1,12 @@
+post_install(){
+ systemd-tmpfiles --create /usr/lib/tmpfiles.d/uwsgi.conf
+}
+post_update(){
+ echo "To use uwsgi@.socket and uwsgi@.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-staging-x86_64/uwsgi_at.service (from rev 124758,
uwsgi/trunk/uwsgi_at.service)
===================================================================
--- community-staging-x86_64/uwsgi_at.service (rev 0)
+++ community-staging-x86_64/uwsgi_at.service 2014-12-28 19:11:16 UTC (rev
124759)
@@ -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
Copied: uwsgi/repos/community-staging-x86_64/uwsgi_at.socket (from rev 124758,
uwsgi/trunk/uwsgi_at.socket)
===================================================================
--- community-staging-x86_64/uwsgi_at.socket (rev 0)
+++ community-staging-x86_64/uwsgi_at.socket 2014-12-28 19:11:16 UTC (rev
124759)
@@ -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
Copied: uwsgi/repos/community-staging-x86_64/uwsgi_fix_rpath.patch (from rev
124758, uwsgi/trunk/uwsgi_fix_rpath.patch)
===================================================================
--- community-staging-x86_64/uwsgi_fix_rpath.patch
(rev 0)
+++ community-staging-x86_64/uwsgi_fix_rpath.patch 2014-12-28 19:11:16 UTC
(rev 124759)
@@ -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()
+
Copied: uwsgi/repos/community-staging-x86_64/uwsgi_ruby20_compatibility.patch
(from rev 124758, uwsgi/trunk/uwsgi_ruby20_compatibility.patch)
===================================================================
--- community-staging-x86_64/uwsgi_ruby20_compatibility.patch
(rev 0)
+++ community-staging-x86_64/uwsgi_ruby20_compatibility.patch 2014-12-28
19:11:16 UTC (rev 124759)
@@ -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:
Copied: uwsgi/repos/community-staging-x86_64/uwsgi_trick_chroot.patch (from rev
124758, uwsgi/trunk/uwsgi_trick_chroot.patch)
===================================================================
--- community-staging-x86_64/uwsgi_trick_chroot.patch
(rev 0)
+++ community-staging-x86_64/uwsgi_trick_chroot.patch 2014-12-28 19:11:16 UTC
(rev 124759)
@@ -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'
+
