From fb5111db5b8f2683c9f244d68f47292318cab808 Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 1 Nov 2019 11:13:17 -0300 Subject: main/libxml2: upgrade to 2.9.10 --- main/libxml2/APKBUILD | 33 +++++++---------------- main/libxml2/fix-null-pointer-dereference.patch | 36 ------------------------- 2 files changed, 10 insertions(+), 59 deletions(-) delete mode 100644 main/libxml2/fix-null-pointer-dereference.patch (limited to 'main') diff --git a/main/libxml2/APKBUILD b/main/libxml2/APKBUILD index 91c6b34361..aef741b205 100644 --- a/main/libxml2/APKBUILD +++ b/main/libxml2/APKBUILD @@ -1,22 +1,19 @@ # Contributor: Carlo Landmeter # Maintainer: Carlo Landmeter pkgname=libxml2 -pkgver=2.9.9 -pkgrel=3 +pkgver=2.9.10 +pkgrel=0 pkgdesc="XML parsing library, version 2" url="http://www.xmlsoft.org/" arch="all" license="MIT" depends_dev="zlib-dev xz-dev" checkdepends="perl tar" -makedepends="$depends_dev python2-dev python3-dev" +makedepends="$depends_dev python3-dev" subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-utils - py-$pkgname:_py py2-$pkgname:_py py3-$pkgname:_py" + py3-$pkgname:_py3" options="!strip" -source="http://xmlsoft.org/sources/$pkgname-$pkgver.tar.gz - fix-null-pointer-dereference.patch - " -builddir="$srcdir/$pkgname-$pkgver" +source="http://xmlsoft.org/sources/libxml2-$pkgver.tar.gz" # secfixes: # 2.9.8-r1: @@ -89,19 +86,10 @@ dev() { mv "$pkgdir"/usr/lib/*.sh "$subpkgdir"/usr/lib/ } -_py() { - local python - cd "$builddir" - case $subpkgname in - py2-*) python=python2;; - py3-*) python=python3;; - py-*) mkdir -p "$subpkgdir"; return 0;; # dummy py- package - esac - - pkgdesc="$pkgname $python bindings" - install_if="py-libxml2=$pkgver-r$pkgrel $python" - install -d "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/$python* "$subpkgdir"/usr/lib/ +_py3() { + pkgdesc="$pkgname python3 bindings" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } utils() { @@ -111,5 +99,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810 libxml2-2.9.9.tar.gz -83074e582cdba8bedff40fc653731ad18ca357bde8f1420e2e8a2a38998b951aebcb73ca5d51859be3b4d9bc1a0308836ca2bb612269edbc61b9dd6ebc7fdb2a fix-null-pointer-dereference.patch" +sha512sums="0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed libxml2-2.9.10.tar.gz" diff --git a/main/libxml2/fix-null-pointer-dereference.patch b/main/libxml2/fix-null-pointer-dereference.patch deleted file mode 100644 index 64e7c58f17..0000000000 --- a/main/libxml2/fix-null-pointer-dereference.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2c8dc7158a3b7b028454abcb6f162c4da28ed80b Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Mon, 25 Feb 2019 12:00:50 +0100 -Subject: [PATCH] Fix null pointer dereference in xmlTextReaderReadOuterXml - -Fix a regression caused by commit 39fbfb4f. If xmlTextReaderReadOuterXml -is called on a pristine xmlReader, the current node is NULL and must not -be dereferenced. Move the call to xmlTextReaderExpand to the start of -the function to make sure that we have a valid node. - -Fixes #43. ---- - xmlreader.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xmlreader.c b/xmlreader.c -index cd1fb5fe..b8e98287 100644 ---- a/xmlreader.c -+++ b/xmlreader.c -@@ -1759,11 +1759,11 @@ xmlTextReaderReadOuterXml(xmlTextReaderPtr reader ATTRIBUTE_UNUSED) - xmlBufferPtr buff; - xmlDocPtr doc; - -- node = reader->node; -- doc = node->doc; - if (xmlTextReaderExpand(reader) == NULL) { - return NULL; - } -+ node = reader->node; -+ doc = node->doc; - /* XXX: Why is the node copied? */ - if (node->type == XML_DTD_NODE) { - node = (xmlNodePtr) xmlCopyDtd((xmlDtdPtr) node); --- -2.18.1 - -- cgit v1.2.3