pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/py-uwsgi py-uwsgi: fix build on SunOS



details:   https://anonhg.NetBSD.org/pkgsrc/rev/91769330fa9f
branches:  trunk
changeset: 395336:91769330fa9f
user:      wiedi <wiedi%pkgsrc.org@localhost>
date:      Sun May 05 17:55:34 2019 +0000

description:
py-uwsgi: fix build on SunOS

diffstat:

 www/py-uwsgi/Makefile              |   3 ++-
 www/py-uwsgi/distinfo              |   4 ++--
 www/py-uwsgi/patches/patch-uwsgi.h |  16 +++++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diffs (59 lines):

diff -r 05251d4df3f5 -r 91769330fa9f www/py-uwsgi/Makefile
--- a/www/py-uwsgi/Makefile     Sun May 05 17:46:51 2019 +0000
+++ b/www/py-uwsgi/Makefile     Sun May 05 17:55:34 2019 +0000
@@ -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/}
diff -r 05251d4df3f5 -r 91769330fa9f www/py-uwsgi/distinfo
--- a/www/py-uwsgi/distinfo     Sun May 05 17:46:51 2019 +0000
+++ b/www/py-uwsgi/distinfo     Sun May 05 17:55:34 2019 +0000
@@ -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 @@
 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
diff -r 05251d4df3f5 -r 91769330fa9f www/py-uwsgi/patches/patch-uwsgi.h
--- a/www/py-uwsgi/patches/patch-uwsgi.h        Sun May 05 17:46:51 2019 +0000
+++ b/www/py-uwsgi/patches/patch-uwsgi.h        Sun May 05 17:55:34 2019 +0000
@@ -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 @@
  #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;
+ };
+ 



Home | Main Index | Thread Index | Old Index