diff options
Diffstat (limited to 'textproc/expat')
| -rw-r--r-- | textproc/expat/Makefile | 8 | ||||
| -rw-r--r-- | textproc/expat/PLIST | 3 | ||||
| -rw-r--r-- | textproc/expat/distinfo | 10 | ||||
| -rw-r--r-- | textproc/expat/patches/patch-aa | 15 | ||||
| -rw-r--r-- | textproc/expat/patches/patch-ab | 16 |
5 files changed, 11 insertions, 41 deletions
diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile index 3ecb304e9e0..7d92f2968b8 100644 --- a/textproc/expat/Makefile +++ b/textproc/expat/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.25 2010/01/26 18:37:01 drochner Exp $ +# $NetBSD: Makefile,v 1.26 2012/04/01 08:52:43 obache Exp $ # -DISTNAME= expat-2.0.1 -PKGREVISION= 2 +DISTNAME= expat-2.1.0 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=expat/} MAINTAINER= drochner@NetBSD.org HOMEPAGE= http://expat.sourceforge.net/ COMMENT= XML parser library written in C +LICENSE= mit PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir @@ -17,6 +17,8 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_TOOLS+= gmake +PKGCONFIG_OVERRIDE+= expat.pc.in + DOCDIR= ${PREFIX}/share/doc/html/expat post-install: diff --git a/textproc/expat/PLIST b/textproc/expat/PLIST index a0aba02bff1..42d13107e9c 100644 --- a/textproc/expat/PLIST +++ b/textproc/expat/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:17:15 joerg Exp $ +@comment $NetBSD: PLIST,v 1.9 2012/04/01 08:52:43 obache Exp $ bin/xmlwf include/expat.h include/expat_external.h lib/libexpat.la +lib/pkgconfig/expat.pc man/man1/xmlwf.1 share/doc/html/expat/reference.html share/doc/html/expat/style.css diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo index 25cc8ff31e2..7da9a0e4da4 100644 --- a/textproc/expat/distinfo +++ b/textproc/expat/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.19 2010/01/26 18:37:01 drochner Exp $ +$NetBSD: distinfo,v 1.20 2012/04/01 08:52:43 obache Exp $ -SHA1 (expat-2.0.1.tar.gz) = 663548c37b996082db1f2f2c32af060d7aa15c2d -RMD160 (expat-2.0.1.tar.gz) = d31bcb152adaff9e358968be1ea901e1b4ed3b2f -Size (expat-2.0.1.tar.gz) = 446456 bytes -SHA1 (patch-aa) = 79b4caee7c1be8cecb1590b19c220d39e4723a26 -SHA1 (patch-ab) = bdca769ae40099e2e0e0f04c96b9ce7a97b4d66b +SHA1 (expat-2.1.0.tar.gz) = b08197d146930a5543a7b99e871cba3da614f6f0 +RMD160 (expat-2.1.0.tar.gz) = bffca083d29fe7688f106a902ef9b909c3321c5d +Size (expat-2.1.0.tar.gz) = 562616 bytes diff --git a/textproc/expat/patches/patch-aa b/textproc/expat/patches/patch-aa deleted file mode 100644 index 9c21a0929dc..00000000000 --- a/textproc/expat/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2009/11/08 08:34:32 obache Exp $ - -CVE-2009-3720 - ---- lib/xmltok_impl.c.orig 2009-09-10 11:37:45.000000000 +0200 -+++ lib/xmltok_impl.c -@@ -1744,7 +1744,7 @@ PREFIX(updatePosition)(const ENCODING *e - 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/textproc/expat/patches/patch-ab b/textproc/expat/patches/patch-ab deleted file mode 100644 index fd7601cedf4..00000000000 --- a/textproc/expat/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2010/01/26 18:37:01 drochner Exp $ - -CVE-2009-3560 - ---- lib/xmlparse.c.orig 2007-05-08 02:25:35.000000000 +0000 -+++ lib/xmlparse.c -@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser, - 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 */ |