Update to uwsgi-1.2.4

Changes include:
Posix semaphore support for FreeBSD and NetBSD.
Improved syslog support.
Linux KSM and unshare support.
Threading improvements.

6 files changed, 78 insertions, 44 deletions

diff --git a/www/py-uwsgi/Makefile b/www/py-uwsgi/Makefile
index cf393483ace..59f7ec4ac04 100644
--- a/www/py-uwsgi/Makefile
+++ b/www/py-uwsgi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2012/06/14 07:45:19 sbd Exp $
+# $NetBSD: Makefile,v 1.16 2012/07/12 16:21:53 roy Exp $
 
-DISTNAME=	uwsgi-0.9.8.6
+DISTNAME=	uwsgi-1.2.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	http://projects.unbit.it/downloads/
 
diff --git a/www/py-uwsgi/PLIST b/www/py-uwsgi/PLIST
index 0b361c447f8..4f088acf112 100644
--- a/www/py-uwsgi/PLIST
+++ b/www/py-uwsgi/PLIST
@@ -1,2 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/09 22:34:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/07/12 16:21:53 roy Exp $
 bin/uwsgi-${PYVERSSUFFIX}
+${PYSITELIB}/uWSGI-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO
+${PYSITELIB}/uWSGI-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
+${PYSITELIB}/uWSGI-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
+${PYSITELIB}/uWSGI-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/uwsgidecorators.py
+${PYSITELIB}/uwsgidecorators.pyc
+${PYSITELIB}/uwsgidecorators.pyo
diff --git a/www/py-uwsgi/distinfo b/www/py-uwsgi/distinfo
index fbc45f2c9c7..877f7734e6f 100644
--- a/www/py-uwsgi/distinfo
+++ b/www/py-uwsgi/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.11 2012/05/15 12:56:38 marino Exp $
+$NetBSD: distinfo,v 1.12 2012/07/12 16:21:53 roy Exp $
 
-SHA1 (uwsgi-0.9.8.6.tar.gz) = bb835c3c14310640b24ebdbcf0aa91e8ce8bd5a6
-RMD160 (uwsgi-0.9.8.6.tar.gz) = 78b92fe3a9b272ca5a2704b0db7d1956b9149a0b
-Size (uwsgi-0.9.8.6.tar.gz) = 359620 bytes
-SHA1 (patch-logging.c) = 8912e05716ac7791b8ed0f59d2dc5186cc7aa5b7
+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) = 329edb3e368bbf2b01074414b6eab19f8ed41575
+SHA1 (patch-uwsgiconfig.py) = e3adcade844d21787270b5802bd55f61610822ca
diff --git a/www/py-uwsgi/patches/patch-base.ini b/www/py-uwsgi/patches/patch-base.ini
new file mode 100644
index 00000000000..c40f77d65c4
--- /dev/null
+++ b/www/py-uwsgi/patches/patch-base.ini
@@ -0,0 +1,13 @@
+$NetBSD: patch-base.ini,v 1.1 2012/07/12 16:21:53 roy 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 @@
+ 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
+ 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 0d5e52eeceb..b459d78467b 100644
--- a/www/py-uwsgi/patches/patch-logging.c
+++ b/www/py-uwsgi/patches/patch-logging.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-logging.c,v 1.1 2012/05/15 12:56:38 marino Exp $
+$NetBSD: patch-logging.c,v 1.2 2012/07/12 16:21:53 roy Exp $
 
---- logging.c.orig	2011-09-11 05:50:42.000000000 +0000
-+++ logging.c
-@@ -179,7 +179,7 @@ void get_memusage() {
+--- 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) {
@@ -11,17 +11,17 @@ $NetBSD: patch-logging.c,v 1.1 2012/05/15 12:56:38 marino Exp $
  
  		struct kinfo_proc *kproc;
  		kproc = kvm_getprocs(kv, KERN_PROC_PID, uwsgi.mypid, &cnt);
-@@ -187,6 +187,13 @@ void get_memusage() {
- 			uwsgi.workers[uwsgi.mywid].vsz_size = kproc->ki_size;
- 			uwsgi.workers[uwsgi.mywid].rss_size = kproc->ki_rssize * uwsgi.page_size;
+@@ -271,6 +271,13 @@
+ 			*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) {
-+			uwsgi.workers[uwsgi.mywid].vsz_size = kproc->kp_vm_map_size;
-+			uwsgi.workers[uwsgi.mywid].rss_size = kproc->kp_vm_rssize * uwsgi.page_size;
++			*vsz = kproc->kp_vm_map_size;
++			*rss = kproc->kp_vm_rssize * uwsgi.page_size;
 +		}
- #elif defined(__NetBSD__) || defined(__OpenBSD__)
- 		struct kinfo_proc2 *kproc2;
- 
+ #elif defined(UWSGI_NEW_OPENBSD)
+ 		struct kinfo_proc *kproc; 
+ 		kproc = kvm_getprocs(kv, KERN_PROC_PID, uwsgi.mypid, sizeof(struct kinfo_proc), &cnt);
diff --git a/www/py-uwsgi/patches/patch-uwsgiconfig.py b/www/py-uwsgi/patches/patch-uwsgiconfig.py
index c79ee11c036..ba02631ea87 100644
--- a/www/py-uwsgi/patches/patch-uwsgiconfig.py
+++ b/www/py-uwsgi/patches/patch-uwsgiconfig.py
@@ -1,10 +1,15 @@
-$NetBSD: patch-uwsgiconfig.py,v 1.4 2012/05/15 12:56:38 marino Exp $
-
-Find include/uuid/uuid.h and lib/libuuid.so under the BUILDLINK_DIR.
-
---- uwsgiconfig.py.orig	2011-09-11 05:54:27.000000000 +0000
-+++ uwsgiconfig.py
-@@ -325,7 +325,7 @@ class uConf(object):
+--- 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 @@
+         if locking_mode == 'auto':
+             if uwsgi_os == 'Linux' or uwsgi_os == 'SunOS':
+                 locking_mode = 'pthread_mutex'
++	    elif uwsgi_os == 'NetBSD':
++		locking_mode = 'posix_sem';
+             # 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 @@
                  if int(sun_major) >= 5:
                      if int(sun_minor) >= 10:
                          event_mode = 'port'
@@ -13,16 +18,25 @@ Find include/uuid/uuid.h and lib/libuuid.so under the BUILDLINK_DIR.
                  event_mode = 'kqueue'
  
          if event_mode == 'epoll':
-@@ -443,7 +443,7 @@ class uConf(object):
+@@ -579,7 +581,7 @@
+         has_pcre = False
+ 
+         # re-enable after pcre fix
+-        if self.get('pcre'):
++        if self.get('pcreOFF'):
+             if self.get('pcre') == 'auto':
+                 pcreconf = spcall('pcre-config --libs')
+                 if pcreconf:
+@@ -620,7 +622,7 @@
          has_json = False
          has_uuid = False
  
--        if os.path.exists('/usr/include/uuid/uuid.h') or os.path.exists('/usr/local/include/uuid/uuid.h'):
-+        if False and ( os.path.exists('/usr/include/uuid/uuid.h') or os.path.exists('/usr/local/include/uuid/uuid.h')):
+-        if self.has_include('uuid/uuid.h'):
++        if False and self.has_include('uuid/uuid.h'):
              has_uuid = True
              self.cflags.append("-DUWSGI_UUID")
-             if 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'):
-@@ -541,7 +541,7 @@ class uConf(object):
+             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')
  
@@ -31,7 +45,7 @@ Find include/uuid/uuid.h and lib/libuuid.so under the BUILDLINK_DIR.
              self.cflags.append("-DUWSGI_YAML")
              self.gcc_list.append('yaml')
              if self.get('yaml_implementation') == 'libyaml':
-@@ -552,7 +552,7 @@ class uConf(object):
+@@ -729,7 +731,7 @@
                      self.cflags.append("-DUWSGI_LIBYAML")
                      self.libs.append('-lyaml')
  
@@ -40,30 +54,30 @@ Find include/uuid/uuid.h and lib/libuuid.so under the BUILDLINK_DIR.
              if self.get('json') == 'auto':
                  jsonconf = spcall("pkg-config --cflags jansson")
                  if jsonconf:
-@@ -572,7 +572,7 @@ class uConf(object):
+@@ -749,7 +751,7 @@
                  self.libs.append('-ljansson')
                  has_json = True
  
 -        if self.get('ldap'):
 +        if self.get('ldapOFF'):
              if self.get('ldap') == 'auto':
-                 if os.path.exists('/usr/include/ldap.h'):
+                 if self.has_include('ldap.h'):
                      self.cflags.append("-DUWSGI_LDAP")
-@@ -583,7 +583,7 @@ class uConf(object):
-                 self.gcc_list.append('ldap')
-                 self.libs.append('-lldap')
+@@ -772,7 +774,7 @@
+                 self.cflags.append("-DUWSGI_SCTP")
+                 self.libs.append('-lsctp')
  
 -        if has_uuid and self.get('zeromq'):
-+        if has_uuid and self.get('zeromqOFF'):
++        if has_uuid and self.get('zeromqiOFF'):
              if self.get('zeromq') == 'auto':
-                 if os.path.exists('/usr/include/zmq.h') or os.path.exists('/usr/local/include/zmq.h'):
+                 if self.has_include('zmq.h'):
                      self.cflags.append("-DUWSGI_ZEROMQ")
-@@ -631,7 +631,7 @@ class uConf(object):
+@@ -832,7 +834,7 @@
                  self.libs.append('-lexpat')
                  self.gcc_list.append('xmlconf')
  
 -        if self.get('sqlite3'):
 +        if self.get('sqlite3OFF'):
              if self.get('sqlite3') == 'auto':
-                 if os.path.exists('/usr/include/sqlite3.h') or os.path.exists('/usr/local/include/sqlite3.h'):
+                 if self.has_include('sqlite3.h'):
                      self.cflags.append("-DUWSGI_SQLITE3")