CVS commit: pkgsrc/www/py-curl

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Apr 18 15:06:22 UTC 2017

Modified Files:
        pkgsrc/www/py-curl: distinfo
Added Files:
        pkgsrc/www/py-curl/patches: patch-src_easy.c

Log Message:
Avoid "sun" definition.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/py-curl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/py-curl/patches/patch-src_easy.c

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-curl/distinfo
diff -u pkgsrc/www/py-curl/distinfo:1.21 pkgsrc/www/py-curl/distinfo:1.22
--- pkgsrc/www/py-curl/distinfo:1.21    Wed Apr  5 17:56:18 2017
+++ pkgsrc/www/py-curl/distinfo Tue Apr 18 15:06:22 2017
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.21 2017/04/05 17:56:18 adam Exp $
+$NetBSD: distinfo,v 1.22 2017/04/18 15:06:22 jperkin Exp $
 
 SHA1 (pycurl-7.43.0.tar.gz) = e8e9c7e9ae91ae32096b8c86cfc7d49976a66d1b
 RMD160 (pycurl-7.43.0.tar.gz) = 887605e420279d92862187e7f989fb032c3e08ed
 SHA512 (pycurl-7.43.0.tar.gz) = 7442462c74c19964b9d72976e9b92bf68bb37debc1401bc399590bea42704065da13d6de710e795eeae79a4651b9a08841d50454243cb0994c7eb1c1bab233a5
 Size (pycurl-7.43.0.tar.gz) = 182522 bytes
 SHA1 (patch-setup.py) = 41722b45efbbc3e3b65f88354b647b4c6304ab50
+SHA1 (patch-src_easy.c) = ccb16c66536b0ec2df96346bf008b9030fb6d1d6

Added files:

Index: pkgsrc/www/py-curl/patches/patch-src_easy.c
diff -u /dev/null pkgsrc/www/py-curl/patches/patch-src_easy.c:1.1
--- /dev/null   Tue Apr 18 15:06:22 2017
+++ pkgsrc/www/py-curl/patches/patch-src_easy.c Tue Apr 18 15:06:22 2017
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_easy.c,v 1.1 2017/04/18 15:06:22 jperkin Exp $
+
+Avoid "sun" definition.
+
+--- src/easy.c.orig    2016-02-04 04:09:31.000000000 +0000
++++ src/easy.c
+@@ -653,12 +653,12 @@ convert_protocol_address(struct sockaddr
+ #if !defined(WIN32)
+     case AF_UNIX:
+         {
+-            struct sockaddr_un* sun = (struct sockaddr_un*)saddr;
++            struct sockaddr_un* sockun = (struct sockaddr_un*)saddr;
+ 
+ #if PY_MAJOR_VERSION >= 3
+-            res_obj = Py_BuildValue("y", sun->sun_path);
++            res_obj = Py_BuildValue("y", sockun->sun_path);
+ #else
+-            res_obj = Py_BuildValue("s", sun->sun_path);
++            res_obj = Py_BuildValue("s", sockun->sun_path);
+ #endif
+         }
+         break;