CVS commit: pkgsrc/sysutils/dbus

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue May 23 15:12:57 UTC 2017

Modified Files:
        pkgsrc/sysutils/dbus: distinfo
Added Files:
        pkgsrc/sysutils/dbus/patches: patch-configure
            patch-dbus_dbus-sysdeps-unix.c

Log Message:
Fix build on SunOS with GCC 7.1


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/sysutils/dbus/distinfo
cvs rdiff -u -r0 -r1.5 pkgsrc/sysutils/dbus/patches/patch-configure
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c

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

Modified files:

Index: pkgsrc/sysutils/dbus/distinfo
diff -u pkgsrc/sysutils/dbus/distinfo:1.79 pkgsrc/sysutils/dbus/distinfo:1.80
--- pkgsrc/sysutils/dbus/distinfo:1.79  Wed Apr 19 12:22:09 2017
+++ pkgsrc/sysutils/dbus/distinfo       Tue May 23 15:12:57 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.79 2017/04/19 12:22:09 wiz Exp $
+$NetBSD: distinfo,v 1.80 2017/05/23 15:12:57 jperkin Exp $
 
 SHA1 (dbus-1.10.18.tar.gz) = f3407dc00075c7a81cce502316aaf536f02ebfea
 RMD160 (dbus-1.10.18.tar.gz) = 9fc2aa4c93543983d8b12d1863b4696891afd866
@@ -7,5 +7,7 @@ Size (dbus-1.10.18.tar.gz) = 1986589 byt
 SHA1 (patch-ak) = ebb0c291297577a9cff246e7bc71412bf6157254
 SHA1 (patch-al) = c70be84ae79698cc4d83087427646bfb0500f194
 SHA1 (patch-am) = ed334bc76911c9db9f5472c58fb762c56255c5b4
+SHA1 (patch-configure) = 9dee6306aa07b60449a0f9f0f1ea3dccbc70dcb4
+SHA1 (patch-dbus_dbus-sysdeps-unix.c) = 39767dd35befe916509ab9eff790aee706caa089
 SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 9c967cdac585220a3e65443dc9642e7d4478567c
 SHA1 (patch-tools_dbus-print-message.c) = 96267d3cff2c5207911615735748ef81604a69ec

Added files:

Index: pkgsrc/sysutils/dbus/patches/patch-configure
diff -u /dev/null pkgsrc/sysutils/dbus/patches/patch-configure:1.5
--- /dev/null   Tue May 23 15:12:57 2017
+++ pkgsrc/sysutils/dbus/patches/patch-configure        Tue May 23 15:12:57 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.5 2017/05/23 15:12:57 jperkin Exp $
+
+Don't blanket define _XOPEN_SOURCE on SunOS, patch where required instead.
+
+--- configure.orig     2017-04-05 15:25:13.000000000 +0000
++++ configure
+@@ -23169,7 +23169,7 @@ case $host_os in
+         # ... this opt-in to get sockaddr_in6 and sockaddr_storage...
+         CFLAGS="$CFLAGS -D__EXTENSIONS__"
+         # ... and this opt-in to get file descriptor passing support
+-        CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
++        #CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
+         ;;
+ esac
+ 

Index: pkgsrc/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c
diff -u /dev/null pkgsrc/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c:1.4
--- /dev/null   Tue May 23 15:12:57 2017
+++ pkgsrc/sysutils/dbus/patches/patch-dbus_dbus-sysdeps-unix.c Tue May 23 15:12:57 2017
@@ -0,0 +1,19 @@
+$NetBSD: patch-dbus_dbus-sysdeps-unix.c,v 1.4 2017/05/23 15:12:57 jperkin Exp $
+
+Support _XOPEN_SOURCE requirements on SunOS with different compiler defaults.
+
+--- dbus/dbus-sysdeps-unix.c.orig      2017-02-16 13:46:23.000000000 +0000
++++ dbus/dbus-sysdeps-unix.c
+@@ -24,6 +24,12 @@
+ 
+ #include <config.h>
+ 
++#if defined(__sun) && __STDC_VERSION__ - 0 < 199901L
++#define       _XOPEN_SOURCE   500
++#else
++#define       _XOPEN_SOURCE   600
++#endif
++
+ #include "dbus-internals.h"
+ #include "dbus-sysdeps.h"
+ #include "dbus-sysdeps-unix.h"