- update to 0.9.6.1

- remove local patches as they have been applied upstream

7 files changed, 5 insertions, 66 deletions

diff --git a/www/uwsgi/Makefile b/www/uwsgi/Makefile
index 7fa106b56aad..b0e1c48b3c27 100644
--- a/www/uwsgi/Makefile
+++ b/www/uwsgi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	uwsgi
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.6.1
 CATEGORIES=	www python
 MASTER_SITES=	http://projects.unbit.it/downloads/
 
diff --git a/www/uwsgi/distinfo b/www/uwsgi/distinfo
index 575ed9d8362a..686a8862432b 100644
--- a/www/uwsgi/distinfo
+++ b/www/uwsgi/distinfo
@@ -1,3 +1,3 @@
-MD5 (uwsgi-0.9.6.tar.gz) = 1f07815457cd38cd10b9f2bf8625cfae
-SHA256 (uwsgi-0.9.6.tar.gz) = 87ecd2c1b28af7b855e316b738552ef0de67f35178fb9024e663be715a686abf
-SIZE (uwsgi-0.9.6.tar.gz) = 145535
+MD5 (uwsgi-0.9.6.1.tar.gz) = adf923f6d0dba95e9163a6a851bb269e
+SHA256 (uwsgi-0.9.6.1.tar.gz) = f173c6e52648ad793ed6df1d5d7f4892c0b6ef1a46c633f4d6d58109795687ed
+SIZE (uwsgi-0.9.6.1.tar.gz) = 148594
diff --git a/www/uwsgi/files/patch-http.c b/www/uwsgi/files/patch-http.c
deleted file mode 100644
index fd78ec0c4168..000000000000
--- a/www/uwsgi/files/patch-http.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./http.c.orig	2010-08-29 06:51:52.000000000 +0200
-+++ ./http.c	2010-09-10 16:34:23.990426501 +0200
-@@ -182,7 +182,7 @@
- 	struct uwsgi_http_req *ur = (struct uwsgi_http_req *) u_h_r ;
- 
- 	int clientfd = ur->fd;
--	int uwsgi_fd;
-+	int uwsgi_fd = 0;
- 
- 	int need_to_read = 1;
- 	int state = uwsgi_http_method;
diff --git a/www/uwsgi/files/patch-plugins.c b/www/uwsgi/files/patch-plugins.c
deleted file mode 100644
index 6df5a7a50f90..000000000000
--- a/www/uwsgi/files/patch-plugins.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./plugins.c.orig	2010-08-29 06:51:52.000000000 +0200
-+++ ./plugins.c	2010-09-10 16:33:35.471808130 +0200
-@@ -1,6 +1,7 @@
- #include "uwsgi.h"
- 
--void embed_plugins(struct uwsgi_server *uwsgi) {
-+int embed_plugins(struct uwsgi_server *uwsgi) {
-+	int ret = 0;
- 
- #ifdef UWSGI_EMBED_PLUGIN_PSGI
- 	if (uwsgi->plugin_arg_psgi)
-@@ -17,6 +18,7 @@
- 		ret = uwsgi_load_plugin(uwsgi, 7, "rack_plugin.so", uwsgi->plugin_arg_rack, 0);
- #endif
- 
-+	return ret;
- }
- 
- int uwsgi_load_plugin(struct uwsgi_server *uwsgi, int modifier, char *plugin, char *pargs, int absolute) {
diff --git a/www/uwsgi/files/patch-routing.c b/www/uwsgi/files/patch-routing.c
deleted file mode 100644
index bdb01ff2f414..000000000000
--- a/www/uwsgi/files/patch-routing.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./routing.c.orig	2010-08-29 06:51:52.000000000 +0200
-+++ ./routing.c	2010-09-10 16:34:10.586680517 +0200
-@@ -63,7 +63,7 @@
- void uwsgi_route_action_wsgi(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
- 
- 	int i;
--	PyObject *route_py_callbase, *route_py_dict;
-+	PyObject *route_py_callbase = NULL, *route_py_dict = NULL;
- 
- 	uwsgi_log("managing WSGI route...\n");
-         if (ur->callable == NULL) {
-@@ -106,7 +106,7 @@
- 
- void uwsgi_route_action_uwsgi(struct uwsgi_server *uwsgi, struct wsgi_request *wsgi_req, struct uwsgi_route *ur) {
- 
--	PyObject *route_py_callbase, *route_py_dict;
-+	PyObject *route_py_callbase = NULL, *route_py_dict = NULL;
- 	int i;
- 
- 	uwsgi_log("managing uwsgi route...\n");
diff --git a/www/uwsgi/files/patch-uwsgi.h b/www/uwsgi/files/patch-uwsgi.h
deleted file mode 100644
index d07cb386cd16..000000000000
--- a/www/uwsgi/files/patch-uwsgi.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./uwsgi.h.orig	2010-09-10 16:34:33.959880773 +0200
-+++ ./uwsgi.h	2010-09-10 16:34:41.542504418 +0200
-@@ -1018,7 +1018,7 @@
- #endif
- 
- int uwsgi_load_plugin(struct uwsgi_server *, int, char *, char *, int);
--void embed_plugins(struct uwsgi_server *);
-+int embed_plugins(struct uwsgi_server *);
- 
- 
- // PLUGINS
diff --git a/www/uwsgi/files/uwsgi.in b/www/uwsgi/files/uwsgi.in
index 868846ff23fc..a1464ac4e22b 100644
--- a/www/uwsgi/files/uwsgi.in
+++ b/www/uwsgi/files/uwsgi.in
@@ -15,7 +15,7 @@
 # uwsgi_logfile (path):		Set the path to the uwsgi log file
 #				Default is /var/log/uwsgi.log.
 # uwsgi_pidfile (path):		Set the path to the uwsgi pid file
-#				Default is /var/run/uwsgi/uwsgi.pid.
+#				Default is /var/run/uwsgi.pid.
 # uwsgi_uid (int):		Set the UID of the process to run with
 #				Default is 80.
 # uwsgi_gid (int):		Set the GID of the process to run with