[pkgsrc/trunk]: pkgsrc/x11/wxGTK28 * Add patches for CVE-2009-2369 and CVE-20...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/17232998e249
branches:  trunk
changeset: 571885:17232998e249
user:      taca <taca%pkgsrc.org@localhost>
date:      Tue Feb 16 17:38:14 2010 +0000

description:
* Add patches for CVE-2009-2369 and CVE-2009-2625.
* Use textproc/expat to fix CVE-2009-3720.

Bump PKGREVISION.

diffstat:

 x11/wxGTK28/Makefile         |   4 ++--
 x11/wxGTK28/Makefile.common  |   4 +++-
 x11/wxGTK28/distinfo         |   9 +++++----
 x11/wxGTK28/patches/patch-ba |   4 +++-
 x11/wxGTK28/patches/patch-bb |   4 +++-
 x11/wxGTK28/patches/patch-ca |   4 +++-
 x11/wxGTK28/patches/patch-cb |  15 +++++++++++++++
 7 files changed, 34 insertions(+), 10 deletions(-)

diffs (112 lines):

diff -r 5ae2f4cff462 -r 17232998e249 x11/wxGTK28/Makefile
--- a/x11/wxGTK28/Makefile      Tue Feb 16 17:36:07 2010 +0000
+++ b/x11/wxGTK28/Makefile      Tue Feb 16 17:38:14 2010 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/02/16 17:38:14 taca Exp $
 #
 
 .include "../../x11/wxGTK28/Makefile.common"
 
-PKGREVISION=   4
+PKGREVISION=   5
 
 PKGNAME=               ${DISTNAME:S/wxGTK/wxGTK28/}
 COMMENT=               GTK-based implementation of the wxWidgets GUI library
diff -r 5ae2f4cff462 -r 17232998e249 x11/wxGTK28/Makefile.common
--- a/x11/wxGTK28/Makefile.common       Tue Feb 16 17:36:07 2010 +0000
+++ b/x11/wxGTK28/Makefile.common       Tue Feb 16 17:38:14 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2009/09/21 17:48:46 tnn Exp $
+# $NetBSD: Makefile.common,v 1.5 2010/02/16 17:38:14 taca Exp $
 #
 # used by x11/wxGTK28/Makefile
 
@@ -30,6 +30,7 @@
 CONFIGURE_ARGS+=       --with-libpng=sys
 CONFIGURE_ARGS+=       --with-libtiff=sys
 CONFIGURE_ARGS+=       --with-opengl
+CONFIGURE_ARGS+=       --with-expat=sys
 CONFIGURE_ARGS+=       --with-zlib=sys
 CONFIGURE_ARGS+=       --with-regex=builtin
 
@@ -64,6 +65,7 @@
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 
diff -r 5ae2f4cff462 -r 17232998e249 x11/wxGTK28/distinfo
--- a/x11/wxGTK28/distinfo      Tue Feb 16 17:36:07 2010 +0000
+++ b/x11/wxGTK28/distinfo      Tue Feb 16 17:38:14 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2009/10/23 12:26:13 plunky Exp $
+$NetBSD: distinfo,v 1.8 2010/02/16 17:38:14 taca Exp $
 
 SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f
 RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a
@@ -10,6 +10,7 @@
 SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2
 SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
 SHA1 (patch-ad) = b07a55257347633edb8997201c82f83619d1d650
-SHA1 (patch-ba) = e47f8613835ce309daff09ae3265d44f37493579
-SHA1 (patch-bb) = 52df734a1df364dc5599a2b9252a15b87cae13b1
-SHA1 (patch-ca) = 4df0c2629c61fbf83a121eb16e490e9c2abb5ad8
+SHA1 (patch-ba) = 367553169526acd6c1c938b0f57c5b6a444d2b10
+SHA1 (patch-bb) = 27855267bd13a1db65cafc96eaba1ef7f71dc65f
+SHA1 (patch-ca) = 7da457e1dbafb42766aa87c1ca9baca675e211ed
+SHA1 (patch-cb) = 8e3ca3df50ef678656787201317a2d2b385c861e
diff -r 5ae2f4cff462 -r 17232998e249 x11/wxGTK28/patches/patch-ba
--- a/x11/wxGTK28/patches/patch-ba      Tue Feb 16 17:36:07 2010 +0000
+++ b/x11/wxGTK28/patches/patch-ba      Tue Feb 16 17:38:14 2010 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ba,v 1.1 2009/08/01 14:03:19 drochner Exp $
+$NetBSD: patch-ba,v 1.2 2010/02/16 17:38:14 taca Exp $
+
+deal with CVE-2009-2369.
 
 --- src/common/imagpng.cpp.orig        2009-03-06 13:17:40.000000000 +0100
 +++ src/common/imagpng.cpp
diff -r 5ae2f4cff462 -r 17232998e249 x11/wxGTK28/patches/patch-bb
--- a/x11/wxGTK28/patches/patch-bb      Tue Feb 16 17:36:07 2010 +0000
+++ b/x11/wxGTK28/patches/patch-bb      Tue Feb 16 17:38:14 2010 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-bb,v 1.1 2009/08/01 14:03:19 drochner Exp $
+$NetBSD: patch-bb,v 1.2 2010/02/16 17:38:14 taca Exp $
+
+deal with CVE-2009-2369.
 
 --- src/common/imagtiff.cpp.orig       2009-03-06 13:17:40.000000000 +0100
 +++ src/common/imagtiff.cpp
diff -r 5ae2f4cff462 -r 17232998e249 x11/wxGTK28/patches/patch-ca
--- a/x11/wxGTK28/patches/patch-ca      Tue Feb 16 17:36:07 2010 +0000
+++ b/x11/wxGTK28/patches/patch-ca      Tue Feb 16 17:38:14 2010 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ca,v 1.1 2009/08/05 20:58:56 drochner Exp $
+$NetBSD: patch-ca,v 1.2 2010/02/16 17:38:14 taca Exp $
+
+deal with CVE-2009-2369.
 
 --- src/common/image.cpp.orig  2009-03-06 13:17:40.000000000 +0100
 +++ src/common/image.cpp
diff -r 5ae2f4cff462 -r 17232998e249 x11/wxGTK28/patches/patch-cb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK28/patches/patch-cb      Tue Feb 16 17:38:14 2010 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-cb,v 1.1 2010/02/16 17:38:14 taca Exp $
+
+deal with CVE-2009-2625.
+
+--- src/expat/lib/xmltok_impl.c.orig   2009-03-06 12:17:57.000000000 +0000
++++ src/expat/lib/xmltok_impl.c
+@@ -1741,7 +1741,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: \