CVS commit: pkgsrc/security/lasso

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jul 31 12:39:34 UTC 2018

Modified Files:
        pkgsrc/security/lasso: Makefile.common distinfo
        pkgsrc/security/lasso/patches: patch-configure
Added Files:
        pkgsrc/security/lasso/patches: patch-lasso_xml_tools.c

Log Message:
lasso: _XOPEN_SOURCE and _POSIX_C_SOURCE fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/lasso/Makefile.common
cvs rdiff -u -r1.23 -r1.24 pkgsrc/security/lasso/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/lasso/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/security/lasso/patches/patch-lasso_xml_tools.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/lasso/Makefile.common
diff -u pkgsrc/security/lasso/Makefile.common:1.12 pkgsrc/security/lasso/Makefile.common:1.13
--- pkgsrc/security/lasso/Makefile.common:1.12  Mon Mar 14 09:43:42 2016
+++ pkgsrc/security/lasso/Makefile.common       Tue Jul 31 12:39:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2016/03/14 09:43:42 manu Exp $
+# $NetBSD: Makefile.common,v 1.13 2018/07/31 12:39:34 jperkin Exp $
 #
 # used by security/lasso/Makefile
 # used by security/py-lasso/Makefile
@@ -21,6 +21,8 @@ CONFIGURE_ARGS+=      --with-zlib=${PREFIX}
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config perl
 
+CFLAGS.NetBSD+=        -D_POSIX_C_SOURCE=199506
+
 PKGCONFIG_OVERRIDE+=   lasso.pc.in
 
 DEPENDS+=                      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six

Index: pkgsrc/security/lasso/distinfo
diff -u pkgsrc/security/lasso/distinfo:1.23 pkgsrc/security/lasso/distinfo:1.24
--- pkgsrc/security/lasso/distinfo:1.23 Thu May 31 07:33:27 2018
+++ pkgsrc/security/lasso/distinfo      Tue Jul 31 12:39:34 2018
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.23 2018/05/31 07:33:27 wiz Exp $
+$NetBSD: distinfo,v 1.24 2018/07/31 12:39:34 jperkin Exp $
 
 SHA1 (lasso-2.5.1.tar.gz) = fe0e68010bab6e11383003b5cf869c0447ed7a6e
 RMD160 (lasso-2.5.1.tar.gz) = 8cc0506fe8cbac770e952fdb0f067c7e58f5bb43
 SHA512 (lasso-2.5.1.tar.gz) = f20bea62c04f3082d5c423f658bafe1bdde0012321c43092ed5d5a2c3ec7b21ec27d88d9fc630743fd7c99e767d9fd92b98de5d4f7d98c3a9e680717483daae1
 Size (lasso-2.5.1.tar.gz) = 4552152 bytes
 SHA1 (patch-18771) = 66897d88283c28557eb4a58507db48a42df93b5d
-SHA1 (patch-configure) = fe5650cfe939d8c4de66d185c36936840958e5d1
+SHA1 (patch-configure) = aa34dcb7a86b6ece774fb230ac092bdd7d8e278c
+SHA1 (patch-lasso_xml_tools.c) = 0172915c1654192e3d1eebf89d57d29dd61cef38

Index: pkgsrc/security/lasso/patches/patch-configure
diff -u pkgsrc/security/lasso/patches/patch-configure:1.3 pkgsrc/security/lasso/patches/patch-configure:1.4
--- pkgsrc/security/lasso/patches/patch-configure:1.3   Mon Dec 18 15:33:59 2017
+++ pkgsrc/security/lasso/patches/patch-configure       Tue Jul 31 12:39:34 2018
@@ -1,9 +1,6 @@
-$NetBSD: patch-configure,v 1.3 2017/12/18 15:33:59 jperkin Exp $
+$NetBSD: patch-configure,v 1.4 2018/07/31 12:39:34 jperkin 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
-
-Also use = instead of == for test(1) portability sake.
+Use = instead of == for test(1) portability sake.
 
 --- configure.orig     2016-02-18 23:11:38.249290059 +0000
 +++ configure
@@ -26,11 +23,3 @@ Also use = instead of == for test(1) por
      JNI_EXTRA_LDFLAGS="-shrext .jnilib"
  fi
  
-@@ -15650,6 +15647,7 @@ 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"

Added files:

Index: pkgsrc/security/lasso/patches/patch-lasso_xml_tools.c
diff -u /dev/null pkgsrc/security/lasso/patches/patch-lasso_xml_tools.c:1.1
--- /dev/null   Tue Jul 31 12:39:35 2018
+++ pkgsrc/security/lasso/patches/patch-lasso_xml_tools.c       Tue Jul 31 12:39:34 2018
@@ -0,0 +1,16 @@
+$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