Date: Sunday, June 18, 2017 @ 10:38:54 Author: bpiotrowski Revision: 298955
2.2.1-1: new upstream patches Modified: expat/trunk/PKGBUILD Deleted: expat/trunk/expat-2.2.0-CVE-2016-0718-regression.patch --------------------------------------------+ PKGBUILD | 21 +++++++-------------- expat-2.2.0-CVE-2016-0718-regression.patch | 27 --------------------------- 2 files changed, 7 insertions(+), 41 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-06-18 09:16:47 UTC (rev 298954) +++ PKGBUILD 2017-06-18 10:38:54 UTC (rev 298955) @@ -4,23 +4,16 @@ # Contributor: Judd Vinet <[email protected]> pkgname=expat -pkgver=2.2.0 -pkgrel=2 +pkgver=2.2.1 +pkgrel=1 pkgdesc='An XML parser library' -arch=('i686' 'x86_64') +arch=(i686 x86_64) url='http://expat.sourceforge.net/' -license=('custom') -depends=('glibc') -source=(http://downloads.sourceforge.net/sourceforge/expat/$pkgname-$pkgver.tar.bz2 - expat-2.2.0-CVE-2016-0718-regression.patch) -md5sums=('2f47841c829facb346eb6e3fab5212e2' - 'dda0b42ed32491577d0b5fb6bf0963be') +license=(custom) +depends=(glibc) +source=(http://downloads.sourceforge.net/sourceforge/expat/$pkgname-$pkgver.tar.bz2) +md5sums=('d9c3baeab58774cefc2f04faf29f2cf8') -prepare() { - cd $pkgname-$pkgver - patch -p2 -i "$srcdir"/expat-2.2.0-CVE-2016-0718-regression.patch -} - build() { cd $pkgname-$pkgver ./configure --prefix=/usr Deleted: expat-2.2.0-CVE-2016-0718-regression.patch =================================================================== --- expat-2.2.0-CVE-2016-0718-regression.patch 2017-06-18 09:16:47 UTC (rev 298954) +++ expat-2.2.0-CVE-2016-0718-regression.patch 2017-06-18 10:38:54 UTC (rev 298955) @@ -1,27 +0,0 @@ -From 3e6190e433479e56f8c1e5adc1198b3c86b15577 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <[email protected]> -Date: Sun, 17 Jul 2016 20:22:29 +0200 -Subject: [PATCH] Fix regression introduced by patch to CVE-2016-0718 (bug - #539) - -Tag names were cut off in some cases; reported by Andy Wang ---- - expat/lib/xmlparse.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c -index 13e080d..2630310 100644 ---- a/expat/lib/xmlparse.c -+++ b/expat/lib/xmlparse.c -@@ -2430,7 +2430,7 @@ doContent(XML_Parser parser, - &fromPtr, rawNameEnd, - (ICHAR **)&toPtr, (ICHAR *)tag->bufEnd - 1); - convLen = (int)(toPtr - (XML_Char *)tag->buf); -- if ((convert_res == XML_CONVERT_COMPLETED) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) { -+ if ((fromPtr >= rawNameEnd) || (convert_res == XML_CONVERT_INPUT_INCOMPLETE)) { - tag->name.strLen = convLen; - break; - } --- -2.9.2 -
