Tue Nov 27 11:13:49 2012 UTC ()
note CVE #


(drochner)
diff -r1.70 -r1.71 pkgsrc/graphics/gimp/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/gimp/patches/patch-bug687392
cvs diff -r1.70 -r1.71 pkgsrc/graphics/gimp/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/gimp/distinfo 2012/11/23 15:43:13 1.70
+++ pkgsrc/graphics/gimp/distinfo 2012/11/27 11:13:48 1.71
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.70 2012/11/23 15:43:13 drochner Exp $ 1$NetBSD: distinfo,v 1.71 2012/11/27 11:13:48 drochner Exp $
2 2
3SHA1 (gimp-2.8.2.tar.bz2) = 64ad90cedc5e8e348310b6eb6b7821ec110c0886 3SHA1 (gimp-2.8.2.tar.bz2) = 64ad90cedc5e8e348310b6eb6b7821ec110c0886
4RMD160 (gimp-2.8.2.tar.bz2) = 353cf862302417c35df902618a3ba05ac0b3af41 4RMD160 (gimp-2.8.2.tar.bz2) = 353cf862302417c35df902618a3ba05ac0b3af41
5Size (gimp-2.8.2.tar.bz2) = 20161424 bytes 5Size (gimp-2.8.2.tar.bz2) = 20161424 bytes
6SHA1 (patch-aa) = 8107200cc3007e6ae4b9064ee05e5c9a00cca2ef 6SHA1 (patch-aa) = 8107200cc3007e6ae4b9064ee05e5c9a00cca2ef
7SHA1 (patch-ab) = 609c6488768f9d628e6f09ede216fef7db99721c 7SHA1 (patch-ab) = 609c6488768f9d628e6f09ede216fef7db99721c
8SHA1 (patch-ad) = 7863678d59ccf54e2ce61a4ac4b883fb9eb5fb82 8SHA1 (patch-ad) = 7863678d59ccf54e2ce61a4ac4b883fb9eb5fb82
9SHA1 (patch-app_Makefile.in) = efbd9e592cdbc154e5a6402279c7d54f3946c65c 9SHA1 (patch-app_Makefile.in) = efbd9e592cdbc154e5a6402279c7d54f3946c65c
10SHA1 (patch-app_base_base-utils.c) = 18dfa09c1d63530ff79cd4c3515d9f1077182d64 10SHA1 (patch-app_base_base-utils.c) = 18dfa09c1d63530ff79cd4c3515d9f1077182d64
11SHA1 (patch-app_config_Makefile.in) = a2fcebd994831fbe0f911efb84c1fecdf2e59198 11SHA1 (patch-app_config_Makefile.in) = a2fcebd994831fbe0f911efb84c1fecdf2e59198
12SHA1 (patch-bug687392) = d5f15e1cf8b11ff2255fa470adf1f87f501d027c 12SHA1 (patch-bug687392) = 5cc488323c8761521cb3880f2a0d7376d6acd136
13SHA1 (patch-devel-docs_app_Makefile.in) = 1eb97f779d5151b9e89b4ae47afb44d1bb3b6a48 13SHA1 (patch-devel-docs_app_Makefile.in) = 1eb97f779d5151b9e89b4ae47afb44d1bb3b6a48
14SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = 4932d82711c8010cf7b1ff5bfb12031946273c2b 14SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = 4932d82711c8010cf7b1ff5bfb12031946273c2b
cvs diff -r1.1 -r1.2 pkgsrc/graphics/gimp/patches/Attic/patch-bug687392 (expand / switch to unified diff)

--- pkgsrc/graphics/gimp/patches/Attic/patch-bug687392 2012/11/23 15:43:13 1.1
+++ pkgsrc/graphics/gimp/patches/Attic/patch-bug687392 2012/11/27 11:13:49 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-bug687392,v 1.1 2012/11/23 15:43:13 drochner Exp $ 1$NetBSD: patch-bug687392,v 1.2 2012/11/27 11:13:49 drochner Exp $
 2
 3CVE-2012-5576
2 4
3--- plug-ins/common/file-xwd.c.orig 2012-03-12 19:18:10.000000000 +0000 5--- plug-ins/common/file-xwd.c.orig 2012-03-12 19:18:10.000000000 +0000
4+++ plug-ins/common/file-xwd.c 6+++ plug-ins/common/file-xwd.c
5@@ -186,11 +186,13 @@ static gint32 load_xwd_f2_d16_b16 (const 7@@ -186,11 +186,13 @@ static gint32 load_xwd_f2_d16_b16 (const
6 static gint32 load_xwd_f2_d24_b32 (const gchar *, 8 static gint32 load_xwd_f2_d24_b32 (const gchar *,
7 FILE *, 9 FILE *,
8 L_XWDFILEHEADER *, 10 L_XWDFILEHEADER *,
9- L_XWDCOLOR *); 11- L_XWDCOLOR *);
10+ L_XWDCOLOR *, 12+ L_XWDCOLOR *,
11+ GError **); 13+ GError **);
12 static gint32 load_xwd_f1_d24_b1 (const gchar *, 14 static gint32 load_xwd_f1_d24_b1 (const gchar *,
13 FILE *, 15 FILE *,
14 L_XWDFILEHEADER *, 16 L_XWDFILEHEADER *,