Enforce -D_POSIX_C_SOURCE=199506 so that strtok_r() is defined by

<string.h>, otherwise the compiler assumes it returns an int, and
it breaks on LP64 machines.

4 files changed, 40 insertions, 3 deletions

diff --git a/security/lasso/Makefile b/security/lasso/Makefile
index a3e5c1423ed..ae654c58ca7 100644
--- a/security/lasso/Makefile
+++ b/security/lasso/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2014/01/01 11:52:03 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2014/02/05 09:26:58 manu Exp $
 #
 
-PKGREVISION=		13
+PKGREVISION=		14
 
 CONFIGURE_ARGS+=	--disable-python
 CONFIGURE_ARGS+=	--disable-php5
diff --git a/security/lasso/distinfo b/security/lasso/distinfo
index f31ed770ea1..ac279e89c46 100644
--- a/security/lasso/distinfo
+++ b/security/lasso/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2012/12/15 15:29:28 manu Exp $
+$NetBSD: distinfo,v 1.15 2014/02/05 09:26:58 manu Exp $
 
 SHA1 (lasso-2.3.6.tar.gz) = 92689a873b83e02efb4a6c3a375f040a9e75c95c
 RMD160 (lasso-2.3.6.tar.gz) = 5e1aaba807d453c1fad28be6a8f06d908159b3fe
@@ -6,6 +6,8 @@ Size (lasso-2.3.6.tar.gz) = 3940027 bytes
 SHA1 (patch-bindings-java-wrapper_top.c) = 16f98d5edb21ca97f05a3d108a04da8be2ec2ed4
 SHA1 (patch-bindings-php5-wrapper_source_top.c) = 21c92807633ce96188f6bbdf72129d16f5784f19
 SHA1 (patch-bindings-python-wrapper_top.c) = db730c2443e1a618f0719cd190a30a2bba241961
+SHA1 (patch-configure) = ffcd1de65b3a0e66f79200ceea0ecbad29bc89a9
+SHA1 (patch-configure.ac) = 662370c81ed8da78e614ff58cee54f825974b7ae
 SHA1 (patch-docs-reference-lasso-lasso-sections.txt) = 9e6936b0c019b8fb8b9493f914241131b684cbfc
 SHA1 (patch-lasso-errors_c) = 5c0fe304cd9cce6d926362c248ffe60c2c7357c5
 SHA1 (patch-lasso-errors_c_in) = d4663edb280d38a0cb1a422d9b95b1d344012f63
diff --git a/security/lasso/patches/patch-configure b/security/lasso/patches/patch-configure
new file mode 100644
index 00000000000..037e4d93bc3
--- /dev/null
+++ b/security/lasso/patches/patch-configure
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure,v 1.1 2014/02/05 09:26:58 manu Exp $
+
+Make sure _POSIX_C_SOURCE=199506 so that strtok() is defined by <string.h>
+Otherwise, compiler assumes it returns an int, which badly breaks on LP64
+
+--- configure.orig	2014-02-05 08:57:10.000000000 +0000
++++ configure	2014-02-05 08:58:04.000000000 +0000
+@@ -14461,8 +14461,9 @@
+ fi
+ 
+ 
+ LASSO_PUB_CFLAGS="$LASSO_DEFINES"
++LASSO_CFLAGS="$LASSO_CFLAGS -D_POSIX_C_SOURCE=199506"
+ LASSO_CORE_CFLAGS="$LASSO_CFLAGS $LASSO_DEFINES $Z_CFLAGS -DLASSO_INTERNALS"
+ if test $MINGW -eq 1; then
+   LASSO_CORE_LIBS="-llasso-0"
+ else
diff --git a/security/lasso/patches/patch-configure.ac b/security/lasso/patches/patch-configure.ac
new file mode 100644
index 00000000000..75cb336614e
--- /dev/null
+++ b/security/lasso/patches/patch-configure.ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-configure.ac,v 1.1 2014/02/05 09:26:58 manu Exp $
+
+Make sure _POSIX_C_SOURCE=199506 so that strtok() is defined by <string.h>
+Otherwise, compiler assumes it returns an int, which badly breaks on LP64
+
+--- configure.ac.orig	2014-02-05 08:56:57.000000000 +0000
++++ configure.ac	2014-02-05 08:56:37.000000000 +0000
+@@ -781,8 +781,10 @@
+ dnl ==========================================================================
+ dnl Final steps: lasso config
+ dnl ==========================================================================
+ LASSO_PUB_CFLAGS="$LASSO_DEFINES"
++dnl For strtok_r()
++LASSO_CFLAGS="$LASSO_CFLAGS -D_POSIX_C_SOURCE=199506"
+ LASSO_CORE_CFLAGS="$LASSO_CFLAGS $LASSO_DEFINES $Z_CFLAGS -DLASSO_INTERNALS" 
+ if test $MINGW -eq 1; then 
+   LASSO_CORE_LIBS="-llasso-0"
+ else