Tue Jul 31 12:39:34 2018 UTC ()
lasso: _XOPEN_SOURCE and _POSIX_C_SOURCE fixes.


(jperkin)
diff -r1.12 -r1.13 pkgsrc/security/lasso/Makefile.common
diff -r1.23 -r1.24 pkgsrc/security/lasso/distinfo
diff -r1.3 -r1.4 pkgsrc/security/lasso/patches/patch-configure
diff -r0 -r1.1 pkgsrc/security/lasso/patches/patch-lasso_xml_tools.c
cvs diff -r1.12 -r1.13 pkgsrc/security/lasso/Makefile.common (expand / switch to unified diff)

--- pkgsrc/security/lasso/Makefile.common 2016/03/14 09:43:42 1.12
+++ pkgsrc/security/lasso/Makefile.common 2018/07/31 12:39:34 1.13
@@ -1,36 +1,38 @@ @@ -1,36 +1,38 @@
1# $NetBSD: Makefile.common,v 1.12 2016/03/14 09:43:42 manu Exp $ 1# $NetBSD: Makefile.common,v 1.13 2018/07/31 12:39:34 jperkin Exp $
2# 2#
3# used by security/lasso/Makefile 3# used by security/lasso/Makefile
4# used by security/py-lasso/Makefile 4# used by security/py-lasso/Makefile
5 5
6DISTNAME= lasso-2.5.1 6DISTNAME= lasso-2.5.1
7CATEGORIES= security 7CATEGORIES= security
8MASTER_SITES= https://dev.entrouvert.org/lasso/ 8MASTER_SITES= https://dev.entrouvert.org/lasso/
9 9
10MAINTAINER= manu@NetBSD.org 10MAINTAINER= manu@NetBSD.org
11HOMEPAGE= http://lasso.entrouvert.org/ 11HOMEPAGE= http://lasso.entrouvert.org/
12COMMENT= Liberty Alliance Single Sign On implementation 12COMMENT= Liberty Alliance Single Sign On implementation
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15DISTINFO_FILE= ${.CURDIR}/../../security/lasso/distinfo 15DISTINFO_FILE= ${.CURDIR}/../../security/lasso/distinfo
16PATCHDIR= ${.CURDIR}/../../security/lasso/patches 16PATCHDIR= ${.CURDIR}/../../security/lasso/patches
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --with-sasl2=${PREFIX} 19CONFIGURE_ARGS+= --with-sasl2=${PREFIX}
20CONFIGURE_ARGS+= --with-zlib=${PREFIX} 20CONFIGURE_ARGS+= --with-zlib=${PREFIX}
21USE_LIBTOOL= yes 21USE_LIBTOOL= yes
22USE_TOOLS+= pkg-config perl 22USE_TOOLS+= pkg-config perl
23 23
 24CFLAGS.NetBSD+= -D_POSIX_C_SOURCE=199506
 25
24PKGCONFIG_OVERRIDE+= lasso.pc.in 26PKGCONFIG_OVERRIDE+= lasso.pc.in
25 27
26DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six 28DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
27BUILDLINK_ABI_DEPENDS.glib2+= glib2>=2.35 29BUILDLINK_ABI_DEPENDS.glib2+= glib2>=2.35
28 30
29.include "../../lang/python/application.mk" 31.include "../../lang/python/application.mk"
30 32
31.include "../../security/xmlsec1/buildlink3.mk" 33.include "../../security/xmlsec1/buildlink3.mk"
32.include "../../security/openssl/buildlink3.mk" 34.include "../../security/openssl/buildlink3.mk"
33.include "../../security/cyrus-sasl/buildlink3.mk" 35.include "../../security/cyrus-sasl/buildlink3.mk"
34.include "../../devel/glib2/buildlink3.mk" 36.include "../../devel/glib2/buildlink3.mk"
35.include "../../textproc/libxml2/buildlink3.mk" 37.include "../../textproc/libxml2/buildlink3.mk"
36.include "../../textproc/libxslt/buildlink3.mk" 38.include "../../textproc/libxslt/buildlink3.mk"
cvs diff -r1.23 -r1.24 pkgsrc/security/lasso/distinfo (expand / switch to unified diff)

--- pkgsrc/security/lasso/distinfo 2018/05/31 07:33:27 1.23
+++ pkgsrc/security/lasso/distinfo 2018/07/31 12:39:34 1.24
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.23 2018/05/31 07:33:27 wiz Exp $ 1$NetBSD: distinfo,v 1.24 2018/07/31 12:39:34 jperkin Exp $
2 2
3SHA1 (lasso-2.5.1.tar.gz) = fe0e68010bab6e11383003b5cf869c0447ed7a6e 3SHA1 (lasso-2.5.1.tar.gz) = fe0e68010bab6e11383003b5cf869c0447ed7a6e
4RMD160 (lasso-2.5.1.tar.gz) = 8cc0506fe8cbac770e952fdb0f067c7e58f5bb43 4RMD160 (lasso-2.5.1.tar.gz) = 8cc0506fe8cbac770e952fdb0f067c7e58f5bb43
5SHA512 (lasso-2.5.1.tar.gz) = f20bea62c04f3082d5c423f658bafe1bdde0012321c43092ed5d5a2c3ec7b21ec27d88d9fc630743fd7c99e767d9fd92b98de5d4f7d98c3a9e680717483daae1 5SHA512 (lasso-2.5.1.tar.gz) = f20bea62c04f3082d5c423f658bafe1bdde0012321c43092ed5d5a2c3ec7b21ec27d88d9fc630743fd7c99e767d9fd92b98de5d4f7d98c3a9e680717483daae1
6Size (lasso-2.5.1.tar.gz) = 4552152 bytes 6Size (lasso-2.5.1.tar.gz) = 4552152 bytes
7SHA1 (patch-18771) = 66897d88283c28557eb4a58507db48a42df93b5d 7SHA1 (patch-18771) = 66897d88283c28557eb4a58507db48a42df93b5d
8SHA1 (patch-configure) = fe5650cfe939d8c4de66d185c36936840958e5d1 8SHA1 (patch-configure) = aa34dcb7a86b6ece774fb230ac092bdd7d8e278c
 9SHA1 (patch-lasso_xml_tools.c) = 0172915c1654192e3d1eebf89d57d29dd61cef38
cvs diff -r1.3 -r1.4 pkgsrc/security/lasso/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/security/lasso/patches/Attic/patch-configure 2017/12/18 15:33:59 1.3
+++ pkgsrc/security/lasso/patches/Attic/patch-configure 2018/07/31 12:39:34 1.4
@@ -1,36 +1,25 @@ @@ -1,36 +1,25 @@
1$NetBSD: patch-configure,v 1.3 2017/12/18 15:33:59 jperkin Exp $ 1$NetBSD: patch-configure,v 1.4 2018/07/31 12:39:34 jperkin Exp $
2 2
3Make sure _POSIX_C_SOURCE=199506 so that strtok() is defined by <string.h> 3Use = instead of == for test(1) portability sake.
4Otherwise, compiler assumes it returns an int, which badly breaks on LP64 
5 
6Also use = instead of == for test(1) portability sake. 
7 4
8--- configure.orig 2016-02-18 23:11:38.249290059 +0000 5--- configure.orig 2016-02-18 23:11:38.249290059 +0000
9+++ configure 6+++ configure
10@@ -4382,9 +4382,6 @@ else 7@@ -4382,9 +4382,6 @@ else
11 fi 8 fi
12  9
13  10
14-CFLAGS="" 11-CFLAGS=""
15-AM_CFLAGS="" 12-AM_CFLAGS=""
16- 13-
17 ac_ext=c 14 ac_ext=c
18 ac_cpp='$CPP $CPPFLAGS' 15 ac_cpp='$CPP $CPPFLAGS'
19 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 16 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
20@@ -13976,7 +13973,7 @@ else 17@@ -13976,7 +13973,7 @@ else
21 JAVA_VERSION="" 18 JAVA_VERSION=""
22 fi 19 fi
23  20
24-if test "$DARWIN" == 1; then 21-if test "$DARWIN" == 1; then
25+if test "$DARWIN" = 1; then 22+if test "$DARWIN" = 1; then
26 JNI_EXTRA_LDFLAGS="-shrext .jnilib" 23 JNI_EXTRA_LDFLAGS="-shrext .jnilib"
27 fi 24 fi
28  25
29@@ -15650,6 +15647,7 @@ fi 
30  
31  
32 LASSO_PUB_CFLAGS="$LASSO_DEFINES" 
33+LASSO_CFLAGS="$LASSO_CFLAGS -D_POSIX_C_SOURCE=199506" 
34 LASSO_CORE_CFLAGS="$LASSO_CFLAGS $LASSO_DEFINES $Z_CFLAGS -DLASSO_INTERNALS" 
35 if test $MINGW -eq 1; then 
36 LASSO_CORE_LIBS="-llasso-0" 
File Added: pkgsrc/security/lasso/patches/Attic/patch-lasso_xml_tools.c
$NetBSD: patch-lasso_xml_tools.c,v 1.1 2018/07/31 12:39:34 jperkin Exp $

Set _XOPEN_SOURCE correctly.

--- lasso/xml/tools.c.orig	2016-02-18 23:11:15.312239445 +0000
+++ lasso/xml/tools.c
@@ -28,7 +28,9 @@
  */
 #define _DEFAULT_SOURCE
 /* permit importation of strptime for glibc2 */
+#if !defined(__sun)
 #define _XOPEN_SOURCE
+#endif
 /* permit importation of timegm for glibc2, wait for people to complain it does not work on their
  * system. */
 #define _BSD_SOURCE