diff --git a/srcpkgs/libxml2/patches/CVE-2019-20388.patch b/srcpkgs/libxml2/patches/CVE-2019-20388.patch deleted file mode 100644 index b0fee2ef010..00000000000 --- 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 ---- a/xmlschemas.c -+++ b/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/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch deleted file mode 100644 index b11c57daf9e..00000000000 --- a/srcpkgs/libxml2/patches/icu-68.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001 -From: Frederik Seiffert -Date: Thu, 12 Nov 2020 12:53:43 +0100 -Subject: [PATCH] Fix building with ICU 68. - -ICU 68 no longer defines the TRUE macro. - -Closes #204. ---- - encoding.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/encoding.c b/encoding.c -index c34aca446..264f60bb4 100644 ---- a/encoding.c -+++ b/encoding.c -@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, - #ifdef LIBXML_ICU_ENABLED - else if (handler->uconv_out != NULL) { - ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, -- TRUE); -+ 1); - } - #endif /* LIBXML_ICU_ENABLED */ - else { diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index 229b60e79d9..e2d76ceec88 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -3,23 +3,18 @@ # Please keep this in sync with "srcpkgs/libxml2-python3" # pkgname=libxml2 -version=2.9.10 -revision=6 +version=2.9.13 +revision=1 build_style=gnu-configure configure_args="--with-threads --with-history --with-icu --without-python" -hostmakedepends="automake libtool gettext-devel pkg-config" +hostmakedepends="gettext pkg-config" makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel icu-devel" short_desc="Library providing XML and HTML support" maintainer="Enno Boland " license="MIT" homepage="http://www.xmlsoft.org/" -distfiles="http://xmlsoft.org/sources/${pkgname}-${version}.tar.gz" -checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f - -pre_configure() { - autoreconf -fi - sed '/PROGRAMS =/s,$(noinst_PROGRAMS),,' -i Makefile.in -} +distfiles="https://download.gnome.org/sources/libxml2/${version%.*}/libxml2-${version}.tar.xz" +checksum=276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e post_install() { vlicense COPYING @@ -36,7 +31,7 @@ libxml2-devel_package() { vmove usr/lib/cmake vmove usr/share/aclocal vmove usr/share/gtk-doc - vmove usr/share/doc/${sourcepkg}-${version} + vmove usr/share/doc vmove "usr/share/man/man1/xml2-config*" vmove usr/share/man/man3 vmove "usr/lib/*.a" diff --git a/srcpkgs/libxml2/update b/srcpkgs/libxml2/update new file mode 100644 index 00000000000..9922cafaf3d --- /dev/null +++ b/srcpkgs/libxml2/update @@ -0,0 +1,2 @@ +site='https://gitlab.gnome.org/GNOME/libxml2/-/tags' +pattern='v\d+.[\d.]+\d'