diff options
-rw-r--r-- | security/lasso/distinfo | 7 | ||||
-rw-r--r-- | security/lasso/patches/patch-lasso-xml-tools.c | 25 | ||||
-rw-r--r-- | security/lasso/patches/patch-lasso_id-ff_lecp.c | 24 | ||||
-rw-r--r-- | security/lasso/patches/patch-lasso_id-ff_session.c | 15 | ||||
-rw-r--r-- | security/lasso/patches/patch-lasso_saml-2.0_ecp.c | 24 |
5 files changed, 91 insertions, 4 deletions
diff --git a/security/lasso/distinfo b/security/lasso/distinfo index e35e2d4f29d..7be8709800d 100644 --- a/security/lasso/distinfo +++ b/security/lasso/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2012/05/06 17:14:58 dholland Exp $ +$NetBSD: distinfo,v 1.11 2012/09/28 11:59:18 obache Exp $ SHA1 (lasso-2.3.5.tar.gz) = 3ba022e85a2d05cd00e45d41f8f59a94b71b75b0 RMD160 (lasso-2.3.5.tar.gz) = 24660682b34c38a556b9ea902066cc9b0f74e9a7 @@ -6,4 +6,7 @@ Size (lasso-2.3.5.tar.gz) = 3907467 bytes SHA1 (patch-lasso-errors_c) = 5c0fe304cd9cce6d926362c248ffe60c2c7357c5 SHA1 (patch-lasso-errors_c_in) = d4663edb280d38a0cb1a422d9b95b1d344012f63 SHA1 (patch-lasso-id-ff-provider.c) = 9312c67a8e81eeea95b888745a2b9f504a36a36f -SHA1 (patch-lasso-xml-tools.c) = bd45a4ad4d492c0599665371cc413ef49064b54b +SHA1 (patch-lasso-xml-tools.c) = 1cbc77b8fb9e6a4ecf0c1fe5017cca2782f343e4 +SHA1 (patch-lasso_id-ff_lecp.c) = c19d443664e6a68f37573d54add51998ffa2622b +SHA1 (patch-lasso_id-ff_session.c) = 9fd9c5f413e96f24658c897e9ac10b5c6df253bd +SHA1 (patch-lasso_saml-2.0_ecp.c) = 135f10c1d8b146963f0ccaa74ab5b871317b3111 diff --git a/security/lasso/patches/patch-lasso-xml-tools.c b/security/lasso/patches/patch-lasso-xml-tools.c index cf8b21f6894..30a3acf5a2b 100644 --- a/security/lasso/patches/patch-lasso-xml-tools.c +++ b/security/lasso/patches/patch-lasso-xml-tools.c @@ -1,6 +1,9 @@ -$NetBSD: patch-lasso-xml-tools.c,v 1.1 2011/09/08 00:17:03 joerg Exp $ +$NetBSD: patch-lasso-xml-tools.c,v 1.2 2012/09/28 11:59:18 obache Exp $ ---- lasso/xml/tools.c.orig 2011-09-07 03:18:42.000000000 +0000 +* XXX +* for libxml>=2.9.0 + +--- lasso/xml/tools.c.orig 2011-01-05 13:57:32.000000000 +0000 +++ lasso/xml/tools.c @@ -27,6 +27,7 @@ /* permit importation of timegm for glibc2, wait for people to complain it does not work on their @@ -10,6 +13,15 @@ $NetBSD: patch-lasso-xml-tools.c,v 1.1 2011/09/08 00:17:03 joerg Exp $ #include "private.h" #include <string.h> #include <time.h> +@@ -1063,7 +1064,7 @@ lasso_node_build_deflated_query(LassoNod + buf = xmlAllocOutputBuffer(handler); + xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 0, "utf-8"); + xmlOutputBufferFlush(buf); +- buffer = buf->conv ? buf->conv->content : buf->buffer->content; ++ buffer = xmlBufferContent(buf->conv ? buf->conv : buf->buffer); + + xmlFreeNode(xmlnode); + xmlnode = NULL; @@ -1196,6 +1197,11 @@ lasso_concat_url_query(const char *url, * * Return value: TRUE if no error occurred during evaluation, FALSE otherwise. @@ -41,3 +53,12 @@ $NetBSD: patch-lasso-xml-tools.c,v 1.1 2011/09/08 00:17:03 joerg Exp $ xpath_object = xmlXPathEvalExpression((xmlChar*)expression, xpath_ctx); xpath_ctx->error = oldStructuredErrorFunc; +@@ -2156,7 +2159,7 @@ lasso_xmlnode_to_string(xmlNode *node, g + buf = xmlAllocOutputBuffer(handler); + xmlNodeDumpOutput(buf, NULL, node, level, format ? 1 : 0, "utf-8"); + xmlOutputBufferFlush(buf); +- buffer = buf->conv ? buf->conv->content : buf->buffer->content; ++ buffer = xmlBufferContent(buf->conv ? buf->conv : buf->buffer); + /* do not mix XML and GLib strings, so we must copy */ + str = g_strdup((char*)buffer); + xmlOutputBufferClose(buf); diff --git a/security/lasso/patches/patch-lasso_id-ff_lecp.c b/security/lasso/patches/patch-lasso_id-ff_lecp.c new file mode 100644 index 00000000000..0a3cbf6406a --- /dev/null +++ b/security/lasso/patches/patch-lasso_id-ff_lecp.c @@ -0,0 +1,24 @@ +$NetBSD: patch-lasso_id-ff_lecp.c,v 1.1 2012/09/28 11:59:18 obache Exp $ + +* for libxml2>=2.9.0 + +--- lasso/id-ff/lecp.c.orig 2011-01-05 13:57:32.000000000 +0000 ++++ lasso/id-ff/lecp.c +@@ -96,7 +96,7 @@ lasso_lecp_build_authn_request_envelope_ + xmlOutputBufferFlush(buf); + + lasso_assign_string(profile->msg_body, +- (char*)(buf->conv ? buf->conv->content : buf->buffer->content)); ++ (char*)(xmlBufferContent(buf->conv ? buf->conv : buf->buffer))); + xmlOutputBufferClose(buf); + xmlFreeNode(msg); + +@@ -342,7 +342,7 @@ lasso_lecp_process_authn_request_envelop + xmlNodeDumpOutput(buf, NULL, soap_envelope, 0, 0, "utf-8"); + xmlOutputBufferFlush(buf); + LASSO_PROFILE(lecp)->msg_body = g_strdup( (char*)( +- buf->conv ? buf->conv->content : buf->buffer->content)); ++ buf->conv ? xmlBufferContent(buf->conv) : xmlBufferContent(buf->buffer))); + xmlOutputBufferClose(buf); + xmlFreeNode(soap_envelope); + diff --git a/security/lasso/patches/patch-lasso_id-ff_session.c b/security/lasso/patches/patch-lasso_id-ff_session.c new file mode 100644 index 00000000000..52546309da7 --- /dev/null +++ b/security/lasso/patches/patch-lasso_id-ff_session.c @@ -0,0 +1,15 @@ +$NetBSD: patch-lasso_id-ff_session.c,v 1.1 2012/09/28 11:59:18 obache Exp $ + +* for libxml2>=2.9.0 + +--- lasso/id-ff/session.c.orig 2011-01-05 13:57:32.000000000 +0000 ++++ lasso/id-ff/session.c +@@ -450,7 +450,7 @@ xmlNode_to_base64(xmlNode *node) { + goto cleanup; + xmlNodeDumpOutput(buf, NULL, node, 0, 0, "utf-8"); + xmlOutputBufferFlush(buf); +- buffer = buf->conv ? buf->conv->content : buf->buffer->content; ++ buffer = xmlBufferContent(buf->conv ? buf->conv : buf->buffer); + + ret = xmlSecBase64Encode(buffer, strlen((char*)buffer), 0); + diff --git a/security/lasso/patches/patch-lasso_saml-2.0_ecp.c b/security/lasso/patches/patch-lasso_saml-2.0_ecp.c new file mode 100644 index 00000000000..dc465d9cc41 --- /dev/null +++ b/security/lasso/patches/patch-lasso_saml-2.0_ecp.c @@ -0,0 +1,24 @@ +$NetBSD: patch-lasso_saml-2.0_ecp.c,v 1.1 2012/09/28 11:59:18 obache Exp $ + +* for libxml2>=2.9.0 + +--- lasso/saml-2.0/ecp.c.orig 2011-01-05 13:57:32.000000000 +0000 ++++ lasso/saml-2.0/ecp.c +@@ -175,7 +175,7 @@ lasso_ecp_process_authn_request_msg(Lass + xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 0, "utf-8"); + xmlOutputBufferFlush(buf); + LASSO_PROFILE(ecp)->msg_body = g_strdup( +- (char*)(buf->conv ? buf->conv->content : buf->buffer->content)); ++ (char*)(xmlBufferContent(buf->conv ? buf->conv : buf->buffer))); + xmlOutputBufferClose(buf); + lasso_release_doc(doc); + +@@ -276,7 +276,7 @@ lasso_ecp_process_response_msg(LassoEcp + xmlNodeDumpOutput(buf, NULL, new_envelope, 0, 0, "utf-8"); + xmlOutputBufferFlush(buf); + LASSO_PROFILE(ecp)->msg_body = g_strdup( +- (char*)(buf->conv ? buf->conv->content : buf->buffer->content)); ++ (char*)(xmlBufferContent(buf->conv ? buf->conv : buf->buffer))); + xmlOutputBufferClose(buf); + + lasso_release_doc(doc); |