CVS commit: [pkgsrc-2017Q1] pkgsrc/security/libassuan2

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sun May 28 08:44:18 UTC 2017

Modified Files:
        pkgsrc/security/libassuan2 [pkgsrc-2017Q1]: distinfo
Added Files:
        pkgsrc/security/libassuan2/patches [pkgsrc-2017Q1]: patch-configure
            patch-src_assuan-uds.c

Log Message:
Pullup ticket #5466 - requested by sevan
security/libassuan2: build fix for SunOS

Revisions pulled up:
- security/libassuan2/distinfo                                  1.11
- security/libassuan2/patches/patch-configure                   1.1
- security/libassuan2/patches/patch-src_assuan-uds.c            1.1

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Thu May 25 11:49:05 UTC 2017

   Modified Files:
           pkgsrc/security/libassuan2: distinfo
   Added Files:
           pkgsrc/security/libassuan2/patches: patch-configure
               patch-src_assuan-uds.c

   Log Message:
   Handle _XOPEN_SOURCE correctly on SunOS.

   To generate a diff of this commit:
   cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/libassuan2/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/security/libassuan2/patches/patch-configure \
       pkgsrc/security/libassuan2/patches/patch-src_assuan-uds.c


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.6.1 pkgsrc/security/libassuan2/distinfo
cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/security/libassuan2/patches/patch-configure \
    pkgsrc/security/libassuan2/patches/patch-src_assuan-uds.c

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

Modified files:

Index: pkgsrc/security/libassuan2/distinfo
diff -u pkgsrc/security/libassuan2/distinfo:1.10 pkgsrc/security/libassuan2/distinfo:1.10.6.1
--- pkgsrc/security/libassuan2/distinfo:1.10    Sun Jul 17 07:21:27 2016
+++ pkgsrc/security/libassuan2/distinfo Sun May 28 08:44:18 2017
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.10 2016/07/17 07:21:27 wiz Exp $
+$NetBSD: distinfo,v 1.10.6.1 2017/05/28 08:44:18 spz Exp $
 
 SHA1 (libassuan-2.4.3.tar.bz2) = 27391cf4a820b5350ea789c30661830c9a271518
 RMD160 (libassuan-2.4.3.tar.bz2) = 1e1a28d4beebb5ad9c660957de250e3315eecba2
 SHA512 (libassuan-2.4.3.tar.bz2) = 2b0f58682b408fc58fa0ec2980b36e54ba66701bf504cf6c98ec652af43501bc7c18573bc78c5b83260f5a3bdb0ec8f4e0662bafd9bba3fe7287e77598e8e4c1
 Size (libassuan-2.4.3.tar.bz2) = 559867 bytes
+SHA1 (patch-configure) = 0cb945282bd00a96b66d245f9723fd8d0bc32d8b
+SHA1 (patch-src_assuan-uds.c) = 62d935c5fad5eb5bbc6721f89681b7be724c4916

Added files:

Index: pkgsrc/security/libassuan2/patches/patch-configure
diff -u /dev/null pkgsrc/security/libassuan2/patches/patch-configure:1.1.2.2
--- /dev/null   Sun May 28 08:44:18 2017
+++ pkgsrc/security/libassuan2/patches/patch-configure  Sun May 28 08:44:18 2017
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure,v 1.1.2.2 2017/05/28 08:44:18 spz Exp $
+
+Handle _XOPEN_SOURCE correctly.
+
+--- configure.orig     2016-07-14 08:11:48.000000000 +0000
++++ configure
+@@ -13486,10 +13486,8 @@ case "${host}" in
+         ;;
+     *-solaris*)
+ 
+-$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+ 
+ 
+-$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
+ 
+ 
+ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
Index: pkgsrc/security/libassuan2/patches/patch-src_assuan-uds.c
diff -u /dev/null pkgsrc/security/libassuan2/patches/patch-src_assuan-uds.c:1.1.2.2
--- /dev/null   Sun May 28 08:44:18 2017
+++ pkgsrc/security/libassuan2/patches/patch-src_assuan-uds.c   Sun May 28 08:44:18 2017
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_assuan-uds.c,v 1.1.2.2 2017/05/28 08:44:18 spz Exp $
+
+Handle _XOPEN_SOURCE correctly.
+
+--- src/assuan-uds.c.orig      2016-06-25 14:46:53.000000000 +0000
++++ src/assuan-uds.c
+@@ -21,6 +21,14 @@
+ #include <config.h>
+ #endif
+ 
++#if defined(__sun) && !defined(_XOPEN_SOURCE)
++#  if __STDC_VERSION__ - 0 < 199901L
++#define _XOPEN_SOURCE 500
++#  else
++#define _XOPEN_SOURCE 600
++#  endif
++#endif
++
+ #include <stdlib.h>
+ #include <stddef.h>
+ #include <stdio.h>