CVS commit: pkgsrc/www/py-uwsgi

["Sebastian Wiedenroth" <wiedi%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiedi
Date:           Sun May  5 17:55:34 UTC 2019

Modified Files:
        pkgsrc/www/py-uwsgi: Makefile distinfo
        pkgsrc/www/py-uwsgi/patches: patch-uwsgi.h

Log Message:
py-uwsgi: fix build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/www/py-uwsgi/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/py-uwsgi/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/py-uwsgi/patches/patch-uwsgi.h

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-uwsgi/Makefile
diff -u pkgsrc/www/py-uwsgi/Makefile:1.43 pkgsrc/www/py-uwsgi/Makefile:1.44
--- pkgsrc/www/py-uwsgi/Makefile:1.43   Wed Mar  6 13:07:58 2019
+++ pkgsrc/www/py-uwsgi/Makefile        Sun May  5 17:55:34 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2019/03/06 13:07:58 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2019/05/05 17:55:34 wiedi Exp $
 
 DISTNAME=      uwsgi-2.0.18
+PKGREVISION=   1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=u/uWSGI/}

Index: pkgsrc/www/py-uwsgi/distinfo
diff -u pkgsrc/www/py-uwsgi/distinfo:1.35 pkgsrc/www/py-uwsgi/distinfo:1.36
--- pkgsrc/www/py-uwsgi/distinfo:1.35   Wed Mar  6 13:07:58 2019
+++ pkgsrc/www/py-uwsgi/distinfo        Sun May  5 17:55:34 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2019/03/06 13:07:58 joerg Exp $
+$NetBSD: distinfo,v 1.36 2019/05/05 17:55:34 wiedi Exp $
 
 SHA1 (8253573a0db1c7d7b9d968d55669e70e40355bed.zip) = 7cf7aca4b0e5e64ebe5bec813f4f48c5b009eac5
 RMD160 (8253573a0db1c7d7b9d968d55669e70e40355bed.zip) = b213ea821a3c12a6c092615ce02a3dd4bbaff0c6
@@ -10,5 +10,5 @@ SHA512 (uwsgi-2.0.18.tar.gz) = 656170327
 Size (uwsgi-2.0.18.tar.gz) = 801555 bytes
 SHA1 (patch-base.ini) = 1c5d7693e6c8011e6cc34f5f5d203584c985eb30
 SHA1 (patch-core_logging.c) = caa986238142d24725df119cbecda1b9e3223d7e
-SHA1 (patch-uwsgi.h) = 64b5f6ea310bf6c65c1f546e160fcd0bd94a3808
+SHA1 (patch-uwsgi.h) = 42301a49b3a030c60627559750ed140acc91b275
 SHA1 (patch-uwsgiconfig.py) = aab47457f2fafb0206a53913ef3777700175d020

Index: pkgsrc/www/py-uwsgi/patches/patch-uwsgi.h
diff -u pkgsrc/www/py-uwsgi/patches/patch-uwsgi.h:1.6 pkgsrc/www/py-uwsgi/patches/patch-uwsgi.h:1.7
--- pkgsrc/www/py-uwsgi/patches/patch-uwsgi.h:1.6       Mon Apr  6 02:35:54 2015
+++ pkgsrc/www/py-uwsgi/patches/patch-uwsgi.h   Sun May  5 17:55:34 2019
@@ -1,10 +1,11 @@
-$NetBSD: patch-uwsgi.h,v 1.6 2015/04/06 02:35:54 rodent Exp $
+$NetBSD: patch-uwsgi.h,v 1.7 2019/05/05 17:55:34 wiedi Exp $
 
 Avoid clash with sys/user.h inclusion in logging.c on DragonFly BSD.
+Avoid using "sun" which breaks on SunOS
 
---- uwsgi.h.orig       2015-03-17 07:34:34.000000000 +0000
+--- uwsgi.h.orig       2019-02-09 14:48:07.000000000 +0000
 +++ uwsgi.h
-@@ -327,6 +327,10 @@ extern int pivot_root(const char *new_ro
+@@ -322,6 +322,10 @@ extern int pivot_root(const char *new_ro
  #elif defined(__CYGWIN__)
  #elif defined(__HURD__)
  #else
@@ -15,3 +16,12 @@ Avoid clash with sys/user.h inclusion in
  #include <sys/event.h>
  #endif
  
+@@ -1629,7 +1633,7 @@ struct wsgi_request {
+       union address {
+               struct sockaddr_in sin;
+               struct sockaddr_in6 sin6;
+-              struct sockaddr_un sun;
++              struct sockaddr_un so_sun;
+       } client_addr;
+ };
+