CVS commit: pkgsrc/net/haproxy

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Dec 10 09:34:22 UTC 2020

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

Log Message:
haproxy: Don't set _XOPEN_SOURCE_EXTENDED=1

This breaks the _XOPEN_SOURCE logic, forcing XPG4v2 to be selected regardless
of what _XOPEN_SOURCE is set to.  Fixes SunOS build.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/net/haproxy/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/haproxy/patches/patch-src_haproxy.c
cvs rdiff -u -r1.1 -r1.2 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.63 pkgsrc/net/haproxy/distinfo:1.64
--- pkgsrc/net/haproxy/distinfo:1.63    Sun Dec  6 17:42:28 2020
+++ pkgsrc/net/haproxy/distinfo Thu Dec 10 09:34:21 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.63 2020/12/06 17:42:28 otis Exp $
+$NetBSD: distinfo,v 1.64 2020/12/10 09:34:21 jperkin Exp $
 
 SHA1 (haproxy-2.3.2.tar.gz) = 12de35c18989b92ec27ec560ab51ce40993c601d
 RMD160 (haproxy-2.3.2.tar.gz) = fb4c5fce40e3e428433a310800e1323fad9c2c49
@@ -6,6 +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) = f0cd9d00f7d970bd3efa751b1584657ed14bcb7d
+SHA1 (patch-src_haproxy.c) = a466acb853b5018b70571d0a03b9d28ed9245d06
 SHA1 (patch-src_proto__sockpair.c) = 4d389c1f12d060517b8038ada9f0f4b5c87cf519
-SHA1 (patch-src_sock.c) = a27ab68da8f8c26881fd61ce8ffffed2bf251e32
+SHA1 (patch-src_sock.c) = fd573e97669cfc02ed446f99d84464f251253f06

Index: pkgsrc/net/haproxy/patches/patch-src_haproxy.c
diff -u pkgsrc/net/haproxy/patches/patch-src_haproxy.c:1.3 pkgsrc/net/haproxy/patches/patch-src_haproxy.c:1.4
--- pkgsrc/net/haproxy/patches/patch-src_haproxy.c:1.3  Sun Dec  6 17:42:28 2020
+++ pkgsrc/net/haproxy/patches/patch-src_haproxy.c      Thu Dec 10 09:34:21 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_haproxy.c,v 1.3 2020/12/06 17:42:28 otis Exp $
+$NetBSD: patch-src_haproxy.c,v 1.4 2020/12/10 09:34:21 jperkin Exp $
 
 Special handling for XPG4_2 on SunOS.
 
 --- src/haproxy.c.orig 2020-11-28 15:51:33.000000000 +0000
 +++ src/haproxy.c
-@@ -26,6 +26,14 @@
+@@ -26,6 +26,13 @@
   */
  
  #define _GNU_SOURCE
@@ -14,7 +14,6 @@ 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_sock.c
diff -u pkgsrc/net/haproxy/patches/patch-src_sock.c:1.1 pkgsrc/net/haproxy/patches/patch-src_sock.c:1.2
--- pkgsrc/net/haproxy/patches/patch-src_sock.c:1.1     Sun Dec  6 17:42:28 2020
+++ pkgsrc/net/haproxy/patches/patch-src_sock.c Thu Dec 10 09:34:21 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_sock.c,v 1.1 2020/12/06 17:42:28 otis Exp $
+$NetBSD: patch-src_sock.c,v 1.2 2020/12/10 09:34:21 jperkin 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 @@
+@@ -11,6 +11,13 @@
   */
  
  #define _GNU_SOURCE
@@ -14,7 +14,6 @@ Special handling for XPG4_2 on SunOS.
 +#  else
 +#define _XOPEN_SOURCE 600
 +#  endif
-+#define _XOPEN_SOURCE_EXTENDED 1
 +#endif
  #include <ctype.h>
  #include <errno.h>