Update to uwsgi-2.8.3:

- Various bugfixes and improvements

5 files changed, 6 insertions, 106 deletions

diff --git a/www/py-uwsgi/Makefile b/www/py-uwsgi/Makefile
index 6621b1254a4..2e609eb8bea 100644
--- a/www/py-uwsgi/Makefile
+++ b/www/py-uwsgi/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2011/04/08 12:26:29 adam Exp $
+# $NetBSD: Makefile,v 1.9 2011/07/25 10:15:00 joerg Exp $
 
-DISTNAME=	uwsgi-0.9.7.2
+DISTNAME=	uwsgi-0.9.8.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	http://projects.unbit.it/downloads/
diff --git a/www/py-uwsgi/distinfo b/www/py-uwsgi/distinfo
index f657779e9e5..e4dac96f7a2 100644
--- a/www/py-uwsgi/distinfo
+++ b/www/py-uwsgi/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.5 2011/04/08 12:26:29 adam Exp $
+$NetBSD: distinfo,v 1.6 2011/07/25 10:15:00 joerg Exp $
 
-SHA1 (uwsgi-0.9.7.2.tar.gz) = e279c2c597d349d9cf463bc4d226db7123c43342
-RMD160 (uwsgi-0.9.7.2.tar.gz) = a6f0a548d6db46230946ec0a33395d5f5b119a58
-Size (uwsgi-0.9.7.2.tar.gz) = 306218 bytes
-SHA1 (patch-plugins_python_uwsgi_pymodule.c) = eafbba58cb88aed40c6e15695af32e0b94c1ff38
-SHA1 (patch-utils.c) = a8c125a32f2d433619c29a93d5adf0e1cc91f038
-SHA1 (patch-uwsgi.h) = 44c55b56055fb956153ff1a85449b26550506e6e
+SHA1 (uwsgi-0.9.8.3.tar.gz) = 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6
+RMD160 (uwsgi-0.9.8.3.tar.gz) = 8bfdaa9a503516378e834bca60dfa828b7bee9d2
+Size (uwsgi-0.9.8.3.tar.gz) = 351168 bytes
diff --git a/www/py-uwsgi/patches/patch-plugins_python_uwsgi_pymodule.c b/www/py-uwsgi/patches/patch-plugins_python_uwsgi_pymodule.c
deleted file mode 100644
index 3cedff78dd2..00000000000
--- a/www/py-uwsgi/patches/patch-plugins_python_uwsgi_pymodule.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-plugins_python_uwsgi_pymodule.c,v 1.1 2011/04/08 12:26:29 adam Exp $
-
-Fix compiler errors.
-
---- plugins/python/uwsgi_pymodule.c.orig	2011-04-08 09:58:04.000000000 +0000
-+++ plugins/python/uwsgi_pymodule.c
-@@ -343,7 +343,7 @@ PyObject *py_uwsgi_rpc(PyObject * self, 
- 		argv[i] = PyString_AsString(PyTuple_GetItem(args, i + 2));
- 	}
- 
--	if (node == (char *) "") {
-+	if (node[0] == '\0') {
- 		size = uwsgi_rpc(func, 0, NULL, buffer);
- 	}
- 	else {
-@@ -2662,7 +2662,7 @@ PyObject *py_uwsgi_queue_last(PyObject *
- PyObject *py_uwsgi_cache_get(PyObject * self, PyObject * args) {
- 
- 	char *key;
--	uint64_t valsize;
-+	uint64_t valsize = 0;
- 	Py_ssize_t keylen = 0;
- 	char *value = NULL;
- 	char *remote = NULL;
diff --git a/www/py-uwsgi/patches/patch-utils.c b/www/py-uwsgi/patches/patch-utils.c
deleted file mode 100644
index 9b17477c7b0..00000000000
--- a/www/py-uwsgi/patches/patch-utils.c
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-utils.c,v 1.1 2011/04/08 12:26:29 adam Exp $
-
-Clang does not handle inlines across source files.
-
---- utils.c.orig	2011-04-08 11:09:48.000000000 +0000
-+++ utils.c
-@@ -726,7 +726,10 @@ void uwsgi_log_verbose(const char *fmt, 
- 	rlen = write(2, logpkt, rlen);
- }
- 
--inline int uwsgi_strncmp(char *src, int slen, char *dst, int dlen) {
-+#ifndef __clang__
-+inline
-+#endif
-+int uwsgi_strncmp(char *src, int slen, char *dst, int dlen) {
- 
- 	if (slen != dlen) return 1;
- 
-@@ -734,14 +737,20 @@ inline int uwsgi_strncmp(char *src, int 
- 
- }
- 
--inline int uwsgi_starts_with(char *src, int slen, char *dst, int dlen) {
-+#ifndef __clang__
-+inline
-+#endif
-+int uwsgi_starts_with(char *src, int slen, char *dst, int dlen) {
- 
- 	if (slen < dlen) return -1;
- 
- 	return memcmp(src, dst, dlen);
- }
- 
--inline int uwsgi_startswith(char *src, char *what, int wlen) {
-+#ifndef __clang__
-+inline
-+#endif
-+int uwsgi_startswith(char *src, char *what, int wlen) {
- 
- 	int i;
- 
-@@ -1263,7 +1272,10 @@ int uwsgi_waitfd(int fd, int timeout) {
- }
- 
- 
--inline void *uwsgi_malloc(size_t size) {
-+#ifndef __clang__
-+inline
-+#endif
-+void *uwsgi_malloc(size_t size) {
- 
- 	char *ptr = malloc(size);
- 	if (ptr == NULL) {
diff --git a/www/py-uwsgi/patches/patch-uwsgi.h b/www/py-uwsgi/patches/patch-uwsgi.h
deleted file mode 100644
index 2ce37613466..00000000000
--- a/www/py-uwsgi/patches/patch-uwsgi.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-uwsgi.h,v 1.1 2011/04/08 12:26:29 adam Exp $
-
-Clang does not handle inlines across source files.
-
---- uwsgi.h.orig	2011-04-08 10:10:46.000000000 +0000
-+++ uwsgi.h
-@@ -1710,8 +1710,13 @@ struct uwsgi_async_request {
- 	struct uwsgi_async_request *next;
- };
- 
-+#if __clang__
-+int event_queue_read(void);
-+int event_queue_write(void);
-+#else
- inline int event_queue_read(void);
- inline int event_queue_write(void);
-+#endif
- 
- void uwsgi_help(void);
-