From bf20229b725f970d43c35868890c49fa2921b027 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Fri, 28 May 2021 20:43:29 +0200 Subject: [PATCH 1/2] libxml2: update to 2.9.12. --- srcpkgs/libxml2/patches/CVE-2019-20388.patch | 32 -------------------- srcpkgs/libxml2/template | 6 ++-- 2 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/libxml2/patches/CVE-2019-20388.patch diff --git a/srcpkgs/libxml2/patches/CVE-2019-20388.patch b/srcpkgs/libxml2/patches/CVE-2019-20388.patch deleted file mode 100644 index e1582f299de3..000000000000 --- a/srcpkgs/libxml2/patches/CVE-2019-20388.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6088a74bcf7d0c42e24cff4594d804e1d3c9fbca Mon Sep 17 00:00:00 2001 -From: Zhipeng Xie -Date: Tue, 20 Aug 2019 16:33:06 +0800 -Subject: [PATCH] Fix memory leak in xmlSchemaValidateStream - -When ctxt->schema is NULL, xmlSchemaSAXPlug->xmlSchemaPreRun -alloc a new schema for ctxt->schema and set vctxt->xsiAssemble -to 1. Then xmlSchemaVStart->xmlSchemaPreRun initialize -vctxt->xsiAssemble to 0 again which cause the alloced schema -can not be freed anymore. - -Found with libFuzzer. - -Signed-off-by: Zhipeng Xie ---- - xmlschemas.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/xmlschemas.c b/xmlschemas.c -index 301c8449..39d92182 100644 ---- xmlschemas.c -+++ xmlschemas.c -@@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { - vctxt->nberrors = 0; - vctxt->depth = -1; - vctxt->skipDepth = -1; -- vctxt->xsiAssemble = 0; - vctxt->hasKeyrefs = 0; - #ifdef ENABLE_IDC_NODE_TABLES_TEST - vctxt->createIDCNodeTables = 1; --- -2.24.1 diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index c334f505ed0c..a5998d76c6a1 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -3,8 +3,8 @@ # Please keep this in sync with "srcpkgs/libxml2-python" # pkgname=libxml2 -version=2.9.10 -revision=4 +version=2.9.12 +revision=1 build_style=gnu-configure configure_args="--with-threads --with-history --with-icu --without-python" hostmakedepends="automake libtool gettext-devel pkg-config" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="MIT" homepage="http://www.xmlsoft.org/" distfiles="http://xmlsoft.org/sources/${pkgname}-${version}.tar.gz" -checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f +checksum=c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 pre_configure() { autoreconf -fi From 8bc1a03262e7038a47f37e4815b312389c465348 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Fri, 28 May 2021 20:44:08 +0200 Subject: [PATCH 2/2] libxml2-python: update to 2.9.12. --- srcpkgs/libxml2-python/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libxml2-python/template b/srcpkgs/libxml2-python/template index 4208519dac3e..6c963cb53877 100644 --- a/srcpkgs/libxml2-python/template +++ b/srcpkgs/libxml2-python/template @@ -1,7 +1,7 @@ # Template file for 'libxml2-python' pkgname=libxml2-python -version=2.9.10 -revision=3 +version=2.9.12 +revision=1 wrksrc="${pkgname%-python}-${version}" build_wrksrc=python build_style=python-module @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="MIT" homepage="http://www.xmlsoft.org/" distfiles="http://xmlsoft.org/sources/libxml2-${version}.tar.gz" -checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f +checksum=c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 post_patch() { if [ "${CROSS_BUILD}" ]; then