Update to 1.4.10, the oldest version supported by upstream. See py-uwsgi in

-wip for the newest supported version. Partial ChangeLog:

 * 1.4.1

- fixed typos in corerouter plugins
- fixed offloading when the number of threads is higher than 1
- fixed static_maps for non-existent paths
- fixed uwsgi_connect() on modern Linux systems to reset the socket to blocking mode

 * 1.4

- gevent improvements
- improved http/https router and fastrouter
- Go official support
- a new set of infos are exported to the stats system
- improved systemd support
- log filtering and routing
- improved tracebacker
- offload transfer for static files, and network transfers
- matheval support
- plugins can be written in Obj-C
- smart attach daemon
- added support for PEP 405 virtualenvs
- rawrouter with xclient support
- internal routing plugin for cache

 * 1.3

- python tracebacker
- user-governed harakiri
- simplified external plugin development
- Linux namespace mountpoint improvements
- secured subscription system
- merged routers codebase (fastrouter, http, rawrouter)
- https support in the http router
- config report at the end of uWSGI build process
- improved subscription system (multicast and unix socket)
- custom options
- graceful reloads on shared sockets
- configurable log-master buffer size
- extreme-optimizations for the stats subsystem
- redislog and mongodblog plugins
- added python logger
- mongodb and postgres imperial monitors
- implemented psgix.logger and psgix.cleanup
- full rack spec compliance
- preliminary ipv6 support
- gevent graceful reloads
- support for multiple loggers and logformat
- lazy-apps to load apps after fork() but without changing reloading subsystem
- emperor heartbeat subsystem
- cheaper busyness plugin
- pluggable clock sources
- added router_rewrite and router_http plugins
- external spoolers
- support for section:// and fd:// loaders
- alarm subsystem (with curl and xmpp plugins)

6 files changed, 63 insertions, 61 deletions

diff --git a/www/py-uwsgi/Makefile b/www/py-uwsgi/Makefile
index 343a448b5ec..cc1042f88ac 100644
--- a/www/py-uwsgi/Makefile
+++ b/www/py-uwsgi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2012/10/28 06:31:02 asau Exp $
+# $NetBSD: Makefile,v 1.19 2014/01/04 13:56:01 rodent Exp $
 
-DISTNAME=	uwsgi-1.2.4
+DISTNAME=	uwsgi-1.4.10
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	www python
+CATEGORIES=	python www
 MASTER_SITES=	http://projects.unbit.it/downloads/
 
 MAINTAINER=	joerg@NetBSD.org
diff --git a/www/py-uwsgi/distinfo b/www/py-uwsgi/distinfo
index 877f7734e6f..e68e9f93112 100644
--- a/www/py-uwsgi/distinfo
+++ b/www/py-uwsgi/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2012/07/12 16:21:53 roy Exp $
+$NetBSD: distinfo,v 1.13 2014/01/04 13:56:01 rodent Exp $
 
-SHA1 (uwsgi-1.2.4.tar.gz) = 853ddbc1e4a0d98f2e81930dff46239d4bb12310
-RMD160 (uwsgi-1.2.4.tar.gz) = 25c98203ed3ef9a29794349a7bde384b812d5c75
-Size (uwsgi-1.2.4.tar.gz) = 514048 bytes
-SHA1 (patch-base.ini) = 2a58bab89cee023f7065605ea175ca874ad749c5
-SHA1 (patch-logging.c) = 03c2960a05bee8e7d52c85e8bd3dd09429a7df88
-SHA1 (patch-uwsgi.h) = 5489362a5e1fd63fb5c2b797d6c090f46e0946be
-SHA1 (patch-uwsgiconfig.py) = e3adcade844d21787270b5802bd55f61610822ca
+SHA1 (uwsgi-1.4.10.tar.gz) = cc903eeacce6bc9adf76d20a89510e24b9c0364c
+RMD160 (uwsgi-1.4.10.tar.gz) = fc7b03d6e5d52751f8872a5aeb4f4a27fd94e887
+Size (uwsgi-1.4.10.tar.gz) = 590892 bytes
+SHA1 (patch-base.ini) = 20cf4008c9d6f443869147d49fb1c83128d78a17
+SHA1 (patch-logging.c) = 3ba8a94c68951e7ce4c76ee34a99755a23ccd53c
+SHA1 (patch-uwsgi.h) = 1e72e42be6ab7663c3e6123c33236f5f20832563
+SHA1 (patch-uwsgiconfig.py) = ff0f404bd7706ad1b607944d1ef842d9c376c6c5
diff --git a/www/py-uwsgi/patches/patch-base.ini b/www/py-uwsgi/patches/patch-base.ini
index c40f77d65c4..3b389ba9b2f 100644
--- a/www/py-uwsgi/patches/patch-base.ini
+++ b/www/py-uwsgi/patches/patch-base.ini
@@ -1,13 +1,13 @@
-$NetBSD: patch-base.ini,v 1.1 2012/07/12 16:21:53 roy Exp $
+$NetBSD: patch-base.ini,v 1.2 2014/01/04 13:56:01 rodent Exp $
 
---- buildconf/base.ini.orig	2012-07-06 15:41:22.000000000 +0100
-+++ buildconf/base.ini	2012-07-06 15:41:30.000000000 +0100
-@@ -28,7 +28,7 @@
+--- buildconf/base.ini.orig	2013-08-23 12:51:18.000000000 +0000
++++ buildconf/base.ini
+@@ -29,7 +29,7 @@ plugins =
  bin_name = uwsgi
  append_version =
  plugin_dir = .
--embedded_plugins = %(main_plugin)s, ping, cache, nagios, rrdtool, carbon, rpc, fastrouter, http, ugreen, signal, syslog, rsyslog, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog
-+embedded_plugins = %(main_plugin)s, cgi, ping, cache, nagios, rrdtool, carbon, rpc, fastrouter, http, ugreen, signal, syslog, rsyslog, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog
+-embedded_plugins = %(main_plugin)s, ping, cache, nagios, rrdtool, carbon, rpc, corerouter, fastrouter, http, ugreen, signal, syslog, rsyslog, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, mongodblog, router_rewrite, router_http, logfile, router_cache, rawrouter
++embedded_plugins = %(main_plugin)s, cgi, ping, cache, nagios, rrdtool, carbon, rpc, corerouter, fastrouter, http, ugreen, signal, syslog, rsyslog, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, mongodblog, router_rewrite, router_http, logfile, router_cache, rawrouter
  as_shared_library = false
  
  locking = auto
diff --git a/www/py-uwsgi/patches/patch-logging.c b/www/py-uwsgi/patches/patch-logging.c
index b459d78467b..5d037946d72 100644
--- a/www/py-uwsgi/patches/patch-logging.c
+++ b/www/py-uwsgi/patches/patch-logging.c
@@ -1,27 +1,27 @@
-$NetBSD: patch-logging.c,v 1.2 2012/07/12 16:21:53 roy Exp $
+$NetBSD: patch-logging.c,v 1.3 2014/01/04 13:56:01 rodent Exp $
 
---- logging.c.orig	2012-05-14 06:58:20.000000000 +0100
-+++ logging.c	2012-07-06 15:31:08.000000000 +0100
-@@ -263,7 +263,7 @@
- 	kv = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
- #endif
- 	if (kv) {
--#if defined(__FreeBSD__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__)
- 
+--- core/logging.c.orig	2013-08-23 12:51:18.000000000 +0000
++++ core/logging.c
+@@ -306,7 +306,7 @@ void uwsgi_setup_log_master(void) {
+ 			int is_id = 1;
+ 			int i;
+ 			for (i = 0; i < (space - name); i++) {
+-				if (!isalnum(name[i])) {
++				if (!isalnum((int) name[i])) {
+ 					is_id = 0;
+ 					break;
+ 				}
+@@ -695,8 +695,13 @@ void get_memusage(uint64_t * rss, uint64
  		struct kinfo_proc *kproc;
  		kproc = kvm_getprocs(kv, KERN_PROC_PID, uwsgi.mypid, &cnt);
-@@ -271,6 +271,13 @@
+ 		if (kproc && cnt > 0) {
++#if defined(__FreeBSD__)
  			*vsz = kproc->ki_size;
  			*rss = kproc->ki_rssize * uwsgi.page_size;
- 		}
 +#elif defined(__DragonFly__)
-+		struct kinfo_proc *kproc;
-+		kproc = kvm_getprocs(kv, KERN_PROC_PID, uwsgi.mypid, &cnt);
-+		if (kproc && cnt > 0) {
 +			*vsz = kproc->kp_vm_map_size;
 +			*rss = kproc->kp_vm_rssize * uwsgi.page_size;
-+		}
++#endif
+ 		}
  #elif defined(UWSGI_NEW_OPENBSD)
- 		struct kinfo_proc *kproc; 
- 		kproc = kvm_getprocs(kv, KERN_PROC_PID, uwsgi.mypid, sizeof(struct kinfo_proc), &cnt);
+ 		struct kinfo_proc *kproc;
diff --git a/www/py-uwsgi/patches/patch-uwsgi.h b/www/py-uwsgi/patches/patch-uwsgi.h
index a66af6a563b..27a67a10278 100644
--- a/www/py-uwsgi/patches/patch-uwsgi.h
+++ b/www/py-uwsgi/patches/patch-uwsgi.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-uwsgi.h,v 1.3 2012/05/15 12:56:38 marino Exp $
+$NetBSD: patch-uwsgi.h,v 1.4 2014/01/04 13:56:01 rodent Exp $
 
---- uwsgi.h.orig	2011-09-11 05:50:42.000000000 +0000
+--- uwsgi.h.orig	2013-08-23 12:51:18.000000000 +0000
 +++ uwsgi.h
-@@ -210,6 +210,10 @@ extern int pivot_root(const char *new_ro
+@@ -278,6 +278,10 @@ extern int pivot_root(const char *new_ro
  #include <sys/devpoll.h>
  #elif defined(__HAIKU__)
  #else
diff --git a/www/py-uwsgi/patches/patch-uwsgiconfig.py b/www/py-uwsgi/patches/patch-uwsgiconfig.py
index ba02631ea87..ba1159decd5 100644
--- a/www/py-uwsgi/patches/patch-uwsgiconfig.py
+++ b/www/py-uwsgi/patches/patch-uwsgiconfig.py
@@ -1,6 +1,8 @@
---- uwsgiconfig.py.orig	2012-05-14 06:58:20.000000000 +0100
-+++ uwsgiconfig.py	2012-07-06 19:25:44.000000000 +0100
-@@ -443,6 +443,8 @@
+--- uwsgiconfig.py.orig	2013-08-23 12:51:18.000000000 +0000
++++ uwsgiconfig.py
+--- uwsgiconfig.py.orig	2013-08-23 12:51:18.000000000 +0000
++++ uwsgiconfig.py
+@@ -635,6 +635,8 @@ class uConf(object):
          if locking_mode == 'auto':
              if uwsgi_os == 'Linux' or uwsgi_os == 'SunOS':
                  locking_mode = 'pthread_mutex'
@@ -9,7 +11,7 @@
              # FreeBSD umtx is still not ready for process shared locking
              # starting from FreeBSD 9 posix semaphores can be shared between processes
              elif uwsgi_os == 'FreeBSD':
-@@ -475,7 +477,7 @@
+@@ -672,7 +674,7 @@ class uConf(object):
                  if int(sun_major) >= 5:
                      if int(sun_minor) >= 10:
                          event_mode = 'port'
@@ -18,7 +20,7 @@
                  event_mode = 'kqueue'
  
          if event_mode == 'epoll':
-@@ -579,7 +581,7 @@
+@@ -791,7 +793,7 @@ class uConf(object):
          has_pcre = False
  
          # re-enable after pcre fix
@@ -27,7 +29,7 @@
              if self.get('pcre') == 'auto':
                  pcreconf = spcall('pcre-config --libs')
                  if pcreconf:
-@@ -620,7 +622,7 @@
+@@ -854,7 +856,7 @@ class uConf(object):
          has_json = False
          has_uuid = False
  
@@ -36,45 +38,45 @@
              has_uuid = True
              self.cflags.append("-DUWSGI_UUID")
              if uwsgi_os == 'Linux' or os.path.exists('/usr/lib/libuuid.so') or os.path.exists('/usr/local/lib/libuuid.so') or os.path.exists('/usr/lib64/libuuid.so') or os.path.exists('/usr/local/lib64/libuuid.so'):
-@@ -718,7 +720,7 @@
-             self.cflags.append("-DUWSGI_INI")
-             self.gcc_list.append('ini')
+@@ -956,7 +958,7 @@ class uConf(object):
+             self.gcc_list.append('core/ini')
+             report['ini'] = True
  
 -        if self.get('yaml'):
 +        if self.get('yamlOFF'):
              self.cflags.append("-DUWSGI_YAML")
-             self.gcc_list.append('yaml')
-             if self.get('yaml_implementation') == 'libyaml':
-@@ -729,7 +731,7 @@
-                     self.cflags.append("-DUWSGI_LIBYAML")
+             self.gcc_list.append('core/yaml')
+             report['yaml'] = True
+@@ -970,7 +972,7 @@ class uConf(object):
                      self.libs.append('-lyaml')
+                     report['yaml'] = 'libyaml'
  
 -        if self.get('json'):
 +        if self.get('jsonOFF'):
              if self.get('json') == 'auto':
                  jsonconf = spcall("pkg-config --cflags jansson")
                  if jsonconf:
-@@ -749,7 +751,7 @@
-                 self.libs.append('-ljansson')
-                 has_json = True
+@@ -993,7 +995,7 @@ class uConf(object):
+         if has_json:
+             report['json'] = True
  
 -        if self.get('ldap'):
 +        if self.get('ldapOFF'):
              if self.get('ldap') == 'auto':
                  if self.has_include('ldap.h'):
                      self.cflags.append("-DUWSGI_LDAP")
-@@ -772,7 +774,7 @@
-                 self.cflags.append("-DUWSGI_SCTP")
-                 self.libs.append('-lsctp')
+@@ -1020,7 +1022,7 @@ class uConf(object):
+                 report['ssl'] = True
+ 
  
 -        if has_uuid and self.get('zeromq'):
-+        if has_uuid and self.get('zeromqiOFF'):
++        if has_uuid and self.get('zeromqOFF'):
              if self.get('zeromq') == 'auto':
                  if self.has_include('zmq.h'):
                      self.cflags.append("-DUWSGI_ZEROMQ")
-@@ -832,7 +834,7 @@
-                 self.libs.append('-lexpat')
-                 self.gcc_list.append('xmlconf')
+@@ -1080,7 +1082,7 @@ class uConf(object):
+                 self.gcc_list.append('core/xmlconf')
+                 report['xml'] = 'expat'
  
 -        if self.get('sqlite3'):
 +        if self.get('sqlite3OFF'):