2.0.12-2.1

2 files changed, 27 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e55e47ef6a00..c0d106c4ce3e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 # Generated by mksrcinfo v8
-# Tue Jan 19 13:53:27 UTC 2016
-pkgbase = uwsgi
-	pkgver = 2.0.11.2
-	pkgrel = 3.1
+# Tue Jan 19 17:24:13 UTC 2016
+pkgbase = libx32-uwsgi
+	pkgver = 2.0.12
+	pkgrel = 2.1
 	url = http://projects.unbit.it/uwsgi
 	arch = x86_64
 	license = GPL2
 	makedepends = gcc-multilib-x32
 	makedepends = libx32-python
-	makedepends = python-greenlet
+	makedepends = libx32-python-greenlet
 	makedepends = libx32-libxml2
 	makedepends = libx32-libyaml
 	makedepends = libx32-pcre
@@ -18,21 +18,19 @@ pkgbase = uwsgi
 	makedepends = libx32-jansson
 	makedepends = libx32-systemd
 	backup = etc/uwsgi/emperor-x32.ini
-	source = http://projects.unbit.it/downloads/uwsgi-2.0.11.2.tar.gz
+	source = http://projects.unbit.it/downloads/uwsgi-2.0.12.tar.gz
 	source = archlinux.ini
 	source = uwsgi_at.service
 	source = uwsgi_at.socket
-	source = uwsgi_fix_rpath.patch
 	source = uwsgi_ruby20_compatibility.patch
 	source = uwsgi_trick_chroot.patch
 	source = emperor.ini
 	source = emperor.uwsgi.service
 	source = emperor.uwsgi.socket
-	md5sums = 1f02dcbee7f6f61de4b1fd68350cf16f
+	md5sums = 1451cab954bad0d7d7429e4d2c84b5df
 	md5sums = e069992a7e9aa86534d89a333b1ec2d7
 	md5sums = 8f3231b89b2cdc3802c2b14fa70a6ba1
 	md5sums = e4e20c976e476f5560dc24f0b16991f1
-	md5sums = 1a4516d5cdcf5b95b036f4eae2d0c152
 	md5sums = 4d09535ce379c8acd76160f35d5d6b55
 	md5sums = 0c09a52fdb88f08c36a8b380f451ce6d
 	md5sums = 5fa14ddea9a3dae17b5be28468d47b80
diff --git a/PKGBUILD b/PKGBUILD
index ab39790221da..4f73cc8c9ba6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148079 2015-12-01 15:59:34Z svenstaro $
+# $Id: PKGBUILD 155634 2016-01-07 10:12:28Z svenstaro $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com>
@@ -7,36 +7,35 @@
 # Contributor: Vsevolod Balashov <vsevolod@balashov.name>
 # Contributor: David Runge <dave@sleepmap.de>
 
-pkgbase=uwsgi
+_pkgbasename=uwsgi
+pkgbase=libx32-uwsgi
 pkgname=(libx32-uwsgi
          libx32-uwsgi-plugin-cgi
          libx32-uwsgi-plugin-python
          libx32-uwsgi-plugin-webdav)
-pkgver=2.0.11.2
-pkgrel=3.1
+pkgver=2.0.12
+pkgrel=2.1
 arch=(x86_64)
-url="http://projects.unbit.it/$pkgbase"
+url="http://projects.unbit.it/$_pkgbasename"
 license=(GPL2)
 backup=('etc/uwsgi/emperor-x32.ini')
-makedepends=(gcc-multilib-x32 libx32-python python-greenlet libx32-libxml2 libx32-libyaml
+makedepends=(gcc-multilib-x32 libx32-python libx32-python-greenlet libx32-libxml2 libx32-libyaml
              libx32-pcre libx32-openssl libx32-bzip2 libx32-pam
              libx32-jansson libx32-systemd)
-source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
+source=(http://projects.unbit.it/downloads/$_pkgbasename-$pkgver.tar.gz
         archlinux.ini
         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=('1f02dcbee7f6f61de4b1fd68350cf16f'
+md5sums=('1451cab954bad0d7d7429e4d2c84b5df'
          'e069992a7e9aa86534d89a333b1ec2d7'
          '8f3231b89b2cdc3802c2b14fa70a6ba1'
          'e4e20c976e476f5560dc24f0b16991f1'
-         '1a4516d5cdcf5b95b036f4eae2d0c152'
          '4d09535ce379c8acd76160f35d5d6b55'
          '0c09a52fdb88f08c36a8b380f451ce6d'
          '5fa14ddea9a3dae17b5be28468d47b80'
@@ -44,10 +43,9 @@ md5sums=('1f02dcbee7f6f61de4b1fd68350cf16f'
          'f726795b7beb92bf9e62cab8fcbf8c8f')
 
 prepare() {
-    cd $srcdir/$pkgbase-$pkgver
+    cd $srcdir/$_pkgbasename-$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
+    for patch in uwsgi_ruby20_compatibility.patch uwsgi_trick_chroot.patch; do
         patch -Np1 -i $srcdir/$patch
     done
     rm -rf plugins/ruby
@@ -56,14 +54,14 @@ prepare() {
 }
 
 build() {
-    pushd $srcdir/$pkgbase-$pkgver
+    pushd $srcdir/$_pkgbasename-$pkgver
 
     python-x32 uwsgiconfig.py --build archlinux
     python-x32 uwsgiconfig.py --plugin plugins/python archlinux python
     python-x32 uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet
     python-x32 uwsgiconfig.py --plugin plugins/asyncio archlinux asyncio
 
-    #pushd $srcdir/$pkgbase-$pkgver/apache2
+    #pushd $srcdir/$_pkgbasename-$pkgver/apache2
     #/usr/bin/apxs -c mod_proxy_uwsgi.c
 }
 
@@ -71,7 +69,7 @@ package_libx32-uwsgi() {
     pkgdesc="A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C (x32 ABI)"
     depends=(uwsgi libx32-libxml2 libx32-jansson libx32-libyaml libx32-systemd libx32-libcap libx32-pam libx32-util-linux libx32-openssl libx32-pcre)
     install=uwsgi.install
-    cd $srcdir/$pkgbase-$pkgver
+    cd $srcdir/$_pkgbasename-$pkgver
     install -Dm755 uwsgi $pkgdir/usr/bin/uwsgi-x32
     install -Dm644 $srcdir/uwsgi_at.service $pkgdir/usr/lib/systemd/system/uwsgi-x32@.service
     install -Dm644 $srcdir/uwsgi_at.socket $pkgdir/usr/lib/systemd/system/uwsgi-x32@.socket
@@ -83,16 +81,16 @@ package_libx32-uwsgi() {
 package_libx32-uwsgi-plugin-cgi() {
     depends=(libx32-uwsgi)
     pkgdesc="CGI plugin (x32 ABI)"
-    install -Dm755 $pkgbase-$pkgver/cgi_plugin.so $pkgdir/usr/libx32/uwsgi/cgi_plugin.so
+    install -Dm755 $_pkgbasename-$pkgver/cgi_plugin.so $pkgdir/usr/libx32/uwsgi/cgi_plugin.so
 }
 
 package_libx32-uwsgi-plugin-python() {
     depends=(libx32-uwsgi libx32-python libx32-python-greenlet)
     pkgdesc="Plugin for Python support (x32 ABI)"
-    install -Dm755 $pkgbase-$pkgver/python_plugin.so $pkgdir/usr/libx32/uwsgi/python_plugin.so
-    install -Dm755 $pkgbase-$pkgver/greenlet_plugin.so $pkgdir/usr/libx32/uwsgi/greenlet_plugin.so
-    install -Dm755 $pkgbase-$pkgver/asyncio_plugin.so $pkgdir/usr/libx32/uwsgi/asyncio_plugin.so
-    install -Dm644 $pkgbase-$pkgver/uwsgidecorators.py $pkgdir/usr/libx32/python3.5/site-packages/uwsgidecorators.py
+    install -Dm755 $_pkgbasename-$pkgver/python_plugin.so $pkgdir/usr/libx32/uwsgi/python_plugin.so
+    install -Dm755 $_pkgbasename-$pkgver/greenlet_plugin.so $pkgdir/usr/libx32/uwsgi/greenlet_plugin.so
+    install -Dm755 $_pkgbasename-$pkgver/asyncio_plugin.so $pkgdir/usr/libx32/uwsgi/asyncio_plugin.so
+    install -Dm644 $_pkgbasename-$pkgver/uwsgidecorators.py $pkgdir/usr/libx32/python3.5/site-packages/uwsgidecorators.py
     python -m compileall $pkgdir/usr/libx32/python3.5/site-packages/
     python -O -m compileall $pkgdir/usr/libx32/python3.5/site-packages/
 }
@@ -100,6 +98,6 @@ package_libx32-uwsgi-plugin-python() {
 package_libx32-uwsgi-plugin-webdav() {
     depends=(libx32-uwsgi)
     pkgdesc="Plugin for webdav support (x32 ABI)"
-    install -Dm755 $pkgbase-$pkgver/webdav_plugin.so $pkgdir/usr/libx32/uwsgi/webdav_plugin.so
+    install -Dm755 $_pkgbasename-$pkgver/webdav_plugin.so $pkgdir/usr/libx32/uwsgi/webdav_plugin.so
 }