diff options
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | PKGBUILD | 24 | ||||
| -rw-r--r-- | no-fuzz.diff (renamed from no-fuzz.patch) | 2 |
3 files changed, 17 insertions, 22 deletions
@@ -1,8 +1,11 @@ pkgbase = python2-libxml2 pkgdesc = XML parsing library, version 2 - pkgver = 2.9.12 - pkgrel = 6 + pkgver = 2.9.13 + pkgrel = 1 url = http://www.xmlsoft.org/ + arch = aarch64 + arch = i686 + arch = pentium4 arch = x86_64 license = MIT makedepends = python2 @@ -12,11 +15,11 @@ pkgbase = python2-libxml2 depends = ncurses depends = xz depends = icu - source = libxml2::git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=b48e77cf4f6fa0792c5f4b639707a2b0675e461b - source = no-fuzz.patch + source = libxml2::git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=a075d256fd9ff15590b86d981b75a50ead124fca + source = no-fuzz.diff source = https://www.w3.org/XML/Test/xmlts20130923.tar.gz sha256sums = SKIP - sha256sums = 163655aba312c237a234a82d64b71a65bd9d1d901e176d443e3e3ac64f3b1b32 + sha256sums = 3fc010d8c42b93e6d6f1fca6b598a561e9d2c8780ff3ca0c76a31efabaea404f sha256sums = 9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f pkgname = python2-libxml2 @@ -3,24 +3,25 @@ # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: John Proctor <jproctor@prium.net> +# Contributor: MarsSeed <marcell.meszaros@runbox.eu> _pkgname=libxml2 pkgname=python2-$_pkgname -pkgver=2.9.12 -pkgrel=6 +pkgver=2.9.13 +pkgrel=1 pkgdesc='XML parsing library, version 2' url='http://www.xmlsoft.org/' -arch=(x86_64) +arch=(aarch64 i686 pentium4 x86_64) license=(MIT) depends=(zlib readline ncurses xz icu) makedepends=(python2 git) -_commit=b48e77cf4f6fa0792c5f4b639707a2b0675e461b # tags/v2.9.12^0 +_commit=a075d256fd9ff15590b86d981b75a50ead124fca # tags/v2.9.13^0 _w3_tests="https://www.w3.org/XML/Test/xmlts20130923.tar.gz" source=("${_pkgname}::git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit" - no-fuzz.patch # Do not run fuzzing tests + no-fuzz.diff # Do not run fuzzing tests "${_w3_tests}") sha256sums=('SKIP' - '163655aba312c237a234a82d64b71a65bd9d1d901e176d443e3e3ac64f3b1b32' + '3fc010d8c42b93e6d6f1fca6b598a561e9d2c8780ff3ca0c76a31efabaea404f' '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f') pkgver() { @@ -36,21 +37,12 @@ prepare() { cd "${_pkgname}" - # Work around lxml API abuse - git cherry-pick -n 85b1792e37b131e7a51af98a37f92472e8de5f3f - # Fix regression in xmlNodeDumpOutputInternal - git cherry-pick -n 13ad8736d294536da4cbcd70a96b0a2fbf47070c - # Fix XPath recursion limit - git cherry-pick -n 3e1aad4fe584747fd7d17cc7b2863a78e2d21a77 - # Fix whitespace when serializing empty HTML documents - git cherry-pick -n 92d9ab4c28842a09ca2b76d3ff2f933e01b6cd6f - # Take patches from https://src.fedoraproject.org/rpms/libxml2/tree/master local src for src in "${source[@]}"; do src="${src%%::*}" src="${src##*/}" - [[ $src = *.patch ]] || continue + [[ $src = *.diff ]] || continue echo "Applying patch $src..." git apply -3 "../$src" done diff --git a/no-fuzz.patch b/no-fuzz.diff index 122c40d..67ab6cc 100644 --- a/no-fuzz.patch +++ b/no-fuzz.diff @@ -1,5 +1,5 @@ diff --git i/Makefile.am w/Makefile.am -index a9284b95..3d7b344d 100644 +index 7917b595..f0f4b695 100644 --- i/Makefile.am +++ w/Makefile.am @@ -2,9 +2,9 @@ |