CVS commit: pkgsrc/net/haproxy

["Juraj Lutter" <otis%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   otis
Date:           Sun Dec  6 17:42:28 UTC 2020

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

Log Message:
haproxy: Fix build on SmartOS

Fix build on SmartOS by adding proper _XOPEN_SOURCE et al. #define's


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/net/haproxy/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/haproxy/patches/patch-src_haproxy.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/haproxy/patches/patch-src_proto__sockpair.c
cvs rdiff -u -r0 -r1.1 pkgsrc/net/haproxy/patches/patch-src_sock.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/distinfo
diff -u pkgsrc/net/haproxy/distinfo:1.62 pkgsrc/net/haproxy/distinfo:1.63
--- pkgsrc/net/haproxy/distinfo:1.62    Sun Dec  6 11:22:53 2020
+++ pkgsrc/net/haproxy/distinfo Sun Dec  6 17:42:28 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2020/12/06 11:22:53 adam Exp $
+$NetBSD: distinfo,v 1.63 2020/12/06 17:42:28 otis Exp $
 
 SHA1 (haproxy-2.3.2.tar.gz) = 12de35c18989b92ec27ec560ab51ce40993c601d
 RMD160 (haproxy-2.3.2.tar.gz) = fb4c5fce40e3e428433a310800e1323fad9c2c49
@@ -6,5 +6,6 @@ SHA512 (haproxy-2.3.2.tar.gz) = ffabf499
 Size (haproxy-2.3.2.tar.gz) = 2903983 bytes
 SHA1 (patch-Makefile) = fcb2de85189526ae42ccf0b789789ee9b834f375
 SHA1 (patch-src_cli.c) = 4bc5cf0116df121ac4c3c38b8f962c3a62d536e5
-SHA1 (patch-src_haproxy.c) = badb172013541087d84f03726ea928c6f5634dc3
-SHA1 (patch-src_proto__sockpair.c) = 1f2a318f3b7c74a191774f8bb3511c23401c10ef
+SHA1 (patch-src_haproxy.c) = f0cd9d00f7d970bd3efa751b1584657ed14bcb7d
+SHA1 (patch-src_proto__sockpair.c) = 4d389c1f12d060517b8038ada9f0f4b5c87cf519
+SHA1 (patch-src_sock.c) = a27ab68da8f8c26881fd61ce8ffffed2bf251e32

Index: pkgsrc/net/haproxy/patches/patch-src_haproxy.c
diff -u pkgsrc/net/haproxy/patches/patch-src_haproxy.c:1.2 pkgsrc/net/haproxy/patches/patch-src_haproxy.c:1.3
--- pkgsrc/net/haproxy/patches/patch-src_haproxy.c:1.2  Wed Jul 25 13:51:18 2018
+++ pkgsrc/net/haproxy/patches/patch-src_haproxy.c      Sun Dec  6 17:42:28 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_haproxy.c,v 1.2 2018/07/25 13:51:18 jperkin Exp $
+$NetBSD: patch-src_haproxy.c,v 1.3 2020/12/06 17:42:28 otis Exp $
 
 Special handling for XPG4_2 on SunOS.
 
---- src/haproxy.c.orig 2018-06-27 14:27:32.000000000 +0000
+--- src/haproxy.c.orig 2020-11-28 15:51:33.000000000 +0000
 +++ src/haproxy.c
-@@ -26,6 +26,13 @@
+@@ -26,6 +26,14 @@
   */
  
  #define _GNU_SOURCE
@@ -14,6 +14,7 @@ Special handling for XPG4_2 on SunOS.
 +#  else
 +#define _XOPEN_SOURCE 600
 +#  endif
++#define _XOPEN_SOURCE_EXTENDED 1
 +#endif
  #include <stdio.h>
  #include <stdlib.h>

Index: pkgsrc/net/haproxy/patches/patch-src_proto__sockpair.c
diff -u pkgsrc/net/haproxy/patches/patch-src_proto__sockpair.c:1.1 pkgsrc/net/haproxy/patches/patch-src_proto__sockpair.c:1.2
--- pkgsrc/net/haproxy/patches/patch-src_proto__sockpair.c:1.1  Sun Aug 11 09:09:41 2019
+++ pkgsrc/net/haproxy/patches/patch-src_proto__sockpair.c      Sun Dec  6 17:42:28 2020
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_proto__sockpair.c,v 1.1 2019/08/11 09:09:41 maya Exp $
+$NetBSD: patch-src_proto__sockpair.c,v 1.2 2020/12/06 17:42:28 otis Exp $
+
+Special handling for XPG4_2 on SunOS.
 
 --- src/proto_sockpair.c.orig  2019-07-23 13:21:26.000000000 +0000
 +++ src/proto_sockpair.c

Added files:

Index: pkgsrc/net/haproxy/patches/patch-src_sock.c
diff -u /dev/null pkgsrc/net/haproxy/patches/patch-src_sock.c:1.1
--- /dev/null   Sun Dec  6 17:42:28 2020
+++ pkgsrc/net/haproxy/patches/patch-src_sock.c Sun Dec  6 17:42:28 2020
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_sock.c,v 1.1 2020/12/06 17:42:28 otis Exp $
+
+Special handling for XPG4_2 on SunOS.
+
+--- src/sock.c.orig    2020-11-28 15:51:33.000000000 +0000
++++ src/sock.c
+@@ -11,6 +11,14 @@
+  */
+ 
+ #define _GNU_SOURCE
++#if defined(__sun) && !defined(_XOPEN_SOURCE)
++#  if (__STDC_VERSION__-0 < 199901L)
++#define _XOPEN_SOURCE 500
++#  else
++#define _XOPEN_SOURCE 600
++#  endif
++#define _XOPEN_SOURCE_EXTENDED 1
++#endif
+ #include <ctype.h>
+ #include <errno.h>
+ #include <fcntl.h>