[pkgsrc/trunk]: pkgsrc/security/lasso Two bugfixes pulled from upstream:

[manu <manu%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d7e2d6f37f27
branches:  trunk
changeset: 393746:d7e2d6f37f27
user:      manu <manu%pkgsrc.org@localhost>
date:      Tue May 26 05:26:00 2009 +0000

description:
Two bugfixes pulled from upstream:
- make sure assertions are signed
- don't crash when parsing saml:AttributeValue with xsi:type set

diffstat:

 security/lasso/Makefile         |   4 +++-
 security/lasso/distinfo         |   4 +++-
 security/lasso/patches/patch-bb |   1 +
 security/lasso/patches/patch-bc |   1 +
 security/lasso/patches/patch-bd |   1 +
 security/lasso/patches/patch-ca |  14 ++++++++++++++
 security/lasso/patches/patch-cb |  16 ++++++++++++++++
 7 files changed, 39 insertions(+), 2 deletions(-)

diffs (90 lines):

diff -r e6443342d4ba -r d7e2d6f37f27 security/lasso/Makefile
--- a/security/lasso/Makefile   Tue May 26 01:54:37 2009 +0000
+++ b/security/lasso/Makefile   Tue May 26 05:26:00 2009 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/03/02 16:46:01 manu Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/26 05:26:00 manu Exp $
 #
 
+PKGREVISION=   2
+
 CONFIGURE_ARGS+=       --disable-python
 CONFIGURE_ARGS+=       --disable-php4
 CONFIGURE_ARGS+=       --disable-perl
diff -r e6443342d4ba -r d7e2d6f37f27 security/lasso/distinfo
--- a/security/lasso/distinfo   Tue May 26 01:54:37 2009 +0000
+++ b/security/lasso/distinfo   Tue May 26 05:26:00 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2009/04/09 03:23:55 manu Exp $
+$NetBSD: distinfo,v 1.3 2009/05/26 05:26:00 manu Exp $
 
 SHA1 (lasso-2.2.2.tar.gz) = 32651fa71b16da01a94db234425846729a510623
 RMD160 (lasso-2.2.2.tar.gz) = a4faae605726202db33d36a2b520b0ab8f17aa76
@@ -7,3 +7,5 @@
 SHA1 (patch-bb) = 0867b8ae4036620084b73d28546ac089b57d3fb9
 SHA1 (patch-bc) = 0104fc8a9d3acac47130e52f3e5aa2af78337170
 SHA1 (patch-bd) = 1a43558472ff5a1f24bb5b1228335894a77f875e
+SHA1 (patch-ca) = c803ef9032744263f0fc434eda2c3b729fc96225
+SHA1 (patch-cb) = d6804551a3738d57cca71e018203f07c3736af99
diff -r e6443342d4ba -r d7e2d6f37f27 security/lasso/patches/patch-bb
--- a/security/lasso/patches/patch-bb   Tue May 26 01:54:37 2009 +0000
+++ b/security/lasso/patches/patch-bb   Tue May 26 05:26:00 2009 +0000
@@ -1,3 +1,4 @@
+$NetBSD: patch-bb,v 1.3 2009/05/26 05:26:00 manu Exp $
 --- configure.orig     2009-04-05 09:25:04.000000000 +0200
 +++ configure  2009-04-05 09:25:48.000000000 +0200
 @@ -15388,14 +15388,14 @@
diff -r e6443342d4ba -r d7e2d6f37f27 security/lasso/patches/patch-bc
--- a/security/lasso/patches/patch-bc   Tue May 26 01:54:37 2009 +0000
+++ b/security/lasso/patches/patch-bc   Tue May 26 05:26:00 2009 +0000
@@ -1,3 +1,4 @@
+$NetBSD: patch-bc,v 1.2 2009/05/26 05:26:00 manu Exp $
 --- 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 @@
diff -r e6443342d4ba -r d7e2d6f37f27 security/lasso/patches/patch-bd
--- a/security/lasso/patches/patch-bd   Tue May 26 01:54:37 2009 +0000
+++ b/security/lasso/patches/patch-bd   Tue May 26 05:26:00 2009 +0000
@@ -1,3 +1,4 @@
+$NetBSD: patch-bd,v 1.2 2009/05/26 05:26:00 manu Exp $
 --- 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 @@
diff -r e6443342d4ba -r d7e2d6f37f27 security/lasso/patches/patch-ca
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/lasso/patches/patch-ca   Tue May 26 05:26:00 2009 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ca,v 1.1 2009/05/26 05:26:00 manu Exp $
+--- lasso/saml-2.0/profile.c.orig      2009-03-27 16:12:48.000000000 +0000
++++ lasso/saml-2.0/profile.c   2009-05-25 15:40:40.000000000 +0000
+@@ -1106,10 +1106,8 @@
+ 
+       if (url == NULL) {
+               return critical_error(LASSO_PROFILE_ERROR_UNKNOWN_PROFILE_URL);
+       }
+-      /* No signature on the XML message */
+-      remove_all_signatures(msg);
+       query = lasso_saml20_profile_export_to_query(profile, msg, must_sign);
+       lasso_assign_new_string(profile->msg_url, lasso_concat_url_query(url, query));
+       lasso_release(profile->msg_body);
+       lasso_release(query);
diff -r e6443342d4ba -r d7e2d6f37f27 security/lasso/patches/patch-cb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/lasso/patches/patch-cb   Tue May 26 05:26:00 2009 +0000
@@ -0,0 +1,16 @@
+Index: lasso/xml/xml.c
+===================================================================
+--- lasso/xml/xml.c    (revision 4193)
++++ lasso/xml/xml.c    (revision 4194)
+@@ -1554,8 +1554,9 @@
+                       }
+               }
+       }
+-
+-      node = lasso_node_new_from_xmlNode_with_type(xmlnode, typename);
++      if (typename) {
++              node = lasso_node_new_from_xmlNode_with_type(xmlnode, typename);
++      }
+       lasso_release(typename);
+ 
+       return node;