summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--abs/core/expat/CVE-2009-3560.patch13
-rw-r--r--abs/core/expat/CVE-2009-3720.patch12
-rw-r--r--abs/core/expat/PKGBUILD39
3 files changed, 21 insertions, 43 deletions
diff --git a/abs/core/expat/CVE-2009-3560.patch b/abs/core/expat/CVE-2009-3560.patch
deleted file mode 100644
index 5fe9c36..0000000
--- a/abs/core/expat/CVE-2009-3560.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c
---- trunk~/lib/xmlparse.c 2007-05-08 04:25:35.000000000 +0200
-+++ trunk/lib/xmlparse.c 2009-12-29 21:57:22.141732904 +0100
-@@ -3703,6 +3703,9 @@
- return XML_ERROR_UNCLOSED_TOKEN;
- case XML_TOK_PARTIAL_CHAR:
- return XML_ERROR_PARTIAL_CHAR;
-+ case -XML_TOK_PROLOG_S:
-+ tok = -tok;
-+ break;
- case XML_TOK_NONE:
- #ifdef XML_DTD
- /* for internal PE NOT referenced between declarations */
diff --git a/abs/core/expat/CVE-2009-3720.patch b/abs/core/expat/CVE-2009-3720.patch
deleted file mode 100644
index 65d1643..0000000
--- a/abs/core/expat/CVE-2009-3720.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNad trunk~/lib/xmltok_impl.c trunk/lib/xmltok_impl.c
---- trunk~/lib/xmltok_impl.c 2006-11-26 18:34:46.000000000 +0100
-+++ trunk/lib/xmltok_impl.c 2009-10-22 21:42:41.000000000 +0200
-@@ -1744,7 +1744,7 @@
- const char *end,
- POSITION *pos)
- {
-- while (ptr != end) {
-+ while (ptr < end) {
- switch (BYTE_TYPE(enc, ptr)) {
- #define LEAD_CASE(n) \
- case BT_LEAD ## n: \
diff --git a/abs/core/expat/PKGBUILD b/abs/core/expat/PKGBUILD
index e2f1038..73688e0 100644
--- a/abs/core/expat/PKGBUILD
+++ b/abs/core/expat/PKGBUILD
@@ -1,29 +1,32 @@
-# $Id: PKGBUILD 62836 2010-01-12 23:27:10Z allan $
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 156201 2012-04-16 03:41:12Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
# Committer: Judd Vinet <jvinet@zeroflux.org>
pkgname=expat
-pkgver=2.0.1
-pkgrel=5
-pkgdesc="An XML Parser library written in C"
+pkgver=2.1.0
+pkgrel=1
+pkgdesc="An XML parser library"
arch=('i686' 'x86_64')
url="http://expat.sourceforge.net/"
license=('custom')
depends=('glibc')
options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz
- CVE-2009-3560.patch
- CVE-2009-3720.patch)
-md5sums=('ee8b492592568805593f81f8cdf2a04c'
- '50603cac0f03aabc7087415251f592be'
- 'f3eeb796f28945899216b815e5901996')
+source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz)
+md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i $srcdir/CVE-2009-3560.patch
- patch -Np1 -i $srcdir/CVE-2009-3720.patch
- ./configure --prefix=/usr --mandir=/usr/share/man || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+ install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
}