diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2024-11-08 07:07:08 +0000 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2024-11-08 08:32:25 +0000 |
| commit | e323ac9ae8503ff7936a02cb8bcc114d8d971892 (patch) | |
| tree | c5715056e14cc4051948879fea01f80f0dde743d /security/lasso/files | |
| parent | ca048c2884dc9822310a87e2dfebb8b1647095e2 (diff) | |
| download | ports-e323ac9ae8503ff7936a02cb8bcc114d8d971892.tar.gz ports-e323ac9ae8503ff7936a02cb8bcc114d8d971892.zip | |
security/lasso: Runtime fix after xmlsec1 upgrade
- Fix build with upcoming libxml upgrade [1]
PR: 282243, 281592[1]
Reported by: ray@bellis.me.uk, diizzy[1]
Diffstat (limited to 'security/lasso/files')
| -rw-r--r-- | security/lasso/files/patch-bindings_php5_Makefile.in | 4 | ||||
| -rw-r--r-- | security/lasso/files/patch-lasso_xml_saml-2.0_samlp2__logout__request.c | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/security/lasso/files/patch-bindings_php5_Makefile.in b/security/lasso/files/patch-bindings_php5_Makefile.in index 99cbbf3b8f13..3aa6801a3236 100644 --- a/security/lasso/files/patch-bindings_php5_Makefile.in +++ b/security/lasso/files/patch-bindings_php5_Makefile.in @@ -1,6 +1,6 @@ ---- bindings/php5/Makefile.in.orig 2014-12-05 04:41:25 UTC +--- bindings/php5/Makefile.in.orig 2024-11-08 07:04:20 UTC +++ bindings/php5/Makefile.in -@@ -416,8 +416,7 @@ php_configdir = @PHP5_CONFIG_DIR@ +@@ -500,8 +500,7 @@ lasso_la_CFLAGS = -fno-strict-aliasing $(LASSO_CORE_CF php_config_DATA = lasso.ini lasso_la_CFLAGS = -fno-strict-aliasing $(LASSO_CORE_CFLAGS) \ -I$(top_srcdir) -I$(top_builddir) $(PHP5_INCLUDES) \ diff --git a/security/lasso/files/patch-lasso_xml_saml-2.0_samlp2__logout__request.c b/security/lasso/files/patch-lasso_xml_saml-2.0_samlp2__logout__request.c new file mode 100644 index 000000000000..e05fe42f9f09 --- /dev/null +++ b/security/lasso/files/patch-lasso_xml_saml-2.0_samlp2__logout__request.c @@ -0,0 +1,17 @@ +--- lasso/xml/saml-2.0/samlp2_logout_request.c.orig 2024-11-08 07:04:30 UTC ++++ lasso/xml/saml-2.0/samlp2_logout_request.c +@@ -128,14 +128,10 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump) + lasso_foreach(it, other_session_index) { + xmlNode *child = xmlSecAddChild(xmlnode, BAD_CAST SESSION_INDEX, + BAD_CAST LASSO_SAML2_PROTOCOL_HREF); +-#if (XMLSEC_MAJOR > 1) || (XMLSEC_MAJOR == 1 && XMLSEC_MINOR > 2) || (XMLSEC_MAJOR == 1 && XMLSEC_MINOR == 2 && XMLSEC_SUBMINOR > 12) +- xmlSecNodeEncodeAndSetContent(child, BAD_CAST it->data); +-#else + xmlChar *content; + content = xmlEncodeSpecialChars(child->doc, BAD_CAST it->data); + xmlNodeSetContent(child, content); + xmlFree(content); +-#endif + } + ((LassoSamlp2LogoutRequest*)node)->SessionIndex = keep_session_index; + lasso_release_list_of_strings(other_session_index); |