CVS commit: pkgsrc/www/py-meinheld

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Oct 13 14:51:16 UTC 2017

Modified Files:
        pkgsrc/www/py-meinheld: distinfo
        pkgsrc/www/py-meinheld/patches: patch-meinheld_server_util.c
            patch-setup.py
Added Files:
        pkgsrc/www/py-meinheld/patches: patch-meinheld_server_picoev__select.c

Log Message:
py-meinheld: Support SunOS, based on PR#52613


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/py-meinheld/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/py-meinheld/patches/patch-meinheld_server_picoev__select.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/py-meinheld/patches/patch-meinheld_server_util.c \
    pkgsrc/www/py-meinheld/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/py-meinheld/distinfo
diff -u pkgsrc/www/py-meinheld/distinfo:1.2 pkgsrc/www/py-meinheld/distinfo:1.3
--- pkgsrc/www/py-meinheld/distinfo:1.2 Sat Sep 30 12:51:57 2017
+++ pkgsrc/www/py-meinheld/distinfo     Fri Oct 13 14:51:16 2017
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2017/09/30 12:51:57 wiz Exp $
+$NetBSD: distinfo,v 1.3 2017/10/13 14:51:16 jperkin 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_util.c) = 61d5f8b580002f369d371dc968d502a8f141b912
-SHA1 (patch-setup.py) = c0192d15c97fb40d4b6c102a602eab8d07b18626
+SHA1 (patch-meinheld_server_picoev__select.c) = 4d9e5219f30fb7c4b04ed3a2a6390177defe057d
+SHA1 (patch-meinheld_server_util.c) = fddcc91fd315dc007d61dcd59be5b40edf921985
+SHA1 (patch-setup.py) = 33d93962e8f2ce329ece5bf6a4e2b6c6403c80fd

Index: pkgsrc/www/py-meinheld/patches/patch-meinheld_server_util.c
diff -u pkgsrc/www/py-meinheld/patches/patch-meinheld_server_util.c:1.1 pkgsrc/www/py-meinheld/patches/patch-meinheld_server_util.c:1.2
--- pkgsrc/www/py-meinheld/patches/patch-meinheld_server_util.c:1.1     Sat Sep 30 12:51:57 2017
+++ pkgsrc/www/py-meinheld/patches/patch-meinheld_server_util.c Fri Oct 13 14:51:16 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-meinheld_server_util.c,v 1.1 2017/09/30 12:51:57 wiz Exp $
+$NetBSD: patch-meinheld_server_util.c,v 1.2 2017/10/13 14:51:16 jperkin Exp $
 
 Add NetBSD support.
 
@@ -13,7 +13,12 @@ Add NetBSD support.
      struct accept_filter_arg afa;
      bzero(&afa, sizeof(afa));
      strcpy(afa.af_name, "httpready");
-@@ -63,6 +63,9 @@ enable_cork(client_t *client)
+@@ -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));
@@ -23,7 +28,12 @@ Add NetBSD support.
  #else
  #error
  #endif
-@@ -81,6 +84,9 @@ disable_cork(client_t *client)
+@@ -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));
Index: pkgsrc/www/py-meinheld/patches/patch-setup.py
diff -u pkgsrc/www/py-meinheld/patches/patch-setup.py:1.1 pkgsrc/www/py-meinheld/patches/patch-setup.py:1.2
--- pkgsrc/www/py-meinheld/patches/patch-setup.py:1.1   Sat Sep 30 12:51:57 2017
+++ pkgsrc/www/py-meinheld/patches/patch-setup.py       Fri Oct 13 14:51:16 2017
@@ -1,15 +1,26 @@
-$NetBSD: patch-setup.py,v 1.1 2017/09/30 12:51:57 wiz Exp $
+$NetBSD: patch-setup.py,v 1.2 2017/10/13 14:51:16 jperkin Exp $
 
 Add NetBSD support.
 
 --- setup.py.orig      2016-11-01 23:46:07.000000000 +0000
 +++ setup.py
-@@ -41,6 +41,8 @@ def get_picoev_file():
+@@ -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@localhost',
+     url='http://meinheld.org',
+     license='BSD',
+-    platforms='Linux, BSD, Darwin',
++    platforms='Linux, BSD, Darwin, SunOS',
+     packages= ['meinheld'],
+     install_requires=install_requires,
+ 

Added files:

Index: pkgsrc/www/py-meinheld/patches/patch-meinheld_server_picoev__select.c
diff -u /dev/null pkgsrc/www/py-meinheld/patches/patch-meinheld_server_picoev__select.c:1.1
--- /dev/null   Fri Oct 13 14:51:16 2017
+++ pkgsrc/www/py-meinheld/patches/patch-meinheld_server_picoev__select.c       Fri Oct 13 14:51:16 2017
@@ -0,0 +1,15 @@
+$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;
+ }
+