diff options
| author | wiz <wiz> | 2011-01-24 09:33:32 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-01-24 09:33:32 +0000 |
| commit | a1539b7303a85c7bf666eefbe5decca07a8f3400 (patch) | |
| tree | 89a6159d0f111a59b02e97282937fc6962d2bc95 /x11/wxGTK26 | |
| parent | 2010f98697d65490574d1f4e9765b88570596c47 (diff) | |
| download | pkgsrc-a1539b7303a85c7bf666eefbe5decca07a8f3400.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'x11/wxGTK26')
| -rw-r--r-- | x11/wxGTK26/distinfo | 4 | ||||
| -rw-r--r-- | x11/wxGTK26/patches/patch-af | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/x11/wxGTK26/distinfo b/x11/wxGTK26/distinfo index 92a523b5ff6..5c9e6132775 100644 --- a/x11/wxGTK26/distinfo +++ b/x11/wxGTK26/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2010/06/13 22:45:54 wiz Exp $ +$NetBSD: distinfo,v 1.6 2011/01/24 09:33:32 wiz Exp $ SHA1 (wxGTK-2.6.3-libtool.diff3.bz2) = 657566a9384a4bc160dffd26678b5e0c6a1cb5b2 RMD160 (wxGTK-2.6.3-libtool.diff3.bz2) = 233af8dd61317ed1771c1862c6cec65f131b6de0 @@ -11,6 +11,6 @@ SHA1 (patch-ab) = 3e9c6bc0df33e466390a4f6483b1c84e2eb9257b SHA1 (patch-ac) = 50bd7d4291e44dac1d2bbbae1b12167177f5ef01 SHA1 (patch-ad) = fb51bb80451d39ba2bba53d42722327888b4a0be SHA1 (patch-ae) = d6fcc9b21fd457e79c32f2dc47166dc7afbd65b1 -SHA1 (patch-af) = 96e29001bcf1fbc33f4cb185f25f53a6901ce9d2 +SHA1 (patch-af) = 3c284feffe3e1c8fae6302dbd86ce8421fd0f6ba SHA1 (patch-ag) = ccaac341ecd589dbde465f49064dd2ab480fc639 SHA1 (patch-ah) = e7da6aacd004048d0d07965df09e97cef5a76551 diff --git a/x11/wxGTK26/patches/patch-af b/x11/wxGTK26/patches/patch-af index 32ff807c1dc..a56491a9daf 100644 --- a/x11/wxGTK26/patches/patch-af +++ b/x11/wxGTK26/patches/patch-af @@ -1,9 +1,19 @@ -$NetBSD: patch-af,v 1.1 2010/02/16 17:35:34 taca Exp $ +$NetBSD: patch-af,v 1.2 2011/01/24 09:33:33 wiz Exp $ +Fix build with png-1.5. deal with CVE-2009-2369. --- src/common/imagpng.cpp.orig 2006-03-21 23:42:10.000000000 +0000 +++ src/common/imagpng.cpp +@@ -528,7 +528,7 @@ wxPNGHandler::LoadFile(wxImage *image, + png_structp png_ptr = png_create_read_struct + ( + PNG_LIBPNG_VER_STRING, +- (voidp) NULL, ++ NULL, + wx_png_error, + wx_png_warning + ); @@ -570,18 +570,16 @@ wxPNGHandler::LoadFile(wxImage *image, if (!image->Ok()) goto error; |