Date: Fri, 8 Nov 2024 08:32:42 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e323ac9ae850 - main - security/lasso: Runtime fix after xmlsec1 upgrade Message-ID: <202411080832.4A88WgIo055215@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=e323ac9ae8503ff7936a02cb8bcc114d8d971892 commit e323ac9ae8503ff7936a02cb8bcc114d8d971892 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-11-08 07:07:08 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-11-08 08:32:25 +0000 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] --- security/lasso/Makefile | 10 +++++++++- security/lasso/distinfo | 12 +++++++++++- security/lasso/files/patch-bindings_php5_Makefile.in | 4 ++-- .../patch-lasso_xml_saml-2.0_samlp2__logout__request.c | 17 +++++++++++++++++ 4 files changed, 39 insertions(+), 4 deletions(-) diff --git a/security/lasso/Makefile b/security/lasso/Makefile index f5b0b5eb5e5d..a08a8ac302aa 100644 --- a/security/lasso/Makefile +++ b/security/lasso/Makefile @@ -1,8 +1,16 @@ PORTNAME= lasso PORTVERSION= 2.8.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://dev.entrouvert.org/releases/lasso/ +PATCH_SITES= https://git.entrouvert.org/entrouvert/lasso/commit/ +PATCHFILES= 46caef81855e58629516f09b101e40bf8778981d.patch:-p1 \ + 1ca8e8699ce1ed072f99ed881a7348f9a78b1e1f.patch:-p1 \ + 66c9f50f1f6b00d621a9a0ca2f924875f94d14ae.patch:-p1 \ + 21c224cfefa1018be9e40fab9a7e36865bf4d0d6.patch:-p1 \ + 3768f1bedf1502a54634195dbb88e5a54869d9b9.patch:-p1 + MAINTAINER= bofh@FreeBSD.org COMMENT= Free Liberty Alliance Implementation WWW= https://lasso.entrouvert.org/ @@ -37,7 +45,7 @@ PYTHON_CONFIGURE_ENABLE= python .include <bsd.port.options.mk> .if ${OPSYS} == FreeBSD -CFLAGS+= -Wno-error=int-conversion +CFLAGS+= -Wno-error=int-conversion -Wno-error=incompatible-function-pointer-types .endif post-patch: diff --git a/security/lasso/distinfo b/security/lasso/distinfo index d59e25bf81e7..11510da7d298 100644 --- a/security/lasso/distinfo +++ b/security/lasso/distinfo @@ -1,3 +1,13 @@ -TIMESTAMP = 1680175980 +TIMESTAMP = 1731049457 SHA256 (lasso-2.8.2.tar.gz) = 6a1831bfdbf8f424c7508aba47b045d51341ec0fde9122f38b0b86b096ef533e SIZE (lasso-2.8.2.tar.gz) = 4023587 +SHA256 (46caef81855e58629516f09b101e40bf8778981d.patch) = 7488edb10ee44c841fd569c8d2cd54954e3392b787d26575284da2b0cefa7830 +SIZE (46caef81855e58629516f09b101e40bf8778981d.patch) = 710 +SHA256 (1ca8e8699ce1ed072f99ed881a7348f9a78b1e1f.patch) = 528f544f9955a5c04e1b65539a0f4eb0da979a444617a4ca2e63ffe2eb03c00b +SIZE (1ca8e8699ce1ed072f99ed881a7348f9a78b1e1f.patch) = 657 +SHA256 (66c9f50f1f6b00d621a9a0ca2f924875f94d14ae.patch) = bb11e0532b86f956144117cd7ab66c8ec4701c41915f217060965abfadd4e77d +SIZE (66c9f50f1f6b00d621a9a0ca2f924875f94d14ae.patch) = 1794 +SHA256 (21c224cfefa1018be9e40fab9a7e36865bf4d0d6.patch) = 3277e6e32540c80077347fbed01afcaacacb0df0a5c50d5a80a8bcd1afbcb540 +SIZE (21c224cfefa1018be9e40fab9a7e36865bf4d0d6.patch) = 2227 +SHA256 (3768f1bedf1502a54634195dbb88e5a54869d9b9.patch) = afa47c582976bfe4a58993abf401f3b5a6bea9805a5f17ac69d2e3f9a6d4abee +SIZE (3768f1bedf1502a54634195dbb88e5a54869d9b9.patch) = 1619 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411080832.4A88WgIo055215>