CVS commit: pkgsrc/net/haproxy

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Apr  5 09:18:39 UTC 2018

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

Log Message:
haproxy: Rework SunOS XOPEN_SOURCE handling.

This package explicitly avoids C99-isms and fails to build in C99 mode with
older compilers, even though it works fine with newer compilers that default
to C99 mode.  So, we need to explicitly request XPG4_2 if and only if the
compiler does not default to C99, and must not require C99.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/net/haproxy/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/haproxy/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/haproxy/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/net/haproxy/patches/patch-src_cli.c \
    pkgsrc/net/haproxy/patches/patch-src_haproxy.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.40 pkgsrc/net/haproxy/Makefile:1.41
--- pkgsrc/net/haproxy/Makefile:1.40    Wed Feb 14 12:56:33 2018
+++ pkgsrc/net/haproxy/Makefile Thu Apr  5 09:18:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2018/02/14 12:56:33 adam Exp $
+# $NetBSD: Makefile,v 1.41 2018/04/05 09:18:39 jperkin Exp $
 
 DISTNAME=      haproxy-1.8.4
 CATEGORIES=    net www
@@ -9,7 +9,7 @@ HOMEPAGE=       http://haproxy.org/
 COMMENT=       Reliable, high performance TCP/HTTP load balancer
 LICENSE=       gnu-gpl-v2
 
-USE_LANGUAGES=         c99
+USE_LANGUAGES=         c
 USE_TOOLS+=            gmake
 BUILD_MAKE_FLAGS+=     ADDLIB=${COMPILER_RPATH_FLAG}${PREFIX}/lib
 BUILD_MAKE_FLAGS+=     TARGET=${TARGET}

Index: pkgsrc/net/haproxy/distinfo
diff -u pkgsrc/net/haproxy/distinfo:1.34 pkgsrc/net/haproxy/distinfo:1.35
--- pkgsrc/net/haproxy/distinfo:1.34    Wed Feb 14 12:56:33 2018
+++ pkgsrc/net/haproxy/distinfo Thu Apr  5 09:18:39 2018
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.34 2018/02/14 12:56:33 adam Exp $
+$NetBSD: distinfo,v 1.35 2018/04/05 09:18:39 jperkin Exp $
 
 SHA1 (haproxy-1.8.4.tar.gz) = c8c2cd0a9832a64150ce63dd3638bfa989172b57
 RMD160 (haproxy-1.8.4.tar.gz) = 0cb99777fa787ca09e68f87091053ab4120a4d00
 SHA512 (haproxy-1.8.4.tar.gz) = 618a03062e832260249610d90b3a9ebd171d8a1b0921903f5f3447484bab552ef9399e431417cf3cf4927ac345fe4d2a345ee8513e209b22e0700f5b1edbf86c
 Size (haproxy-1.8.4.tar.gz) = 2049789 bytes
-SHA1 (patch-Makefile) = f82960b3ef0f4a2752fa06a04ad3b94a2d9908ae
+SHA1 (patch-Makefile) = d146acadbb16fe00d7c8a92ef706e8d8f73e5da6
+SHA1 (patch-src_cli.c) = f540a2e5a9374df29398d84529911bb5ad95bab5
+SHA1 (patch-src_haproxy.c) = 2de3aa4b05528933d39e63506eb7d09448a2b9e8

Index: pkgsrc/net/haproxy/patches/patch-Makefile
diff -u pkgsrc/net/haproxy/patches/patch-Makefile:1.3 pkgsrc/net/haproxy/patches/patch-Makefile:1.4
--- pkgsrc/net/haproxy/patches/patch-Makefile:1.3       Thu Feb  8 19:12:50 2018
+++ pkgsrc/net/haproxy/patches/patch-Makefile   Thu Apr  5 09:18:39 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-Makefile,v 1.3 2018/02/08 19:12:50 jperkin Exp $
+$NetBSD: patch-Makefile,v 1.4 2018/04/05 09:18:39 jperkin Exp $
 
-Specify C99.
+Do not hardcode _XOPEN_SOURCE.
 Skip installing unnecessary documentation.
 
 --- Makefile.orig      2017-12-30 17:13:19.000000000 +0000
@@ -10,7 +10,7 @@ Skip installing unnecessary documentatio
    # We also enable getaddrinfo() which works since solaris 8.
    USE_POLL       = implicit
 -  TARGET_CFLAGS  = -fomit-frame-pointer -DFD_SETSIZE=65536 -D_REENTRANT -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
-+  TARGET_CFLAGS  = -DFD_SETSIZE=65536 -D_REENTRANT -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
++  TARGET_CFLAGS  = -DFD_SETSIZE=65536 -D_REENTRANT -D__EXTENSIONS__ -D_XOPEN_SOURCE_EXTENDED=1
    TARGET_LDFLAGS = -lnsl -lsocket
    USE_TPROXY     = implicit
    USE_LIBCRYPT    = implicit

Added files:

Index: pkgsrc/net/haproxy/patches/patch-src_cli.c
diff -u /dev/null pkgsrc/net/haproxy/patches/patch-src_cli.c:1.1
--- /dev/null   Thu Apr  5 09:18:39 2018
+++ pkgsrc/net/haproxy/patches/patch-src_cli.c  Thu Apr  5 09:18:39 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_cli.c,v 1.1 2018/04/05 09:18:39 jperkin Exp $
+
+Special handling for XPG4_2 on SunOS.
+
+--- src/cli.c.orig     2018-02-08 13:05:15.000000000 +0000
++++ src/cli.c
+@@ -11,6 +11,9 @@
+  *
+  */
+ 
++#if defined(__sun) && !defined(_XOPEN_SOURCE) && (__STDC_VERSION__-0 < 199901L)
++#define _XOPEN_SOURCE
++#endif
+ #include <ctype.h>
+ #include <errno.h>
+ #include <fcntl.h>
Index: pkgsrc/net/haproxy/patches/patch-src_haproxy.c
diff -u /dev/null pkgsrc/net/haproxy/patches/patch-src_haproxy.c:1.1
--- /dev/null   Thu Apr  5 09:18:39 2018
+++ pkgsrc/net/haproxy/patches/patch-src_haproxy.c      Thu Apr  5 09:18:39 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_haproxy.c,v 1.1 2018/04/05 09:18:39 jperkin Exp $
+
+Special handling for XPG4_2 on SunOS.
+
+--- src/haproxy.c.orig 2018-02-08 13:05:15.000000000 +0000
++++ src/haproxy.c
+@@ -26,6 +26,9 @@
+  */
+ 
+ #define _GNU_SOURCE
++#if defined(__sun) && !defined(_XOPEN_SOURCE) && (__STDC_VERSION__-0 < 199901L)
++#define _XOPEN_SOURCE
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>