py-meinheld: updated to 1.0.1

1.0.1
Fix: broken environment

1.0.0
Fix: support wsgi.input_terminated flag
Fix: chunked request fails with 411 length required

5 files changed, 10 insertions, 105 deletions

diff --git a/www/py-meinheld/Makefile b/www/py-meinheld/Makefile
index bf55868b6fe..fc257c86043 100644
--- a/www/py-meinheld/Makefile
+++ b/www/py-meinheld/Makefile
@@ -1,19 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2017/09/30 21:52:06 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2019/08/26 13:41:17 adam Exp $
 
-DISTNAME=	meinheld-0.6.1
+DISTNAME=	meinheld-1.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
-CATEGORIES=	www
+CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=m/meinheld/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://meinheld.org/
+HOMEPAGE=	https://meinheld.org/
 COMMENT=	Python WSGI HTTP server
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-greenlet>=0.4.5<0.5:../../devel/py-greenlet
-# needed for tests, optional at runtime
-BUILD_DEPENDS+=	${PYPKGPREFIX}-gunicorn-[0-9]*:../../www/py-gunicorn
+DEPENDS+=	${PYPKGPREFIX}-greenlet>=0.4.5:../../devel/py-greenlet
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-meinheld/distinfo b/www/py-meinheld/distinfo
index 445d7d1eeb2..4262b801063 100644
--- a/www/py-meinheld/distinfo
+++ b/www/py-meinheld/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.4 2017/11/28 12:47:28 wiz Exp $
+$NetBSD: distinfo,v 1.5 2019/08/26 13:41:17 adam Exp $
 
-SHA1 (meinheld-0.6.1.tar.gz) = d3b1c307e26e131da5030a18a5d750d788a37893
-RMD160 (meinheld-0.6.1.tar.gz) = b8a7a17385b21c0bf6570b7e9c41a5e9934c9ed4
-SHA512 (meinheld-0.6.1.tar.gz) = 02b8c8573c244e92a7dbf86524a7e1c1fe02a7aa1b107fc3d07d02b6ba22d70cbd7ddb6f8f3470db740dba3138ecee36dc2f00dd5d1e63c83435bea0f0344a9b
-Size (meinheld-0.6.1.tar.gz) = 79703 bytes
-SHA1 (patch-meinheld_server_picoev__select.c) = e040d34904d4af7abaf6485334ad166eda48e5b5
-SHA1 (patch-meinheld_server_util.c) = 7ca3ed9f5b4e1bcf33de9f2e7e96f2ba59c2846a
-SHA1 (patch-setup.py) = 4f344f6c380ec58acd89d59b1514dd504c976d4b
+SHA1 (meinheld-1.0.1.tar.gz) = ea98785a98ad10158c7ffc0be9535445057dc57d
+RMD160 (meinheld-1.0.1.tar.gz) = fea26675940310f1b44a83d451a24332613eee7e
+SHA512 (meinheld-1.0.1.tar.gz) = e7669cbc21e3b1c7cee0f86d2b28953a7196ffaae87d82213109f43bac1366778cc6c936ea66e51bf165cf35eb294e2b532db8ae6ffaee5a1b0d58bba726806c
+Size (meinheld-1.0.1.tar.gz) = 81891 bytes
diff --git a/www/py-meinheld/patches/patch-meinheld_server_picoev__select.c b/www/py-meinheld/patches/patch-meinheld_server_picoev__select.c
deleted file mode 100644
index 65e31714e89..00000000000
--- a/www/py-meinheld/patches/patch-meinheld_server_picoev__select.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-meinheld_server_picoev__select.c,v 1.2 2017/11/28 12:47:28 wiz Exp $
-
-Fix broken code.
-https://github.com/mopemope/meinheld/pull/89
-
---- meinheld/server/picoev_select.c.orig	2015-09-16 12:56:12.000000000 +0000
-+++ meinheld/server/picoev_select.c
-@@ -102,7 +102,7 @@ picoev_loop* picoev_create_loop(int max_
-     return NULL;
-   }
-   
--  loop->loop.now = current_msec / 1000;
-+  loop->now = current_msec / 1000;
-   return loop;
- }
- 
diff --git a/www/py-meinheld/patches/patch-meinheld_server_util.c b/www/py-meinheld/patches/patch-meinheld_server_util.c
deleted file mode 100644
index 82b4021033c..00000000000
--- a/www/py-meinheld/patches/patch-meinheld_server_util.c
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-meinheld_server_util.c,v 1.3 2017/11/28 12:47:28 wiz Exp $
-
-Add NetBSD support.
-https://github.com/mopemope/meinheld/pull/89
-
---- meinheld/server/util.c.orig	2015-09-16 12:56:12.000000000 +0000
-+++ meinheld/server/util.c
-@@ -7,7 +7,7 @@ setup_listen_sock(int fd)
-     int on = 1, r = -1;
- #ifdef linux
-     r = setsockopt(fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &on, sizeof(on));
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
-     struct accept_filter_arg afa;
-     bzero(&afa, sizeof(afa));
-     strcpy(afa.af_name, "httpready");
-@@ -59,10 +59,13 @@ int
- enable_cork(client_t *client)
- {
-     int on = 1;
--#ifdef linux
-+#if defined(linux) || defined(__sun)
-     setsockopt(client->fd, IPPROTO_TCP, TCP_CORK, &on, sizeof(on));
- #elif defined(__APPLE__) || defined(__FreeBSD__)
-     setsockopt(client->fd, IPPROTO_TCP, TCP_NOPUSH, &on, sizeof(on));
-+#elif defined(__NetBSD__)
-+    /* not supported */
-+    return 1;
- #else
- #error
- #endif
-@@ -77,10 +80,13 @@ disable_cork(client_t *client)
-     int off = 0;
-     int on = 1;
-     if(client->use_cork == 1){
--#ifdef linux
-+#if defined(linux) || defined(__sun)
-         setsockopt(client->fd, IPPROTO_TCP, TCP_CORK, &off, sizeof(off));
- #elif defined(__APPLE__) || defined(__FreeBSD__)
-         setsockopt(client->fd, IPPROTO_TCP, TCP_NOPUSH, &off, sizeof(off));
-+#elif defined(__NetBSD__)
-+    /* not supported */
-+    return 1;
- #else
- #error
- #endif
diff --git a/www/py-meinheld/patches/patch-setup.py b/www/py-meinheld/patches/patch-setup.py
deleted file mode 100644
index df7cb607c3b..00000000000
--- a/www/py-meinheld/patches/patch-setup.py
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-setup.py,v 1.3 2017/11/28 12:47:28 wiz Exp $
-
-Add NetBSD support.
-https://github.com/mopemope/meinheld/pull/89
-
---- setup.py.orig	2016-11-01 23:46:07.000000000 +0000
-+++ setup.py
-@@ -41,6 +41,10 @@ def get_picoev_file():
-         poller_file = 'meinheld/server/picoev_kqueue.c'
-     elif "FreeBSD" == platform.system():
-         poller_file = 'meinheld/server/picoev_kqueue.c'
-+    elif "NetBSD" == platform.system():
-+        poller_file = 'meinheld/server/picoev_kqueue.c'
-+    elif "SunOS" == platform.system():
-+        poller_file = 'meinheld/server/picoev_select.c'
-     else:
-         print("Sorry, not support .")
-         sys.exit(1)
-@@ -90,7 +94,7 @@ setup(name='meinheld',
-     author_email='yutaka.matsubara@gmail.com',
-     url='http://meinheld.org',
-     license='BSD',
--    platforms='Linux, BSD, Darwin',
-+    platforms='Linux, BSD, Darwin, SunOS',
-     packages= ['meinheld'],
-     install_requires=install_requires,
-