[arch-commits] Commit in expat/repos (8 files)
Allan McRae
allan at archlinux.org
Thu Nov 3 06:22:06 UTC 2011
Date: Thursday, November 3, 2011 @ 02:22:06
Author: allan
Revision: 141915
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
expat/repos/testing-i686/
expat/repos/testing-i686/CVE-2009-3560.patch
(from rev 141914, expat/trunk/CVE-2009-3560.patch)
expat/repos/testing-i686/CVE-2009-3720.patch
(from rev 141914, expat/trunk/CVE-2009-3720.patch)
expat/repos/testing-i686/PKGBUILD
(from rev 141914, expat/trunk/PKGBUILD)
expat/repos/testing-x86_64/
expat/repos/testing-x86_64/CVE-2009-3560.patch
(from rev 141914, expat/trunk/CVE-2009-3560.patch)
expat/repos/testing-x86_64/CVE-2009-3720.patch
(from rev 141914, expat/trunk/CVE-2009-3720.patch)
expat/repos/testing-x86_64/PKGBUILD
(from rev 141914, expat/trunk/PKGBUILD)
------------------------------------+
testing-i686/CVE-2009-3560.patch | 13 +++++++++++
testing-i686/CVE-2009-3720.patch | 12 +++++++++++
testing-i686/PKGBUILD | 38 +++++++++++++++++++++++++++++++++++
testing-x86_64/CVE-2009-3560.patch | 13 +++++++++++
testing-x86_64/CVE-2009-3720.patch | 12 +++++++++++
testing-x86_64/PKGBUILD | 38 +++++++++++++++++++++++++++++++++++
6 files changed, 126 insertions(+)
Copied: expat/repos/testing-i686/CVE-2009-3560.patch (from rev 141914, expat/trunk/CVE-2009-3560.patch)
===================================================================
--- testing-i686/CVE-2009-3560.patch (rev 0)
+++ testing-i686/CVE-2009-3560.patch 2011-11-03 06:22:06 UTC (rev 141915)
@@ -0,0 +1,13 @@
+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 */
Copied: expat/repos/testing-i686/CVE-2009-3720.patch (from rev 141914, expat/trunk/CVE-2009-3720.patch)
===================================================================
--- testing-i686/CVE-2009-3720.patch (rev 0)
+++ testing-i686/CVE-2009-3720.patch 2011-11-03 06:22:06 UTC (rev 141915)
@@ -0,0 +1,12 @@
+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: \
Copied: expat/repos/testing-i686/PKGBUILD (from rev 141914, expat/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2011-11-03 06:22:06 UTC (rev 141915)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Committer: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=expat
+pkgver=2.0.1
+pkgrel=7
+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')
+
+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
+ 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
+}
Copied: expat/repos/testing-x86_64/CVE-2009-3560.patch (from rev 141914, expat/trunk/CVE-2009-3560.patch)
===================================================================
--- testing-x86_64/CVE-2009-3560.patch (rev 0)
+++ testing-x86_64/CVE-2009-3560.patch 2011-11-03 06:22:06 UTC (rev 141915)
@@ -0,0 +1,13 @@
+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 */
Copied: expat/repos/testing-x86_64/CVE-2009-3720.patch (from rev 141914, expat/trunk/CVE-2009-3720.patch)
===================================================================
--- testing-x86_64/CVE-2009-3720.patch (rev 0)
+++ testing-x86_64/CVE-2009-3720.patch 2011-11-03 06:22:06 UTC (rev 141915)
@@ -0,0 +1,12 @@
+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: \
Copied: expat/repos/testing-x86_64/PKGBUILD (from rev 141914, expat/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-11-03 06:22:06 UTC (rev 141915)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Committer: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=expat
+pkgver=2.0.1
+pkgrel=7
+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')
+
+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
+ 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
+}
More information about the arch-commits
mailing list