expat: update to 2.1.0

This commit is contained in:
Juergen Daubert 2012-04-03 17:14:13 +02:00
parent 0109870fb2
commit 249fbea70f
5 changed files with 10 additions and 42 deletions

View File

@ -7,9 +7,11 @@ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libexpat.a
-rwxr-xr-x root/root usr/lib/libexpat.la
lrwxrwxrwx root/root usr/lib/libexpat.so -> libexpat.so.1.5.2
lrwxrwxrwx root/root usr/lib/libexpat.so.1 -> libexpat.so.1.5.2
-rwxr-xr-x root/root usr/lib/libexpat.so.1.5.2
lrwxrwxrwx root/root usr/lib/libexpat.so -> libexpat.so.1.6.0
lrwxrwxrwx root/root usr/lib/libexpat.so.1 -> libexpat.so.1.6.0
-rwxr-xr-x root/root usr/lib/libexpat.so.1.6.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/expat.pc
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/xmlwf.1.gz

View File

@ -1,3 +1 @@
ee8b492592568805593f81f8cdf2a04c expat-2.0.1.tar.gz
5ea67d4d96b7debe0eaafe2bf39a43b3 expat-CVE-2009-3560.patch
6e5ccf683c5df15d74711b2719bd7351 expat-CVE-2009-3720.patch
dd7dab7a5fea97d2a6a43f511449b7cd expat-2.1.0.tar.gz

View File

@ -3,16 +3,13 @@
# Maintainer: Juergen Daubert, jue at crux dot nu
name=expat
version=2.0.1
release=3
source=(http://download.sourceforge.net/$name/$name-$version.tar.gz
expat-CVE-2009-3560.patch expat-CVE-2009-3720.patch)
version=2.1.0
release=1
source=(http://download.sourceforge.net/$name/$name-$version.tar.gz)
build() {
cd $name-$version
patch -p0 -d lib -i $SRC/expat-CVE-2009-3560.patch
patch -p0 -d lib -i $SRC/expat-CVE-2009-3720.patch
./configure --prefix=/usr
./configure --prefix=/usr --mandir=/usr/man
make
make DESTDIR=$PKG install
}

View File

@ -1,15 +0,0 @@
# http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3560
# http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmlparse.c?view=patch&r1=1.166&r2=1.164
--- xmlparse.c 2009/09/29 02:49:16 1.164
+++ xmlparse.c 2009/12/29 18:42:05 1.166
@@ -3701,6 +3701,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 */

View File

@ -1,14 +0,0 @@
# http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3720
# http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmltok_impl.c?r1=1.13&r2=1.15&view=patch
--- xmltok_impl.c 2006/11/26 17:34:46 1.13
+++ xmltok_impl.c 2008/06/13 13:18:44 1.15
@@ -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: \