[arch-commits] Commit in uwsgi/repos (22 files)
Daniel Wallace
dwallace at nymeria.archlinux.org
Wed Jul 31 22:32:58 UTC 2013
Date: Thursday, August 1, 2013 @ 00:32:58
Author: dwallace
Revision: 94867
archrelease: copy trunk to community-i686, community-x86_64
Added:
uwsgi/repos/community-i686/
uwsgi/repos/community-i686/.lock
(from rev 94866, uwsgi/trunk/.lock)
uwsgi/repos/community-i686/PKGBUILD
(from rev 94866, uwsgi/trunk/PKGBUILD)
uwsgi/repos/community-i686/archlinux.ini
(from rev 94866, uwsgi/trunk/archlinux.ini)
uwsgi/repos/community-i686/tmpfilesd
(from rev 94866, uwsgi/trunk/tmpfilesd)
uwsgi/repos/community-i686/uwsgi.install
(from rev 94866, uwsgi/trunk/uwsgi.install)
uwsgi/repos/community-i686/uwsgi at .service
(from rev 94866, uwsgi/trunk/uwsgi at .service)
uwsgi/repos/community-i686/uwsgi at .socket
(from rev 94866, uwsgi/trunk/uwsgi at .socket)
uwsgi/repos/community-i686/uwsgi_fix_rpath.patch
(from rev 94866, uwsgi/trunk/uwsgi_fix_rpath.patch)
uwsgi/repos/community-i686/uwsgi_ruby20_compatibility.patch
(from rev 94866, uwsgi/trunk/uwsgi_ruby20_compatibility.patch)
uwsgi/repos/community-i686/uwsgi_trick_chroot.patch
(from rev 94866, uwsgi/trunk/uwsgi_trick_chroot.patch)
uwsgi/repos/community-x86_64/
uwsgi/repos/community-x86_64/.lock
(from rev 94866, uwsgi/trunk/.lock)
uwsgi/repos/community-x86_64/PKGBUILD
(from rev 94866, uwsgi/trunk/PKGBUILD)
uwsgi/repos/community-x86_64/archlinux.ini
(from rev 94866, uwsgi/trunk/archlinux.ini)
uwsgi/repos/community-x86_64/tmpfilesd
(from rev 94866, uwsgi/trunk/tmpfilesd)
uwsgi/repos/community-x86_64/uwsgi.install
(from rev 94866, uwsgi/trunk/uwsgi.install)
uwsgi/repos/community-x86_64/uwsgi at .service
(from rev 94866, uwsgi/trunk/uwsgi at .service)
uwsgi/repos/community-x86_64/uwsgi at .socket
(from rev 94866, uwsgi/trunk/uwsgi at .socket)
uwsgi/repos/community-x86_64/uwsgi_fix_rpath.patch
(from rev 94866, uwsgi/trunk/uwsgi_fix_rpath.patch)
uwsgi/repos/community-x86_64/uwsgi_ruby20_compatibility.patch
(from rev 94866, uwsgi/trunk/uwsgi_ruby20_compatibility.patch)
uwsgi/repos/community-x86_64/uwsgi_trick_chroot.patch
(from rev 94866, uwsgi/trunk/uwsgi_trick_chroot.patch)
---------------------------------------------------+
community-i686/PKGBUILD | 233 ++++++++++++++++++++
community-i686/archlinux.ini | 17 +
community-i686/tmpfilesd | 1
community-i686/uwsgi.install | 12 +
community-i686/uwsgi at .service | 13 +
community-i686/uwsgi at .socket | 9
community-i686/uwsgi_fix_rpath.patch | 66 +++++
community-i686/uwsgi_ruby20_compatibility.patch | 42 +++
community-i686/uwsgi_trick_chroot.patch | 16 +
community-x86_64/PKGBUILD | 233 ++++++++++++++++++++
community-x86_64/archlinux.ini | 17 +
community-x86_64/tmpfilesd | 1
community-x86_64/uwsgi.install | 12 +
community-x86_64/uwsgi at .service | 13 +
community-x86_64/uwsgi at .socket | 9
community-x86_64/uwsgi_fix_rpath.patch | 66 +++++
community-x86_64/uwsgi_ruby20_compatibility.patch | 42 +++
community-x86_64/uwsgi_trick_chroot.patch | 16 +
18 files changed, 818 insertions(+)
Copied: uwsgi/repos/community-i686/.lock (from rev 94866, uwsgi/trunk/.lock)
===================================================================
Copied: uwsgi/repos/community-i686/PKGBUILD (from rev 94866, uwsgi/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-07-31 22:32:58 UTC (rev 94867)
@@ -0,0 +1,233 @@
+# $Id$
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot 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>
+
+pkgbase=uwsgi
+pkgname=(uwsgi
+ uwsgi-plugin-common
+ uwsgi-plugin-rack
+ uwsgi-plugin-python2
+ uwsgi-plugin-python
+ uwsgi-plugin-nagios
+ uwsgi-plugin-router
+ uwsgi-plugin-admin
+ uwsgi-plugin-ruby
+ uswgi-plugin-greenlet
+ uswgi-plugin-php
+ uwsgi-plugin-carbon
+ uwsgi-plugin-rrdtool
+ uwsgi-plugin-erlang
+ uwsgi-plugin-pam
+ uwsgi-plugin-jvm
+ uwsgi-plugin-zergpool
+ )
+pkgver=1.9.14
+pkgrel=2
+arch=(i686 x86_64)
+url="http://projects.unbit.it/$pkgbase"
+license=(GPL2)
+conflicts=(python-$pkgbase)
+makedepends=(gcc python python2 ruby python2-greenlet php curl libxml2 libyaml
+ perl lua51 pcre libedit openssl bzip2 gmp erlang pam java-environment=7
+ jansson)
+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)
+md5sums=('ec9cf333534604f17ef4e24051d9d65d'
+ '73a3ad84736c8f2f3d077c43b24cf1b7'
+ 'b05ba1d796e1ea608a40635bc4f3ec67'
+ '0b79320fbae92715c96086cf51e60bc8'
+ 'db70315bbc8cb886a278ba59d5fd8d57'
+ '1a4516d5cdcf5b95b036f4eae2d0c152'
+ '4d09535ce379c8acd76160f35d5d6b55'
+ '0c09a52fdb88f08c36a8b380f451ce6d')
+
+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
+ python2 uwsgiconfig.py --plugin plugins/python archlinux python2
+ python2 uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet
+}
+
+package_uwsgi() {
+ backup=(etc/uwsgi/archlinux.ini)
+ 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/archlinux.ini $pkgdir/etc/uwsgi/archlinux.ini
+ 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 -Dm755 systemd_logger_plugin.so $pkgdir/usr/lib/uwsgi/systemd_logger_plugin.so
+ install -Dm644 $srcdir/archlinux.ini $pkgdir/etc/uwsgi/archlinux.ini
+ 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 cache cgi rpc ugreen; do
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${plugin}
+ install -Dm755 $pkgbase-$pkgver/${plugin}_plugin.so $pkgdir/usr/lib/uwsgi/${plugin}_plugin.so
+ done
+}
+
+package_uwsgi-plugin-rack(){
+ depends=(ruby uwsgi-plugin-common)
+ pkgdesc="Ruby rack plugin"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_rack
+ install -Dm755 $pkgbase-$pkgver/rack_plugin.so $pkgdir/usr/lib/uwsgi/rack_plugin.so
+}
+
+package_uwsgi-plugin-python2(){
+ depends=(uwsgi-plugin-common)
+ pkgdesc="Plugin for Python2 support"
+ cd $srcdir/$pkgbase-$pkgver
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_python2
+ install -Dm755 $srcdir/$pkgbase-$pkgver/python2_plugin.so $pkgdir/usr/lib/uwsgi/python2_plugin.so
+}
+
+package_uwsgi-plugin-python(){
+ depends=(python uwsgi-plugin-common)
+ pkgdesc="Plugin for Python support"
+ install -dm755 $pkgdir/usr/bin
+ cd $srcdir/$pkgbase-$pkgver
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_python
+ install -Dm755 $srcdir/$pkgbase-$pkgver/python_plugin.so $pkgdir/usr/lib/uwsgi/python_plugin.so
+}
+
+package_uwsgi-plugin-nagios(){
+ depends=( uwsgi-plugin-common)
+ pkgdesc="Plugin for Nagios support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_nagios
+ install -Dm755 $pkgbase-$pkgver/nagios_plugin.so $pkgdir/usr/lib/uwsgi/nagios_plugin.so
+}
+
+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; do
+ install -Dm755 $file $pkgdir/usr/lib/uwsgi/$file
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${file%_plugin.so}
+ done
+}
+
+package_uwsgi-plugin-admin(){
+ depends=( uwsgi-plugin-common)
+ pkgdesc="Plugin for Admin support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_admin
+ install -Dm755 $pkgbase-$pkgver/admin_plugin.so $pkgdir/usr/lib/uwsgi/admin_plugin.so
+}
+
+package_uwsgi-plugin-ruby(){
+ depends=(ruby uwsgi-plugin-common)
+ pkgdesc="Plugin for Ruby support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_ruby
+ install -Dm755 $pkgbase-$pkgver/ruby_plugin.so $pkgdir/usr/lib/uwsgi/ruby_plugin.so
+}
+
+
+package_uswgi-plugin-lua51(){
+ depends=(lua uwsgi-plugin-common)
+ pkgdesc="Plugin for Lua support"
+ install -dm755 $pkgdir/usr/bin
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_lua51
+ install -Dm755 $pkgbase-$pkgver/lua_plugin.so $pkgdir/usr/lib/uwsgi/lua51_plugin.so
+}
+
+package_uswgi-plugin-greenlet(){
+ depends=(python2-greenlet uwsgi-plugin-common)
+ pkgdesc="Plugin for Python Greenlet support"
+ cd $srcdir/$pkgbase-$pkgver
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_greenlet
+ install -Dm755 greenlet_plugin.so $pkgdir/usr/lib/uwsgi/greenlet_plugin.so
+}
+
+package_uswgi-plugin-php(){
+ depends=(uwsgi-plugin-common)
+ pkgdesc="Plugin for PHP support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_php
+ install -Dm755 $pkgbase-$pkgver/php_plugin.so $pkgdir/usr/lib/uwsgi/php_plugin.so
+}
+
+package_uwsgi-plugin-carbon(){
+ depends=(uwsgi-plugin-common)
+ pkgdesc="Plugin for Carbon support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_carbon
+ install -Dm755 $pkgbase-$pkgver/carbon_plugin.so $pkgdir/usr/lib/uwsgi/carbon_plugin.so
+}
+
+package_uwsgi-plugin-rrdtool(){
+ depends=(uwsgi-plugin-common rrdtool)
+ pkgdesc="Plugin for Rrdtool support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_rrdtool
+ install -Dm755 $pkgbase-$pkgver/rrdtool_plugin.so $pkgdir/usr/lib/uwsgi/rrdtool_plugin.so
+}
+
+package_uwsgi-plugin-erlang(){
+ depends=(uwsgi-plugin-common erlang)
+ pkgdesc="Plugin for Erlang support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_erlang
+ install -Dm755 $pkgbase-$pkgver/erlang_plugin.so $pkgdir/usr/lib/uwsgi/erlang_plugin.so
+}
+
+
+package_uwsgi-plugin-pam(){
+ depends=(uwsgi-plugin-common)
+ pkgdesc="Plugin for Pam support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_pam
+ install -Dm755 $pkgbase-$pkgver/pam_plugin.so $pkgdir/usr/lib/uwsgi/pam_plugin.so
+}
+
+package_uwsgi-plugin-jvm(){
+ depends=(uwsgi-plugin-common java-runtime=7)
+ pkgdesc="Plugin for Jvm support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_jvm
+ 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
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_zergpool
+ install -Dm755 $pkgbase-$pkgver/zergpool_plugin.so $pkgdir/usr/lib/uwsgi/zergpool_plugin.so
+}
Copied: uwsgi/repos/community-i686/archlinux.ini (from rev 94866, uwsgi/trunk/archlinux.ini)
===================================================================
--- community-i686/archlinux.ini (rev 0)
+++ community-i686/archlinux.ini 2013-07-31 22:32:58 UTC (rev 94867)
@@ -0,0 +1,17 @@
+[uwsgi]
+inherit = core
+bin_name = uwsgi
+xml = true
+yaml = true
+json = true
+pcre = true
+routing = true
+debug = true
+sqlite3 = true
+ssl = true
+xml_implementation = libxml2
+yaml_implementation = auto
+malloc_implementation = libc
+embedded_plugins = echo, ping, corerouter, http
+plugin_dir = /usr/lib/uwsgi
+plugins = rack, python, nagios, fastrouter, admin, lua, ruby, cache, cgi, rpc, ugreen, php, carbon, rrdtool, erlang, pam, jvm, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter, systemd_logger
Copied: uwsgi/repos/community-i686/tmpfilesd (from rev 94866, uwsgi/trunk/tmpfilesd)
===================================================================
--- community-i686/tmpfilesd (rev 0)
+++ community-i686/tmpfilesd 2013-07-31 22:32:58 UTC (rev 94867)
@@ -0,0 +1 @@
+d /run/uwsgi 0755 - - - -
Copied: uwsgi/repos/community-i686/uwsgi.install (from rev 94866, uwsgi/trunk/uwsgi.install)
===================================================================
--- community-i686/uwsgi.install (rev 0)
+++ community-i686/uwsgi.install 2013-07-31 22:32:58 UTC (rev 94867)
@@ -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."
+}
Copied: uwsgi/repos/community-i686/uwsgi at .service (from rev 94866, uwsgi/trunk/uwsgi at .service)
===================================================================
--- community-i686/uwsgi at .service (rev 0)
+++ community-i686/uwsgi at .service 2013-07-31 22:32:58 UTC (rev 94867)
@@ -0,0 +1,13 @@
+[Unit]
+Description=uWSGI Emperor
+After=syslog.target
+
+[Service]
+ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/%I.ini
+Restart=always
+Type=notify
+StandardError=syslog
+NotifyAccess=main
+
+[Install]
+WantedBy=multi-user.target
Copied: uwsgi/repos/community-i686/uwsgi at .socket (from rev 94866, uwsgi/trunk/uwsgi at .socket)
===================================================================
--- community-i686/uwsgi at .socket (rev 0)
+++ community-i686/uwsgi at .socket 2013-07-31 22:32:58 UTC (rev 94867)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Socket for uWSGI Cgit
+
+[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_fix_rpath.patch (from rev 94866, uwsgi/trunk/uwsgi_fix_rpath.patch)
===================================================================
--- community-i686/uwsgi_fix_rpath.patch (rev 0)
+++ community-i686/uwsgi_fix_rpath.patch 2013-07-31 22:32:58 UTC (rev 94867)
@@ -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-i686/uwsgi_ruby20_compatibility.patch (from rev 94866, uwsgi/trunk/uwsgi_ruby20_compatibility.patch)
===================================================================
--- community-i686/uwsgi_ruby20_compatibility.patch (rev 0)
+++ community-i686/uwsgi_ruby20_compatibility.patch 2013-07-31 22:32:58 UTC (rev 94867)
@@ -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-i686/uwsgi_trick_chroot.patch (from rev 94866, uwsgi/trunk/uwsgi_trick_chroot.patch)
===================================================================
--- community-i686/uwsgi_trick_chroot.patch (rev 0)
+++ community-i686/uwsgi_trick_chroot.patch 2013-07-31 22:32:58 UTC (rev 94867)
@@ -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-x86_64/.lock (from rev 94866, uwsgi/trunk/.lock)
===================================================================
Copied: uwsgi/repos/community-x86_64/PKGBUILD (from rev 94866, uwsgi/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-07-31 22:32:58 UTC (rev 94867)
@@ -0,0 +1,233 @@
+# $Id$
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot 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>
+
+pkgbase=uwsgi
+pkgname=(uwsgi
+ uwsgi-plugin-common
+ uwsgi-plugin-rack
+ uwsgi-plugin-python2
+ uwsgi-plugin-python
+ uwsgi-plugin-nagios
+ uwsgi-plugin-router
+ uwsgi-plugin-admin
+ uwsgi-plugin-ruby
+ uswgi-plugin-greenlet
+ uswgi-plugin-php
+ uwsgi-plugin-carbon
+ uwsgi-plugin-rrdtool
+ uwsgi-plugin-erlang
+ uwsgi-plugin-pam
+ uwsgi-plugin-jvm
+ uwsgi-plugin-zergpool
+ )
+pkgver=1.9.14
+pkgrel=2
+arch=(i686 x86_64)
+url="http://projects.unbit.it/$pkgbase"
+license=(GPL2)
+conflicts=(python-$pkgbase)
+makedepends=(gcc python python2 ruby python2-greenlet php curl libxml2 libyaml
+ perl lua51 pcre libedit openssl bzip2 gmp erlang pam java-environment=7
+ jansson)
+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)
+md5sums=('ec9cf333534604f17ef4e24051d9d65d'
+ '73a3ad84736c8f2f3d077c43b24cf1b7'
+ 'b05ba1d796e1ea608a40635bc4f3ec67'
+ '0b79320fbae92715c96086cf51e60bc8'
+ 'db70315bbc8cb886a278ba59d5fd8d57'
+ '1a4516d5cdcf5b95b036f4eae2d0c152'
+ '4d09535ce379c8acd76160f35d5d6b55'
+ '0c09a52fdb88f08c36a8b380f451ce6d')
+
+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
+ python2 uwsgiconfig.py --plugin plugins/python archlinux python2
+ python2 uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet
+}
+
+package_uwsgi() {
+ backup=(etc/uwsgi/archlinux.ini)
+ 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/archlinux.ini $pkgdir/etc/uwsgi/archlinux.ini
+ 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 -Dm755 systemd_logger_plugin.so $pkgdir/usr/lib/uwsgi/systemd_logger_plugin.so
+ install -Dm644 $srcdir/archlinux.ini $pkgdir/etc/uwsgi/archlinux.ini
+ 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 cache cgi rpc ugreen; do
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${plugin}
+ install -Dm755 $pkgbase-$pkgver/${plugin}_plugin.so $pkgdir/usr/lib/uwsgi/${plugin}_plugin.so
+ done
+}
+
+package_uwsgi-plugin-rack(){
+ depends=(ruby uwsgi-plugin-common)
+ pkgdesc="Ruby rack plugin"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_rack
+ install -Dm755 $pkgbase-$pkgver/rack_plugin.so $pkgdir/usr/lib/uwsgi/rack_plugin.so
+}
+
+package_uwsgi-plugin-python2(){
+ depends=(uwsgi-plugin-common)
+ pkgdesc="Plugin for Python2 support"
+ cd $srcdir/$pkgbase-$pkgver
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_python2
+ install -Dm755 $srcdir/$pkgbase-$pkgver/python2_plugin.so $pkgdir/usr/lib/uwsgi/python2_plugin.so
+}
+
+package_uwsgi-plugin-python(){
+ depends=(python uwsgi-plugin-common)
+ pkgdesc="Plugin for Python support"
+ install -dm755 $pkgdir/usr/bin
+ cd $srcdir/$pkgbase-$pkgver
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_python
+ install -Dm755 $srcdir/$pkgbase-$pkgver/python_plugin.so $pkgdir/usr/lib/uwsgi/python_plugin.so
+}
+
+package_uwsgi-plugin-nagios(){
+ depends=( uwsgi-plugin-common)
+ pkgdesc="Plugin for Nagios support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_nagios
+ install -Dm755 $pkgbase-$pkgver/nagios_plugin.so $pkgdir/usr/lib/uwsgi/nagios_plugin.so
+}
+
+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; do
+ install -Dm755 $file $pkgdir/usr/lib/uwsgi/$file
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${file%_plugin.so}
+ done
+}
+
+package_uwsgi-plugin-admin(){
+ depends=( uwsgi-plugin-common)
+ pkgdesc="Plugin for Admin support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_admin
+ install -Dm755 $pkgbase-$pkgver/admin_plugin.so $pkgdir/usr/lib/uwsgi/admin_plugin.so
+}
+
+package_uwsgi-plugin-ruby(){
+ depends=(ruby uwsgi-plugin-common)
+ pkgdesc="Plugin for Ruby support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_ruby
+ install -Dm755 $pkgbase-$pkgver/ruby_plugin.so $pkgdir/usr/lib/uwsgi/ruby_plugin.so
+}
+
+
+package_uswgi-plugin-lua51(){
+ depends=(lua uwsgi-plugin-common)
+ pkgdesc="Plugin for Lua support"
+ install -dm755 $pkgdir/usr/bin
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_lua51
+ install -Dm755 $pkgbase-$pkgver/lua_plugin.so $pkgdir/usr/lib/uwsgi/lua51_plugin.so
+}
+
+package_uswgi-plugin-greenlet(){
+ depends=(python2-greenlet uwsgi-plugin-common)
+ pkgdesc="Plugin for Python Greenlet support"
+ cd $srcdir/$pkgbase-$pkgver
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_greenlet
+ install -Dm755 greenlet_plugin.so $pkgdir/usr/lib/uwsgi/greenlet_plugin.so
+}
+
+package_uswgi-plugin-php(){
+ depends=(uwsgi-plugin-common)
+ pkgdesc="Plugin for PHP support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_php
+ install -Dm755 $pkgbase-$pkgver/php_plugin.so $pkgdir/usr/lib/uwsgi/php_plugin.so
+}
+
+package_uwsgi-plugin-carbon(){
+ depends=(uwsgi-plugin-common)
+ pkgdesc="Plugin for Carbon support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_carbon
+ install -Dm755 $pkgbase-$pkgver/carbon_plugin.so $pkgdir/usr/lib/uwsgi/carbon_plugin.so
+}
+
+package_uwsgi-plugin-rrdtool(){
+ depends=(uwsgi-plugin-common rrdtool)
+ pkgdesc="Plugin for Rrdtool support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_rrdtool
+ install -Dm755 $pkgbase-$pkgver/rrdtool_plugin.so $pkgdir/usr/lib/uwsgi/rrdtool_plugin.so
+}
+
+package_uwsgi-plugin-erlang(){
+ depends=(uwsgi-plugin-common erlang)
+ pkgdesc="Plugin for Erlang support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_erlang
+ install -Dm755 $pkgbase-$pkgver/erlang_plugin.so $pkgdir/usr/lib/uwsgi/erlang_plugin.so
+}
+
+
+package_uwsgi-plugin-pam(){
+ depends=(uwsgi-plugin-common)
+ pkgdesc="Plugin for Pam support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_pam
+ install -Dm755 $pkgbase-$pkgver/pam_plugin.so $pkgdir/usr/lib/uwsgi/pam_plugin.so
+}
+
+package_uwsgi-plugin-jvm(){
+ depends=(uwsgi-plugin-common java-runtime=7)
+ pkgdesc="Plugin for Jvm support"
+ install -dm755 $pkgdir/usr/bin
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_jvm
+ 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
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_zergpool
+ install -Dm755 $pkgbase-$pkgver/zergpool_plugin.so $pkgdir/usr/lib/uwsgi/zergpool_plugin.so
+}
Copied: uwsgi/repos/community-x86_64/archlinux.ini (from rev 94866, uwsgi/trunk/archlinux.ini)
===================================================================
--- community-x86_64/archlinux.ini (rev 0)
+++ community-x86_64/archlinux.ini 2013-07-31 22:32:58 UTC (rev 94867)
@@ -0,0 +1,17 @@
+[uwsgi]
+inherit = core
+bin_name = uwsgi
+xml = true
+yaml = true
+json = true
+pcre = true
+routing = true
+debug = true
+sqlite3 = true
+ssl = true
+xml_implementation = libxml2
+yaml_implementation = auto
+malloc_implementation = libc
+embedded_plugins = echo, ping, corerouter, http
+plugin_dir = /usr/lib/uwsgi
+plugins = rack, python, nagios, fastrouter, admin, lua, ruby, cache, cgi, rpc, ugreen, php, carbon, rrdtool, erlang, pam, jvm, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter, systemd_logger
Copied: uwsgi/repos/community-x86_64/tmpfilesd (from rev 94866, uwsgi/trunk/tmpfilesd)
===================================================================
--- community-x86_64/tmpfilesd (rev 0)
+++ community-x86_64/tmpfilesd 2013-07-31 22:32:58 UTC (rev 94867)
@@ -0,0 +1 @@
+d /run/uwsgi 0755 - - - -
Copied: uwsgi/repos/community-x86_64/uwsgi.install (from rev 94866, uwsgi/trunk/uwsgi.install)
===================================================================
--- community-x86_64/uwsgi.install (rev 0)
+++ community-x86_64/uwsgi.install 2013-07-31 22:32:58 UTC (rev 94867)
@@ -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."
+}
Copied: uwsgi/repos/community-x86_64/uwsgi at .service (from rev 94866, uwsgi/trunk/uwsgi at .service)
===================================================================
--- community-x86_64/uwsgi at .service (rev 0)
+++ community-x86_64/uwsgi at .service 2013-07-31 22:32:58 UTC (rev 94867)
@@ -0,0 +1,13 @@
+[Unit]
+Description=uWSGI Emperor
+After=syslog.target
+
+[Service]
+ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi/%I.ini
+Restart=always
+Type=notify
+StandardError=syslog
+NotifyAccess=main
+
+[Install]
+WantedBy=multi-user.target
Copied: uwsgi/repos/community-x86_64/uwsgi at .socket (from rev 94866, uwsgi/trunk/uwsgi at .socket)
===================================================================
--- community-x86_64/uwsgi at .socket (rev 0)
+++ community-x86_64/uwsgi at .socket 2013-07-31 22:32:58 UTC (rev 94867)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Socket for uWSGI Cgit
+
+[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-x86_64/uwsgi_fix_rpath.patch (from rev 94866, uwsgi/trunk/uwsgi_fix_rpath.patch)
===================================================================
--- community-x86_64/uwsgi_fix_rpath.patch (rev 0)
+++ community-x86_64/uwsgi_fix_rpath.patch 2013-07-31 22:32:58 UTC (rev 94867)
@@ -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-x86_64/uwsgi_ruby20_compatibility.patch (from rev 94866, uwsgi/trunk/uwsgi_ruby20_compatibility.patch)
===================================================================
--- community-x86_64/uwsgi_ruby20_compatibility.patch (rev 0)
+++ community-x86_64/uwsgi_ruby20_compatibility.patch 2013-07-31 22:32:58 UTC (rev 94867)
@@ -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-x86_64/uwsgi_trick_chroot.patch (from rev 94866, uwsgi/trunk/uwsgi_trick_chroot.patch)
===================================================================
--- community-x86_64/uwsgi_trick_chroot.patch (rev 0)
+++ community-x86_64/uwsgi_trick_chroot.patch 2013-07-31 22:32:58 UTC (rev 94867)
@@ -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