Upgrade to lasso-2.2.2:

From distribution NEWS file:
Many fixes and improvements to the ID-WSF 1 support, new API to load SSL keys
off memory, documentation for ID-WSF methods, general robustness and memory
leak fixes.

9 files changed, 67 insertions, 122 deletions

diff --git a/security/lasso/Makefile.common b/security/lasso/Makefile.common
index a90d47e6389..840fc5bbca0 100644
--- a/security/lasso/Makefile.common
+++ b/security/lasso/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $
+# $NetBSD: Makefile.common,v 1.2 2009/04/09 03:23:55 manu Exp $
 #
 # used by security/lasso/Makefile
 # used by security/py-lasso/Makefile
 
-DISTNAME=	lasso-2.2.1
+DISTNAME=	lasso-2.2.2
 CATEGORIES=	security
-MASTER_SITES=	http://labs.libre-entreprise.org/frs/download.php/673/
+MASTER_SITES=	http://labs.libre-entreprise.org/frs/download.php/735/
 
 MAINTAINER=	manu@NetBSD.org
 HOMEPAGE=	http://lasso.entrouvert.org/
diff --git a/security/lasso/PLIST b/security/lasso/PLIST
index f2c260ded9f..a9925279ef6 100644
--- a/security/lasso/PLIST
+++ b/security/lasso/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/04/09 03:23:55 manu Exp $
 share/doc/lasso/writing-a-c-sp.txt
 share/doc/lasso/writing-a-php-sp.txt
 share/doc/lasso/writing-a-java-sp.txt
@@ -296,11 +296,16 @@ include/lasso/export.h
 include/lasso/lasso.h
 include/lasso/lasso_config.h
 include/lasso/errors.h
+include/lasso/debug.h
+include/lasso/registry-private.h
+include/lasso/registry.h
+include/lasso/utils.h
 @dirrm include/lasso/xml/saml-2.0
 @dirrm include/lasso/xml/id-wsf-2.0
 @dirrm include/lasso/xml/ws
 @dirrm include/lasso/xml
 @dirrm include/lasso/id-ff
+@dirrm include/lasso/id-wsf
 @dirrm include/lasso/saml-2.0
 @dirrm include/lasso/id-wsf-2.0
 @dirrm include/lasso
diff --git a/security/lasso/distinfo b/security/lasso/distinfo
index a6cbc68fa83..993aa0e5be2 100644
--- a/security/lasso/distinfo
+++ b/security/lasso/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $
+$NetBSD: distinfo,v 1.2 2009/04/09 03:23:55 manu Exp $
 
-SHA1 (lasso-2.2.1.tar.gz) = 687e7404f9e560d2ebc4be7e5cc3bcd9c0669c37
-RMD160 (lasso-2.2.1.tar.gz) = 508c712dc0e7e66f1add15aa98c6c6b5eb69a1d6
-Size (lasso-2.2.1.tar.gz) = 1546463 bytes
-SHA1 (patch-aa) = e4c1c93e7e46068b3662209bb75f1477e0bf4044
-SHA1 (patch-ab) = de496e893cbcae6da4a421889967d73e11c8ee73
-SHA1 (patch-ba) = c87a086df1dae69d41b9efd6905a84527c678d82
-SHA1 (patch-bb) = 71a2d792e8d9b698b385b37b8b904637763e6a5a
+SHA1 (lasso-2.2.2.tar.gz) = 32651fa71b16da01a94db234425846729a510623
+RMD160 (lasso-2.2.2.tar.gz) = a4faae605726202db33d36a2b520b0ab8f17aa76
+Size (lasso-2.2.2.tar.gz) = 1802749 bytes
+SHA1 (patch-ba) = 4ebb013f1c264e5b0008faeebdecc7bdb49be63a
+SHA1 (patch-bb) = 0867b8ae4036620084b73d28546ac089b57d3fb9
+SHA1 (patch-bc) = 0104fc8a9d3acac47130e52f3e5aa2af78337170
+SHA1 (patch-bd) = 1a43558472ff5a1f24bb5b1228335894a77f875e
diff --git a/security/lasso/patches/patch-aa b/security/lasso/patches/patch-aa
deleted file mode 100644
index 4e19211aaf4..00000000000
--- a/security/lasso/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $
---- configure.ac.orig	2009-03-01 06:27:51.000000000 +0000
-+++ configure.ac	2009-03-01 06:29:37.000000000 +0000
-@@ -450,9 +450,9 @@
-     enable_php4="no (missing expat)"
- fi
- 
- AC_MSG_CHECKING(for PHP 4 development files)
--if $PHP4_CONFIG --version | grep -q "^4" || test "x$ENABLE_PHP4_FORCE" == "xyes"
-+if $PHP4_CONFIG --version | grep -q "^4" || test "x$ENABLE_PHP4_FORCE" = "xyes"
- then
- 	PHP4_VERSION=`$PHP4_CONFIG --version 2> /dev/null`
- 	languages_available="$languages_available php4($PHP4_VERSION)"
- else
-@@ -532,9 +532,9 @@
-     enable_php5=no
- fi
- 
- AC_MSG_CHECKING(for PHP 5 development files)
--if $PHP5_CONFIG --version | grep -q "^5" || test "x$ENABLE_PHP5_FORCE" == "xyes"
-+if $PHP5_CONFIG --version | grep -q "^5" || test "x$ENABLE_PHP5_FORCE" = "xyes"
- then
- 	PHP5_VERSION=`$PHP5_CONFIG --version 2> /dev/null`
- 	languages_available="$languages_available php5($PHP5_VERSION)"
- else
-@@ -906,10 +906,10 @@
- AC_SUBST(CLASSPATH_JUNIT)
- AC_SUBST(SWIG_VERSION)
- 
- dnl Dirty system often means dirty hacks...
--AM_CONDITIONAL(MINGW, test $MINGW == 1)
--AM_CONDITIONAL(DARWIN, test $DARWIN == 1)
-+AM_CONDITIONAL(MINGW, test $MINGW -eq 1)
-+AM_CONDITIONAL(DARWIN, test $DARWIN -eq 1)
- 
- dnl bindings
- 
- 
diff --git a/security/lasso/patches/patch-ab b/security/lasso/patches/patch-ab
deleted file mode 100644
index 8e214ab268f..00000000000
--- a/security/lasso/patches/patch-ab
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $
---- configure.orig	2009-03-01 06:27:56.000000000 +0000
-+++ configure	2009-03-01 06:29:47.000000000 +0000
-@@ -22127,9 +22127,9 @@
- fi
- 
- { echo "$as_me:$LINENO: checking for PHP 4 development files" >&5
- echo $ECHO_N "checking for PHP 4 development files... $ECHO_C" >&6; }
--if $PHP4_CONFIG --version | grep -q "^4" || test "x$ENABLE_PHP4_FORCE" == "xyes"
-+if $PHP4_CONFIG --version | grep -q "^4" || test "x$ENABLE_PHP4_FORCE" = "xyes"
- then
- 	PHP4_VERSION=`$PHP4_CONFIG --version 2> /dev/null`
- 	languages_available="$languages_available php4($PHP4_VERSION)"
- else
-@@ -22372,9 +22372,9 @@
- fi
- 
- { echo "$as_me:$LINENO: checking for PHP 5 development files" >&5
- echo $ECHO_N "checking for PHP 5 development files... $ECHO_C" >&6; }
--if $PHP5_CONFIG --version | grep -q "^5" || test "x$ENABLE_PHP5_FORCE" == "xyes"
-+if $PHP5_CONFIG --version | grep -q "^5" || test "x$ENABLE_PHP5_FORCE" = "xyes"
- then
- 	PHP5_VERSION=`$PHP5_CONFIG --version 2> /dev/null`
- 	languages_available="$languages_available php5($PHP5_VERSION)"
- else
-@@ -23799,9 +23799,9 @@
- 
- 
- 
- 
--if test $MINGW == 1; then
-+if test $MINGW -eq 1; then
-   MINGW_TRUE=
-   MINGW_FALSE='#'
- else
-   MINGW_TRUE='#'
-@@ -23809,9 +23809,9 @@
- fi
- 
- 
- 
--if test $DARWIN == 1; then
-+if test $DARWIN -eq 1; then
-   DARWIN_TRUE=
-   DARWIN_FALSE='#'
- else
-   DARWIN_TRUE='#'
diff --git a/security/lasso/patches/patch-ba b/security/lasso/patches/patch-ba
index a03d2686bcf..acc47a0c18e 100644
--- a/security/lasso/patches/patch-ba
+++ b/security/lasso/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $
+$NetBSD: patch-ba,v 1.2 2009/04/09 03:23:55 manu Exp $
 --- configure.ac.orig	2008-07-22 12:46:24.000000000 +0000
 +++ configure.ac	2009-03-01 06:41:53.000000000 +0000
 @@ -791,9 +791,9 @@
@@ -7,7 +7,7 @@ $NetBSD: patch-ba,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $
  fi
  
 -PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl)
-+PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0)
++PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6)
  
  AC_ARG_WITH(sasl2, [  --with-sasl2[=PFX]         Use Cyrus SASL library version 2 for WSF-Auth])
  if test "x$enable_wsf" = "xyes"; then
diff --git a/security/lasso/patches/patch-bb b/security/lasso/patches/patch-bb
index d9b0efbc658..dd75aaa1a77 100644
--- a/security/lasso/patches/patch-bb
+++ b/security/lasso/patches/patch-bb
@@ -1,69 +1,68 @@
-$NetBSD: patch-bb,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $
---- configure.orig	2008-07-22 12:48:26.000000000 +0000
-+++ configure	2009-03-01 06:43:38.000000000 +0000
-@@ -23258,14 +23258,14 @@
+--- configure.orig	2009-04-05 09:25:04.000000000 +0200
++++ configure	2009-04-05 09:25:48.000000000 +0200
+@@ -15388,14 +15388,14 @@
      if test -n "$LASSO_CFLAGS"; then
          pkg_cv_LASSO_CFLAGS="$LASSO_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5
 -  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6\"") >&5
++  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -  pkg_cv_LASSO_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl" 2>/dev/null`
-+  pkg_cv_LASSO_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0" 2>/dev/null`
++  pkg_cv_LASSO_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6" 2>/dev/null`
  else
    pkg_failed=yes
  fi
      fi
-@@ -23276,14 +23276,14 @@
+@@ -15406,14 +15406,14 @@
      if test -n "$LASSO_LIBS"; then
          pkg_cv_LASSO_LIBS="$LASSO_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5
 -  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6\"") >&5
++  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6") 2>&5
    ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -  pkg_cv_LASSO_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl" 2>/dev/null`
-+  pkg_cv_LASSO_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0" 2>/dev/null`
++  pkg_cv_LASSO_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6" 2>/dev/null`
  else
    pkg_failed=yes
  fi
      fi
-@@ -23300,16 +23300,16 @@
+@@ -15430,16 +15430,16 @@
  else
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
 -	        LASSO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl"`
-+	        LASSO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0"`
++	        LASSO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6"`
          else
 -	        LASSO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl"`
-+	        LASSO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0"`
++	        LASSO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6"`
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$LASSO_PKG_ERRORS" >&5
  
--	{ { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met:
-+	{ { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0) were not met:
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met:
++	{ { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6) were not met:
  
  $LASSO_PKG_ERRORS
  
  Consider adjusting the PKG_CONFIG_PATH environment variable if you
-@@ -23318,9 +23318,9 @@
+@@ -15448,9 +15448,9 @@
  Alternatively, you may set the environment variables LASSO_CFLAGS
  and LASSO_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  " >&5
--echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met:
-+echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0) were not met:
+-$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met:
++$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6) were not met:
  
  $LASSO_PKG_ERRORS
  
diff --git a/security/lasso/patches/patch-bc b/security/lasso/patches/patch-bc
new file mode 100644
index 00000000000..0aacfdc2102
--- /dev/null
+++ b/security/lasso/patches/patch-bc
@@ -0,0 +1,13 @@
+--- lasso/xml/tools.c.orig	2009-04-05 11:24:03.000000000 +0200
++++ lasso/xml/tools.c	2009-04-05 11:24:47.000000000 +0200
+@@ -1209,9 +1209,9 @@
+ {
+ 	const char *c;
+ 
+ 	c = message;
+-	while (*c != 0 && (isalnum(*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
++	while (*c != 0 && (isalnum((int)*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
+ 	while (*c == '=' || *c == '\n' || *c == '\r') c++; /* trailing = */
+ 
+ 	if (*c == 0)
+ 		return TRUE;
diff --git a/security/lasso/patches/patch-bd b/security/lasso/patches/patch-bd
new file mode 100644
index 00000000000..ee69a11bf30
--- /dev/null
+++ b/security/lasso/patches/patch-bd
@@ -0,0 +1,13 @@
+--- lasso/xml/xml.c.orig	2009-04-05 11:25:55.000000000 +0200
++++ lasso/xml/xml.c	2009-04-05 11:26:27.000000000 +0200
+@@ -1591,9 +1591,9 @@
+ {
+ 	const char *c;
+ 
+ 	c = message;
+-	while (*c != 0 && (isalnum(*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
++	while (*c != 0 && (isalnum((int)*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
+ 	while (*c == '=' || *c == '\n' || *c == '\r') c++; /* trailing = */
+ 
+ 	if (*c == 0)
+ 		return TRUE;