[arch-commits] Commit in uwsgi/trunk (PKGBUILD archlinux.ini)
Daniel Wallace
dwallace at nymeria.archlinux.org
Sat Aug 3 02:00:34 UTC 2013
Date: Saturday, August 3, 2013 @ 04:00:33
Author: dwallace
Revision: 95002
upgpkg: uwsgi 1.9.14-3
upgpkg: uwsgi 1.9.14-3
Modified:
uwsgi/trunk/PKGBUILD
uwsgi/trunk/archlinux.ini
---------------+
PKGBUILD | 101 ++++++++++++++++++++++++++------------------------------
archlinux.ini | 6 +--
2 files changed, 50 insertions(+), 57 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-08-03 00:27:02 UTC (rev 95001)
+++ PKGBUILD 2013-08-03 02:00:33 UTC (rev 95002)
@@ -14,25 +14,23 @@
uwsgi-plugin-nagios
uwsgi-plugin-router
uwsgi-plugin-admin
- uwsgi-plugin-ruby
- uswgi-plugin-greenlet
- uswgi-plugin-php
+ uwsgi-plugin-php
+ uwsgi-plugin-lua51
uwsgi-plugin-carbon
uwsgi-plugin-rrdtool
uwsgi-plugin-erlang
uwsgi-plugin-pam
- uwsgi-plugin-jvm
uwsgi-plugin-zergpool
)
pkgver=1.9.14
-pkgrel=2
+pkgrel=3
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
+makedepends=(gcc python python2 ruby python2-greenlet php-embed curl libxml2 libyaml
perl lua51 pcre libedit openssl bzip2 gmp erlang pam java-environment=7
- jansson)
+ jansson classpath)
source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
archlinux.ini
tmpfilesd
@@ -42,7 +40,7 @@
uwsgi_ruby20_compatibility.patch
uwsgi_trick_chroot.patch)
md5sums=('ec9cf333534604f17ef4e24051d9d65d'
- '73a3ad84736c8f2f3d077c43b24cf1b7'
+ '899e61d6957bec57e148b92dcb1bec6d'
'b05ba1d796e1ea608a40635bc4f3ec67'
'0b79320fbae92715c96086cf51e60bc8'
'db70315bbc8cb886a278ba59d5fd8d57'
@@ -53,7 +51,7 @@
prepare(){
cd $srcdir/$pkgbase-$pkgver
cp $srcdir/archlinux.ini buildconf/archlinux.ini
- sed -i 's/LIBS .*-lphp5.*/LIBS = []/' plugins/php/uwsgiplugin.py
+ #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
@@ -64,23 +62,22 @@
}
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
+ python2 uwsgiconfig.py --plugin plugins/gevent archlinux gevent
}
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
}
@@ -89,8 +86,8 @@
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
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_$plugin
done
}
@@ -98,17 +95,22 @@
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
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
+ install -Dm755 $pkgbase-$pkgver/fiber_plugin.so $pkgdir/usr/lib/uwsgi/fiber_plugin.so
+ install -Dm755 $pkgbase-$pkgver/rbthreads_plugin.so $pkgdir/usr/lib/uwsgi/rbthreads_plugin.so
}
package_uwsgi-plugin-python2(){
- depends=(uwsgi-plugin-common)
+ depends=(uwsgi-plugin-common python2-gevent python2-gevent)
pkgdesc="Plugin for Python2 support"
+ replace=(uswgi-plugin-greenlet)
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
+ install -Dm755 greenlet_plugin.so $pkgdir/usr/lib/uwsgi/greenlet_plugin.so
+ install -Dm755 gevent_plugin.so $pkgdir/usr/lib/uwsgi/gevent_plugin.so
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
}
package_uwsgi-plugin-python(){
@@ -116,16 +118,16 @@
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
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
}
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
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
}
package_uwsgi-plugin-router(){
@@ -134,9 +136,9 @@
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}
+
+ for file in router_*_plugin.so fastrouter_plugin.so sslrouter_plugin.so rawrouter_plugin.so; do
+ install -Dm644 $file $pkgdir/usr/lib/uwsgi/$file
done
}
@@ -144,67 +146,50 @@
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
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
}
-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)
+package_uwsgi-plugin-lua51(){
+ depends=(lua51 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
+ install -Dm755 $pkgbase-$pkgver/lua_plugin.so $pkgdir/usr/lib/uwsgi/lua_plugin.so
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_lua
}
-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)
+package_uwsgi-plugin-php(){
+ depends=(uwsgi-plugin-common php-embed libyaml jansson)
+ replace=(uswgi-plugin-php)
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
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
}
package_uwsgi-plugin-carbon(){
depends=(uwsgi-plugin-common)
pkgdesc="Plugin for Carbon support"
install -dm755 $pkgdir/usr/bin
- ln -s uwsgi $pkgdir/usr/bin/uwsgi_carbon
install -Dm755 $pkgbase-$pkgver/carbon_plugin.so $pkgdir/usr/lib/uwsgi/carbon_plugin.so
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
}
package_uwsgi-plugin-rrdtool(){
depends=(uwsgi-plugin-common rrdtool)
pkgdesc="Plugin for Rrdtool support"
install -dm755 $pkgdir/usr/bin
- ln -s uwsgi $pkgdir/usr/bin/uwsgi_rrdtool
install -Dm755 $pkgbase-$pkgver/rrdtool_plugin.so $pkgdir/usr/lib/uwsgi/rrdtool_plugin.so
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
}
package_uwsgi-plugin-erlang(){
depends=(uwsgi-plugin-common erlang)
pkgdesc="Plugin for Erlang support"
install -dm755 $pkgdir/usr/bin
- ln -s uwsgi $pkgdir/usr/bin/uwsgi_erlang
install -Dm755 $pkgbase-$pkgver/erlang_plugin.so $pkgdir/usr/lib/uwsgi/erlang_plugin.so
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
}
@@ -212,15 +197,15 @@
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
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
}
package_uwsgi-plugin-jvm(){
- depends=(uwsgi-plugin-common java-runtime=7)
+ depends=(uwsgi-plugin-common java-environment=7 classpath)
pkgdesc="Plugin for Jvm support"
install -dm755 $pkgdir/usr/bin
- ln -s uwsgi $pkgdir/usr/bin/uwsgi_jvm
+ 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
}
@@ -228,6 +213,14 @@
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
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
}
+
+package_uwsgi-plugin-gevent() {
+ depends=(uwsgi-plugin-common gevent)
+ pkgdesc="Plugin for gevent support"
+ install -dm755 $pkgdir/usr/bin
+ install -Dm755 $pkgbase-$pkgver/gevent_plugin.so $pkgdir/usr/lib/uwsgi/gevent_plugin.so
+ ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
+}
Modified: archlinux.ini
===================================================================
--- archlinux.ini 2013-08-03 00:27:02 UTC (rev 95001)
+++ archlinux.ini 2013-08-03 02:00:33 UTC (rev 95002)
@@ -6,12 +6,12 @@
json = true
pcre = true
routing = true
-debug = true
+debug = false
sqlite3 = true
ssl = true
xml_implementation = libxml2
yaml_implementation = auto
malloc_implementation = libc
-embedded_plugins = echo, ping, corerouter, http
+embedded_plugins = echo, ping, http, corerouter
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
+plugins = rack, rbthreads, fiber, python, nagios, admin, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, erlang, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter
More information about the arch-commits
mailing list