Mon Jan 24 15:34:31 2011 UTC ()
Add upstream bug report URL.


(wiz)
diff -r1.10 -r1.11 pkgsrc/x11/wxGTK28/distinfo
diff -r1.3 -r1.4 pkgsrc/x11/wxGTK28/patches/patch-ba
cvs diff -r1.10 -r1.11 pkgsrc/x11/wxGTK28/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK28/Attic/distinfo 2011/01/14 11:54:04 1.10
+++ pkgsrc/x11/wxGTK28/Attic/distinfo 2011/01/24 15:34:31 1.11
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.10 2011/01/14 11:54:04 wiz Exp $ 1$NetBSD: distinfo,v 1.11 2011/01/24 15:34:31 wiz Exp $
2 2
3SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f 3SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f
4RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a 4RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a
5Size (wxGTK-2.8.10-libtool.diff.bz2) = 154573 bytes 5Size (wxGTK-2.8.10-libtool.diff.bz2) = 154573 bytes
6SHA1 (wxGTK-2.8.10.tar.bz2) = 1e4bee16a423efeef665ed70e82b6e7dc5468cf4 6SHA1 (wxGTK-2.8.10.tar.bz2) = 1e4bee16a423efeef665ed70e82b6e7dc5468cf4
7RMD160 (wxGTK-2.8.10.tar.bz2) = b007de9b19ef4830d9f484c0d12595a14e66d432 7RMD160 (wxGTK-2.8.10.tar.bz2) = b007de9b19ef4830d9f484c0d12595a14e66d432
8Size (wxGTK-2.8.10.tar.bz2) = 9365627 bytes 8Size (wxGTK-2.8.10.tar.bz2) = 9365627 bytes
9SHA1 (patch-aa) = fbcfd8e6abaabab393f24dc368c1c6b8447a75be 9SHA1 (patch-aa) = fbcfd8e6abaabab393f24dc368c1c6b8447a75be
10SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2 10SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2
11SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c 11SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
12SHA1 (patch-ad) = b07a55257347633edb8997201c82f83619d1d650 12SHA1 (patch-ad) = b07a55257347633edb8997201c82f83619d1d650
13SHA1 (patch-ba) = b6b07cbed81cccb2619f671346e9cfe78bda83d3 13SHA1 (patch-ba) = a715fe740cdd17428527b25e546cd1f8873c2d37
14SHA1 (patch-bb) = 27855267bd13a1db65cafc96eaba1ef7f71dc65f 14SHA1 (patch-bb) = 27855267bd13a1db65cafc96eaba1ef7f71dc65f
15SHA1 (patch-ca) = 7da457e1dbafb42766aa87c1ca9baca675e211ed 15SHA1 (patch-ca) = 7da457e1dbafb42766aa87c1ca9baca675e211ed
16SHA1 (patch-cb) = 8e3ca3df50ef678656787201317a2d2b385c861e 16SHA1 (patch-cb) = 8e3ca3df50ef678656787201317a2d2b385c861e
cvs diff -r1.3 -r1.4 pkgsrc/x11/wxGTK28/patches/Attic/patch-ba (expand / switch to unified diff)

--- pkgsrc/x11/wxGTK28/patches/Attic/patch-ba 2011/01/14 11:54:04 1.3
+++ pkgsrc/x11/wxGTK28/patches/Attic/patch-ba 2011/01/24 15:34:31 1.4
@@ -1,18 +1,20 @@ @@ -1,18 +1,20 @@
1$NetBSD: patch-ba,v 1.3 2011/01/14 11:54:04 wiz Exp $ 1$NetBSD: patch-ba,v 1.4 2011/01/24 15:34:31 wiz Exp $
2 2
3deal with CVE-2009-2369. (chunks 2 + 3) 3deal with CVE-2009-2369. (chunks 2 + 3)
4 4
5Fix build with png-1.5. (chunks 1 + 4) 5Fix build with png-1.5. (chunks 1 + 4)
 6http://trac.wxwidgets.org/ticket/12896 for first one, other
 7one already fixed in SVN head.
6 8
7--- src/common/imagpng.cpp.orig 2009-03-06 12:17:40.000000000 +0000 9--- src/common/imagpng.cpp.orig 2009-03-06 12:17:40.000000000 +0000
8+++ src/common/imagpng.cpp 10+++ src/common/imagpng.cpp
9@@ -529,7 +529,7 @@ wxPNGHandler::LoadFile(wxImage *image, 11@@ -529,7 +529,7 @@ wxPNGHandler::LoadFile(wxImage *image,
10 png_structp png_ptr = png_create_read_struct 12 png_structp png_ptr = png_create_read_struct
11 ( 13 (
12 PNG_LIBPNG_VER_STRING, 14 PNG_LIBPNG_VER_STRING,
13- (voidp) NULL, 15- (voidp) NULL,
14+ NULL, 16+ NULL,
15 wx_png_error, 17 wx_png_error,
16 wx_png_warning 18 wx_png_warning
17 ); 19 );
18@@ -568,18 +568,16 @@ wxPNGHandler::LoadFile(wxImage *image, 20@@ -568,18 +568,16 @@ wxPNGHandler::LoadFile(wxImage *image,