CVS commit: pkgsrc/net/haproxy

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Aug 11 09:09:41 UTC 2019

Modified Files:
        pkgsrc/net/haproxy: Makefile distinfo
Added Files:
        pkgsrc/net/haproxy/patches: patch-src_proto__sockpair.c

Log Message:
haproxy: re-do patch to enable XPG4.2 on SunOS.

Define _XOPEN_SOURCE 500/600 based on C mode, as we do in other patches
for this package.

>From wilbury and jperkin, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/net/haproxy/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/net/haproxy/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/haproxy/patches/patch-src_proto__sockpair.c

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

Modified files:

Index: pkgsrc/net/haproxy/Makefile
diff -u pkgsrc/net/haproxy/Makefile:1.48 pkgsrc/net/haproxy/Makefile:1.49
--- pkgsrc/net/haproxy/Makefile:1.48    Sat Aug 10 20:45:56 2019
+++ pkgsrc/net/haproxy/Makefile Sun Aug 11 09:09:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2019/08/10 20:45:56 maya Exp $
+# $NetBSD: Makefile,v 1.49 2019/08/11 09:09:41 maya Exp $
 
 DISTNAME=      haproxy-2.0.3
 CATEGORIES=    net www
@@ -57,7 +57,6 @@ TARGET=       linux2628
 TARGET=        generic
 .endif
 
-CFLAGS.SunOS+=         -D_XPG4_2
 LIBS.SunOS+=           -lxnet
 
 post-install:

Index: pkgsrc/net/haproxy/distinfo
diff -u pkgsrc/net/haproxy/distinfo:1.42 pkgsrc/net/haproxy/distinfo:1.43
--- pkgsrc/net/haproxy/distinfo:1.42    Sat Aug  3 20:37:19 2019
+++ pkgsrc/net/haproxy/distinfo Sun Aug 11 09:09:41 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2019/08/03 20:37:19 morr Exp $
+$NetBSD: distinfo,v 1.43 2019/08/11 09:09:41 maya Exp $
 
 SHA1 (haproxy-2.0.3.tar.gz) = 32426b727f88a90b0e8ed04190ba1d138d535394
 RMD160 (haproxy-2.0.3.tar.gz) = e2c94917923852f7df329bd69a59cd409639259e
@@ -7,3 +7,4 @@ Size (haproxy-2.0.3.tar.gz) = 2534678 by
 SHA1 (patch-Makefile) = 790242ebde13ac1a9d95a16cba29e30a9bccd57c
 SHA1 (patch-src_cli.c) = 4bc5cf0116df121ac4c3c38b8f962c3a62d536e5
 SHA1 (patch-src_haproxy.c) = badb172013541087d84f03726ea928c6f5634dc3
+SHA1 (patch-src_proto__sockpair.c) = 1f2a318f3b7c74a191774f8bb3511c23401c10ef

Added files:

Index: pkgsrc/net/haproxy/patches/patch-src_proto__sockpair.c
diff -u /dev/null pkgsrc/net/haproxy/patches/patch-src_proto__sockpair.c:1.1
--- /dev/null   Sun Aug 11 09:09:41 2019
+++ pkgsrc/net/haproxy/patches/patch-src_proto__sockpair.c      Sun Aug 11 09:09:41 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_proto__sockpair.c,v 1.1 2019/08/11 09:09:41 maya Exp $
+
+--- src/proto_sockpair.c.orig  2019-07-23 13:21:26.000000000 +0000
++++ src/proto_sockpair.c
+@@ -10,6 +10,14 @@
+  *
+  */
+ 
++#if defined(__sun) && !defined(_XOPEN_SOURCE)
++#  if (__STDC_VERSION__-0 < 199901L)
++#define _XOPEN_SOURCE 500
++#  else
++#define _XOPEN_SOURCE 600
++#  endif
++#endif
++
+ #include <ctype.h>
+ #include <errno.h>
+ #include <fcntl.h>