testing/uwsgi: upgrade to 1.9.15 and switch to Lua 5.2

4 files changed, 7 insertions, 93 deletions

diff --git a/testing/uwsgi/APKBUILD b/testing/uwsgi/APKBUILD
index 556a9b13d1..531daec308 100644
--- a/testing/uwsgi/APKBUILD
+++ b/testing/uwsgi/APKBUILD
@@ -1,16 +1,15 @@
 # Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=uwsgi
-pkgver=1.4.8
-pkgrel=3
+pkgver=1.9.15
+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 zeromq-dev paxctl"
+makedepends="linux-headers lua5.2-dev python python-dev zeromq-dev paxctl"
 subpackages="uwsgi-lua uwsgi-python:py"
 source="http://projects.unbit.it/downloads/uwsgi-${pkgver}.tar.gz
-	futimes.patch include-sched.patch lua-cache-update.patch
 	uwsgi.initd uwsgi.confd
 	"
 
@@ -33,7 +32,7 @@ build() {
 	python uwsgiconfig.py --build core || return 1
 
 	msg "building lua plugin"
-	UWSGICONFIG_LUALIB="lua" \
+	UWSGICONFIG_LUAPC="lua5.2" \
 		python uwsgiconfig.py --plugin plugins/lua core || return 1
 
 	msg "building python plugin"
@@ -62,7 +61,6 @@ package() {
 
 lua() {
 	depends=uwsgi
-      
 	mkdir -p "$subpkgdir"/usr/lib/uwsgi
 	mv "$pkgdir/usr/lib/uwsgi/lua_plugin.so" "$subpkgdir/usr/lib/uwsgi"
 }
@@ -74,21 +72,12 @@ py() {
 	mv "$pkgdir/usr/lib/uwsgi/python_plugin.so" "$subpkgdir/usr/lib/uwsgi"
 }
 
-md5sums="10af354eccaae9c447bd5bdc69bcce12  uwsgi-1.4.8.tar.gz
-2c9aeb5b2adf1fa45ef4ed6bda47236a  futimes.patch
-02c43e001d5f44eb421079e17f9db003  include-sched.patch
-3bba1063b54043561f520d6986e35057  lua-cache-update.patch
+md5sums="e2a1c245e0b8b7e3c8dff8dbbfca52f3  uwsgi-1.9.15.tar.gz
 8a8be061d7b5f3108a0f16813da68389  uwsgi.initd
 3d6afe6a8c52556d1d6c52384fc38d9a  uwsgi.confd"
-sha256sums="3c35893927a065ed89775cf5a8f66f66d71b060618f4611efbcca76e520aac37  uwsgi-1.4.8.tar.gz
-9ad8375325195e577e6b91a1cf7539817b58fbb4efef248d01a4b704a0e8749f  futimes.patch
-25cb58a02a9f1f62be227592a31152e960f51d44a9e9d14751375a9468152e90  include-sched.patch
-fe79c823399c750618572531e8c9ccfa2394da329ce16516af79887f493c1a2d  lua-cache-update.patch
+sha256sums="87a9dba42df4344dab001ed9f14ad3176977367905dbf9524d18c3808c0e17af  uwsgi-1.9.15.tar.gz
 58b998b025e4a9df20ca917bc93e287f9a8cf02d278d513fa461f70e1d08f799  uwsgi.initd
 4cb047e311aecd0f498da1d6a4c0947dd6dc7cc98575d54cb2ef150cacf8425c  uwsgi.confd"
-sha512sums="7ead90c0740db0ebc28256b312a98e8de610b62cc82504c738cc2f3d2b0819ae673eb1875ea31abc3e511dc76db9af9fb15f4d1ae2a62f6b67b2a5966cfe2bab  uwsgi-1.4.8.tar.gz
-9e867a3483197adb5ab99334d0e9f092dab44201ddbead99a4649309fd0584e6793531a147e096459984d26d0a73754688426df1fb4686c041d3889f3d29fdef  futimes.patch
-d454dcc5ee0a121ff44584e0da98055e6596e8a750315fe4ce6a5fbc615697b2a19b9b32c51ac9878587a855ec3f072e87a3e4e097a8b743699f58ed0d84ec0f  include-sched.patch
-baf97b56448c8a38334036b11c4fb36805ccfb3b867443afe3b1ee5b91bf10981d61f690184e51fa9e492b6318b657530e2f3f11d803dce17cef1a16c56719ab  lua-cache-update.patch
+sha512sums="f845dc85c270caa4599f3f7c7be57848ebbb3dcbd69b0089674fcba42773cb1b4b2516315e09eb75832529c12c727135dbf54b88714e942a5274da01b27b19b8  uwsgi-1.9.15.tar.gz
 ab9dc6277bd05821287f6f8beb3ac2504f0e41db38e11b4d2884ac026f14ac7bfaaca138f045afa712d4f2843f94de105bf0d43fad35d18679ac33b507cd187e  uwsgi.initd
 9f00afb2aa574bbc59040f945475712b8c40da0c06eeb5699de5510aa116148e35ab0429fa891084cf0cd7868876d5a80e1601b7c85d0e2e9ea2a1f54cdde619  uwsgi.confd"
diff --git a/testing/uwsgi/futimes.patch b/testing/uwsgi/futimes.patch
deleted file mode 100644
index 79b525fa06..0000000000
--- a/testing/uwsgi/futimes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- uwsgi-1.3/core/spooler.c
-+++ uwsgi-1.3.alpine/core/spooler.c
-@@ -223,15 +223,15 @@
- 	}
- 
- 	if (at > 0) {
--		struct timeval tv[2];
-+		struct timespec tv[2];
- 		tv[0].tv_sec = at;
--		tv[0].tv_usec = 0;
-+		tv[0].tv_nsec = 0;
- 		tv[1].tv_sec = at;
--		tv[1].tv_usec = 0;
-+		tv[1].tv_nsec = 0;
- #ifdef __sun__
- 		if (futimesat(fd, NULL, tv)) {
- #else
--		if (futimes(fd, tv)) {
-+		if (futimens(fd, tv)) {
- #endif
- 			uwsgi_error("futimes()");
- 		}
diff --git a/testing/uwsgi/include-sched.patch b/testing/uwsgi/include-sched.patch
deleted file mode 100644
index 914296597b..0000000000
--- a/testing/uwsgi/include-sched.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- uwsgi-1.3/core/utils.c
-+++ uwsgi-1.3.alpine/core/utils.c
-@@ -1,3 +1,5 @@
-+#include <sched.h>
-+
- #include "uwsgi.h"
- 
- 
diff --git a/testing/uwsgi/lua-cache-update.patch b/testing/uwsgi/lua-cache-update.patch
deleted file mode 100644
index 6943a97c9a..0000000000
--- a/testing/uwsgi/lua-cache-update.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- uwsgi-1.4.3/plugins/lua/lua_plugin.c
-+++ uwsgi-1.4.3.new/plugins/lua/lua_plugin.c
-@@ -157,6 +157,34 @@
- 
- }
- 
-+static int uwsgi_api_cache_update(lua_State *L) {
-+
-+	int args = lua_gettop(L);
-+        const char *key ;
-+        const char *value ;
-+        uint64_t expires = 0;
-+	size_t vallen;
-+
-+
-+	if (args > 1) {
-+
-+		key = lua_tolstring(L, 1, NULL);
-+		value = lua_tolstring(L, 2, &vallen);
-+		if (args > 2) {
-+			expires = lua_tonumber(L, 3);
-+		}
-+
-+        	uwsgi_cache_set((char *)key, strlen(key), (char *)value,
-+				(uint16_t) vallen, expires,
-+				UWSGI_CACHE_FLAG_UPDATE);
-+		
-+	}
-+
-+	lua_pushnil(L);
-+	return 1;
-+
-+}
-+
- static int uwsgi_api_register_signal(lua_State *L) {
- 
- 	int args = lua_gettop(L);
-@@ -298,6 +326,7 @@
-   {"send_message", uwsgi_api_send_message},
-   {"cache_get", uwsgi_api_cache_get},
-   {"cache_set", uwsgi_api_cache_set},
-+  {"cache_update", uwsgi_api_cache_update},
-   {"register_signal", uwsgi_api_register_signal},
-   {"register_rpc", uwsgi_api_register_rpc},
-   {NULL, NULL}