diff options
| author | manu <manu> | 2014-07-22 09:47:37 +0000 |
|---|---|---|
| committer | manu <manu> | 2014-07-22 09:47:37 +0000 |
| commit | f3c224ef771baca38e327fd20b85362dab93d162 (patch) | |
| tree | 8ba7ff2aca9be9b142e60614ac7ce60fc03d354f /security | |
| parent | f01a610bd988dbba00e25502066fa83300682772 (diff) | |
| download | pkgsrc-f3c224ef771baca38e327fd20b85362dab93d162.tar.gz | |
Bug fix from upstream so that SAML assertion are correctly readen.
Diffstat (limited to 'security')
| -rw-r--r-- | security/crudesaml/Makefile.common | 8 | ||||
| -rw-r--r-- | security/crudesaml/distinfo | 3 | ||||
| -rw-r--r-- | security/crudesaml/patches/patch-saml.c | 20 |
3 files changed, 26 insertions, 5 deletions
diff --git a/security/crudesaml/Makefile.common b/security/crudesaml/Makefile.common index 0db680b2b99..c32be8fc06c 100644 --- a/security/crudesaml/Makefile.common +++ b/security/crudesaml/Makefile.common @@ -1,9 +1,10 @@ -# $NetBSD: Makefile.common,v 1.8 2014/01/09 05:07:05 obache Exp $ +# $NetBSD: Makefile.common,v 1.9 2014/07/22 09:47:37 manu Exp $ # # used by security/cy2-saml/Makefile # used by security/pam-saml/Makefile DISTNAME= crudesaml-1.4 +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= http://ftp.espci.fr/pub/crudesaml/ @@ -15,10 +16,9 @@ USE_TOOLS+= pkg-config USE_LANGUAGES+= c DISTINFO_FILE= ${.CURDIR}/../../security/crudesaml/distinfo +PATCHDIR= ${.CURDIR}/../../security/crudesaml/patches -CONFIGURE_ARGS+=--with-sasl2=${BUILDLINK_PREFIX.cyrus-sasl} -CONFIGURE_ARGS+=--with-lasso=${BUILDLINK_PREFIX.lasso} -CONFIGURE_ARGS+=--with-pam=${PAMBASE} +CONFIGURE_ARGS+=--with-sasl2=${PREFIX} .include "../../security/cyrus-sasl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/security/crudesaml/distinfo b/security/crudesaml/distinfo index 693ca331c1c..9d30b4e3e27 100644 --- a/security/crudesaml/distinfo +++ b/security/crudesaml/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.4 2012/11/08 08:48:13 manu Exp $ +$NetBSD: distinfo,v 1.5 2014/07/22 09:47:37 manu Exp $ SHA1 (crudesaml-1.4.tar.gz) = e6da912439f22970ebd3cab781a61195099c1656 RMD160 (crudesaml-1.4.tar.gz) = 0d9b057b01806e0fae0fb67cd5df6dde8411a0e0 Size (crudesaml-1.4.tar.gz) = 293083 bytes +SHA1 (patch-saml.c) = 48d48c06efc496458b26699a67c269119909f9a0 diff --git a/security/crudesaml/patches/patch-saml.c b/security/crudesaml/patches/patch-saml.c new file mode 100644 index 00000000000..05a67f42f5a --- /dev/null +++ b/security/crudesaml/patches/patch-saml.c @@ -0,0 +1,20 @@ +$NetBSD: patch-saml.c,v 1.1 2014/07/22 09:47:37 manu Exp $ + +When iterating to the root of the assertiin, make sure we do not try to +work on XML_DOCUMENT_NODE type node, only on XML_ELEMENT_NODE. + +--- saml.c.orig 2012-11-08 09:36:54.000000000 +0100 ++++ saml.c 2014-02-10 05:52:14.000000000 +0100 +@@ -385,9 +385,11 @@ + if (node->parent == NULL) + break; + node = node->parent; + +- } while ((node != node->parent) && (node != NULL)); ++ } while ((node != node->parent) && ++ (node != NULL) && ++ (node->type == XML_ELEMENT_NODE)); + + saml_error(params, 0, "SAML assertion signature verification " + "failure (error %d)", error); + return EACCES; |