mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-04 20:06:43 +02:00
testing/uwsgi: upgrade to 1.4.2, enable python plugin
This commit is contained in:
parent
14b3e47f52
commit
6fc0bd5584
@ -1,15 +1,15 @@
|
||||
# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
|
||||
# Maintainer:
|
||||
pkgname=uwsgi
|
||||
pkgver=1.3
|
||||
pkgver=1.4.2
|
||||
pkgrel=0
|
||||
pkgdesc="uWSGI application container server"
|
||||
url=http://projects.unbit.it/uwsgi/
|
||||
arch=all
|
||||
license=GPL-2
|
||||
makedepends="linux-headers lua-dev python python-dev"
|
||||
subpackages=uwsgi-lua
|
||||
source="http://projects.unbit.it/downloads/uwsgi-${pkgver}.tar.gz futimes.patch include-sched.patch lua-async.patch"
|
||||
subpackages="uwsgi-lua uwsgi-python:py"
|
||||
source="http://projects.unbit.it/downloads/uwsgi-${pkgver}.tar.gz futimes.patch include-sched.patch"
|
||||
|
||||
_builddir=$srcdir/$pkgname-$pkgver
|
||||
prepare() {
|
||||
@ -25,8 +25,16 @@ prepare() {
|
||||
build() {
|
||||
cd "$_builddir"
|
||||
export CFLAGS=-D_GNU_SOURCE
|
||||
python uwsgiconfig.py --build core
|
||||
python uwsgiconfig.py --plugin plugins/lua core
|
||||
|
||||
msg "building core"
|
||||
python uwsgiconfig.py --build core || return 1
|
||||
|
||||
msg "building lua plugin"
|
||||
UWSGICONFIG_LUALIB="lua" \
|
||||
python uwsgiconfig.py --plugin plugins/lua core || return 1
|
||||
|
||||
msg "building python plugin"
|
||||
python uwsgiconfig.py --plugin plugins/python core || return 1
|
||||
}
|
||||
|
||||
package() {
|
||||
@ -44,12 +52,17 @@ package() {
|
||||
lua() {
|
||||
depends=uwsgi
|
||||
|
||||
local libdir=$subpkgdir/usr/lib/uwsgi
|
||||
install -d "$libdir"
|
||||
mv "$pkgdir/usr/lib/uwsgi/lua_plugin.so" "$libdir"
|
||||
mkdir -p "$subpkgdir"/usr/lib/uwsgi
|
||||
mv "$pkgdir/usr/lib/uwsgi/lua_plugin.so" "$subpkgdir/usr/lib/uwsgi"
|
||||
}
|
||||
|
||||
md5sums="0e83c1ef1b7b01a16c87884d23030ce2 uwsgi-1.3.tar.gz
|
||||
py() {
|
||||
depends=uwsgi
|
||||
|
||||
mkdir -p "$subpkgdir"/usr/lib/uwsgi
|
||||
mv "$pkgdir/usr/lib/uwsgi/python_plugin.so" "$subpkgdir/usr/lib/uwsgi"
|
||||
}
|
||||
|
||||
md5sums="3dad737b580f3eabaa70fccd660f890d uwsgi-1.4.2.tar.gz
|
||||
2c9aeb5b2adf1fa45ef4ed6bda47236a futimes.patch
|
||||
02c43e001d5f44eb421079e17f9db003 include-sched.patch
|
||||
eee9b786b235f577776039c1661b0c63 lua-async.patch"
|
||||
02c43e001d5f44eb421079e17f9db003 include-sched.patch"
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
--- uwsgi-1.3/plugins/lua/lua_plugin.c
|
||||
+++ uwsgi-1.3.alpine/plugins/lua/lua_plugin.c
|
||||
@@ -306,6 +306,8 @@
|
||||
static int uwsgi_lua_input(lua_State *L) {
|
||||
|
||||
struct wsgi_request *wsgi_req = current_wsgi_req();
|
||||
+ int fd = wsgi_req->async_post ?
|
||||
+ fileno(wsgi_req->async_post) : wsgi_req->poll.fd;
|
||||
ssize_t sum, len, total;
|
||||
char *buf, *ptr;
|
||||
|
||||
@@ -328,7 +330,7 @@
|
||||
|
||||
ptr = buf;
|
||||
while(total) {
|
||||
- len = read(wsgi_req->poll.fd, ptr, total);
|
||||
+ len = read(fd, ptr, total);
|
||||
ptr += len;
|
||||
total -= len;
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user