Fri Oct 13 14:51:16 2017 UTC ()
py-meinheld: Support SunOS, based on PR#52613


(jperkin)
diff -r1.2 -r1.3 pkgsrc/www/py-meinheld/distinfo
diff -r0 -r1.1 pkgsrc/www/py-meinheld/patches/patch-meinheld_server_picoev__select.c
diff -r1.1 -r1.2 pkgsrc/www/py-meinheld/patches/patch-meinheld_server_util.c
diff -r1.1 -r1.2 pkgsrc/www/py-meinheld/patches/patch-setup.py
cvs diff -r1.2 -r1.3 pkgsrc/www/py-meinheld/distinfo (expand / switch to unified diff)

--- pkgsrc/www/py-meinheld/distinfo 2017/09/30 12:51:57 1.2
+++ pkgsrc/www/py-meinheld/distinfo 2017/10/13 14:51:16 1.3
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.2 2017/09/30 12:51:57 wiz Exp $ 1$NetBSD: distinfo,v 1.3 2017/10/13 14:51:16 jperkin Exp $
2 2
3SHA1 (meinheld-0.6.1.tar.gz) = d3b1c307e26e131da5030a18a5d750d788a37893 3SHA1 (meinheld-0.6.1.tar.gz) = d3b1c307e26e131da5030a18a5d750d788a37893
4RMD160 (meinheld-0.6.1.tar.gz) = b8a7a17385b21c0bf6570b7e9c41a5e9934c9ed4 4RMD160 (meinheld-0.6.1.tar.gz) = b8a7a17385b21c0bf6570b7e9c41a5e9934c9ed4
5SHA512 (meinheld-0.6.1.tar.gz) = 02b8c8573c244e92a7dbf86524a7e1c1fe02a7aa1b107fc3d07d02b6ba22d70cbd7ddb6f8f3470db740dba3138ecee36dc2f00dd5d1e63c83435bea0f0344a9b 5SHA512 (meinheld-0.6.1.tar.gz) = 02b8c8573c244e92a7dbf86524a7e1c1fe02a7aa1b107fc3d07d02b6ba22d70cbd7ddb6f8f3470db740dba3138ecee36dc2f00dd5d1e63c83435bea0f0344a9b
6Size (meinheld-0.6.1.tar.gz) = 79703 bytes 6Size (meinheld-0.6.1.tar.gz) = 79703 bytes
7SHA1 (patch-meinheld_server_util.c) = 61d5f8b580002f369d371dc968d502a8f141b912 7SHA1 (patch-meinheld_server_picoev__select.c) = 4d9e5219f30fb7c4b04ed3a2a6390177defe057d
8SHA1 (patch-setup.py) = c0192d15c97fb40d4b6c102a602eab8d07b18626 8SHA1 (patch-meinheld_server_util.c) = fddcc91fd315dc007d61dcd59be5b40edf921985
 9SHA1 (patch-setup.py) = 33d93962e8f2ce329ece5bf6a4e2b6c6403c80fd
File Added: pkgsrc/www/py-meinheld/patches/Attic/patch-meinheld_server_picoev__select.c
$NetBSD: patch-meinheld_server_picoev__select.c,v 1.1 2017/10/13 14:51:16 jperkin Exp $

Fix broken code.

--- 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;
 }
cvs diff -r1.1 -r1.2 pkgsrc/www/py-meinheld/patches/Attic/patch-meinheld_server_util.c (expand / switch to unified diff)

--- pkgsrc/www/py-meinheld/patches/Attic/patch-meinheld_server_util.c 2017/09/30 12:51:57 1.1
+++ pkgsrc/www/py-meinheld/patches/Attic/patch-meinheld_server_util.c 2017/10/13 14:51:16 1.2
@@ -1,35 +1,45 @@ @@ -1,35 +1,45 @@
1$NetBSD: patch-meinheld_server_util.c,v 1.1 2017/09/30 12:51:57 wiz Exp $ 1$NetBSD: patch-meinheld_server_util.c,v 1.2 2017/10/13 14:51:16 jperkin Exp $
2 2
3Add NetBSD support. 3Add NetBSD support.
4 4
5--- meinheld/server/util.c.orig 2015-09-16 12:56:12.000000000 +0000 5--- meinheld/server/util.c.orig 2015-09-16 12:56:12.000000000 +0000
6+++ meinheld/server/util.c 6+++ meinheld/server/util.c
7@@ -7,7 +7,7 @@ setup_listen_sock(int fd) 7@@ -7,7 +7,7 @@ setup_listen_sock(int fd)
8 int on = 1, r = -1; 8 int on = 1, r = -1;
9 #ifdef linux 9 #ifdef linux
10 r = setsockopt(fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &on, sizeof(on)); 10 r = setsockopt(fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &on, sizeof(on));
11-#elif defined(__FreeBSD__) 11-#elif defined(__FreeBSD__)
12+#elif defined(__FreeBSD__) || defined(__NetBSD__) 12+#elif defined(__FreeBSD__) || defined(__NetBSD__)
13 struct accept_filter_arg afa; 13 struct accept_filter_arg afa;
14 bzero(&afa, sizeof(afa)); 14 bzero(&afa, sizeof(afa));
15 strcpy(afa.af_name, "httpready"); 15 strcpy(afa.af_name, "httpready");
16@@ -63,6 +63,9 @@ enable_cork(client_t *client) 16@@ -59,10 +59,13 @@ int
 17 enable_cork(client_t *client)
 18 {
 19 int on = 1;
 20-#ifdef linux
 21+#if defined(linux) || defined(__sun)
17 setsockopt(client->fd, IPPROTO_TCP, TCP_CORK, &on, sizeof(on)); 22 setsockopt(client->fd, IPPROTO_TCP, TCP_CORK, &on, sizeof(on));
18 #elif defined(__APPLE__) || defined(__FreeBSD__) 23 #elif defined(__APPLE__) || defined(__FreeBSD__)
19 setsockopt(client->fd, IPPROTO_TCP, TCP_NOPUSH, &on, sizeof(on)); 24 setsockopt(client->fd, IPPROTO_TCP, TCP_NOPUSH, &on, sizeof(on));
20+#elif defined(__NetBSD__) 25+#elif defined(__NetBSD__)
21+ /* not supported */ 26+ /* not supported */
22+ return 1; 27+ return 1;
23 #else 28 #else
24 #error 29 #error
25 #endif 30 #endif
26@@ -81,6 +84,9 @@ disable_cork(client_t *client) 31@@ -77,10 +80,13 @@ disable_cork(client_t *client)
 32 int off = 0;
 33 int on = 1;
 34 if(client->use_cork == 1){
 35-#ifdef linux
 36+#if defined(linux) || defined(__sun)
27 setsockopt(client->fd, IPPROTO_TCP, TCP_CORK, &off, sizeof(off)); 37 setsockopt(client->fd, IPPROTO_TCP, TCP_CORK, &off, sizeof(off));
28 #elif defined(__APPLE__) || defined(__FreeBSD__) 38 #elif defined(__APPLE__) || defined(__FreeBSD__)
29 setsockopt(client->fd, IPPROTO_TCP, TCP_NOPUSH, &off, sizeof(off)); 39 setsockopt(client->fd, IPPROTO_TCP, TCP_NOPUSH, &off, sizeof(off));
30+#elif defined(__NetBSD__) 40+#elif defined(__NetBSD__)
31+ /* not supported */ 41+ /* not supported */
32+ return 1; 42+ return 1;
33 #else 43 #else
34 #error 44 #error
35 #endif 45 #endif
cvs diff -r1.1 -r1.2 pkgsrc/www/py-meinheld/patches/Attic/patch-setup.py (expand / switch to unified diff)

--- pkgsrc/www/py-meinheld/patches/Attic/patch-setup.py 2017/09/30 12:51:57 1.1
+++ pkgsrc/www/py-meinheld/patches/Attic/patch-setup.py 2017/10/13 14:51:16 1.2
@@ -1,15 +1,26 @@ @@ -1,15 +1,26 @@
1$NetBSD: patch-setup.py,v 1.1 2017/09/30 12:51:57 wiz Exp $ 1$NetBSD: patch-setup.py,v 1.2 2017/10/13 14:51:16 jperkin Exp $
2 2
3Add NetBSD support. 3Add NetBSD support.
4 4
5--- setup.py.orig 2016-11-01 23:46:07.000000000 +0000 5--- setup.py.orig 2016-11-01 23:46:07.000000000 +0000
6+++ setup.py 6+++ setup.py
7@@ -41,6 +41,8 @@ def get_picoev_file(): 7@@ -41,6 +41,10 @@ def get_picoev_file():
8 poller_file = 'meinheld/server/picoev_kqueue.c' 8 poller_file = 'meinheld/server/picoev_kqueue.c'
9 elif "FreeBSD" == platform.system(): 9 elif "FreeBSD" == platform.system():
10 poller_file = 'meinheld/server/picoev_kqueue.c' 10 poller_file = 'meinheld/server/picoev_kqueue.c'
11+ elif "NetBSD" == platform.system(): 11+ elif "NetBSD" == platform.system():
12+ poller_file = 'meinheld/server/picoev_kqueue.c' 12+ poller_file = 'meinheld/server/picoev_kqueue.c'
 13+ elif "SunOS" == platform.system():
 14+ poller_file = 'meinheld/server/picoev_select.c'
13 else: 15 else:
14 print("Sorry, not support .") 16 print("Sorry, not support .")
15 sys.exit(1) 17 sys.exit(1)
 18@@ -90,7 +94,7 @@ setup(name='meinheld',
 19 author_email='yutaka.matsubara@gmail.com',
 20 url='http://meinheld.org',
 21 license='BSD',
 22- platforms='Linux, BSD, Darwin',
 23+ platforms='Linux, BSD, Darwin, SunOS',
 24 packages= ['meinheld'],
 25 install_requires=install_requires,
 26