gimp bumps with security fix

(Portage version: 2.1.2.5)

4 files changed, 55 insertions, 81 deletions

diff --git a/media-gfx/gimp/files/digest-gimp-2.2.14 b/media-gfx/gimp/files/digest-gimp-2.2.14
new file mode 100644
index 000000000000..3edc7b8b8f96
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.2.14
@@ -0,0 +1,3 @@
+MD5 2f47dd66d714a970356e275dd1d3caac gimp-2.2.14.tar.bz2 12836732
+RMD160 cf43fb0436a6086a0bc85fd4a33b009bee557aa0 gimp-2.2.14.tar.bz2 12836732
+SHA256 f672f123118b7b52dfce5833ba26512463295e29d542f32d629ba39870112b4f gimp-2.2.14.tar.bz2 12836732
diff --git a/media-gfx/gimp/files/digest-gimp-2.3.16 b/media-gfx/gimp/files/digest-gimp-2.3.16
new file mode 100644
index 000000000000..404f216a2577
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.3.16
@@ -0,0 +1,3 @@
+MD5 00797e627c8a180e5364f334aab27631 gimp-2.3.16.tar.bz2 16370057
+RMD160 f67d58f48b0997082024088ca37ef52c3b18c6bc gimp-2.3.16.tar.bz2 16370057
+SHA256 fdccaed39f868a24ad408b4a84e5f13b2c8448562b17bdc5ca53f0ddda4f96f4 gimp-2.3.16.tar.bz2 16370057
diff --git a/media-gfx/gimp/files/gimp-sunras-bufferoverflow.diff b/media-gfx/gimp/files/gimp-sunras-bufferoverflow.diff
new file mode 100644
index 000000000000..6b071497f081
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-sunras-bufferoverflow.diff
@@ -0,0 +1,49 @@
+--- trunk/plug-ins/common/sunras.c	2006/12/09 21:33:38	21494
++++ trunk/plug-ins/common/sunras.c	2007/04/27 11:50:00	22355
+@@ -101,8 +101,7 @@
+                           gint32            image_ID,
+                           gint32            drawable_ID);
+ 
+-static void set_color_table (gint32, L_SUNFILEHEADER *, unsigned char *);
+-
++static void   set_color_table  (gint32, L_SUNFILEHEADER *, const guchar *);
+ static gint32 create_new_image (const gchar   *filename,
+                                 guint          width,
+                                 guint          height,
+@@ -857,19 +856,20 @@
+ static void
+ set_color_table (gint32           image_ID,
+ 		 L_SUNFILEHEADER *sunhdr,
+-		 guchar          *suncolmap)
++		 const guchar    *suncolmap)
+ {
+-  int ncols, j;
+-  guchar ColorMap[256*3];
++  guchar ColorMap[256 * 3];
++  gint   ncols, j;
+ 
+   ncols = sunhdr->l_ras_maplength / 3;
+-  if (ncols <= 0) return;
++  if (ncols <= 0)
++    return;
+ 
+-  for (j = 0; j < ncols; j++)
++  for (j = 0; j < MIN (ncols, 256); j++)
+     {
+-      ColorMap[j*3]   = suncolmap[j];
+-      ColorMap[j*3+1] = suncolmap[j+ncols];
+-      ColorMap[j*3+2] = suncolmap[j+2*ncols];
++      ColorMap[j * 3 + 0] = suncolmap[j];
++      ColorMap[j * 3 + 1] = suncolmap[j + ncols];
++      ColorMap[j * 3 + 2] = suncolmap[j + 2 * ncols];
+     }
+ 
+ #ifdef DEBUG
+@@ -878,6 +878,7 @@
+     printf ("%3d: 0x%02x 0x%02x 0x%02x\n", j,
+ 	    ColorMap[j*3], ColorMap[j*3+1], ColorMap[j*3+2]);
+ #endif
++
+   gimp_image_set_colormap (image_ID, ColorMap, ncols);
+ }
+ 
diff --git a/media-gfx/gimp/files/gimp.desktop b/media-gfx/gimp/files/gimp.desktop
deleted file mode 100644
index ea26b6d0f0dd..000000000000
--- a/media-gfx/gimp/files/gimp.desktop
+++ /dev/null
@@ -1,81 +0,0 @@
-[Desktop Entry]
-Name=The GIMP
-Name[bg]=GIMP
-Name[br]=GIMP
-Name[ca]=El GIMP
-Name[cs]=GIMP
-Name[da]=GIMP'en
-Name[de]=GIMP
-Name[el]=Ôï GIMP
-Name[es]=El GIMP
-Name[et]=GIMP
-Name[eu]=GIMPa
-Name[fi]=GIMP
-Name[fr]=The GIMP
-Name[ga]=An GIMP
-Name[ga]=An GIMP
-Name[gl]=O GIMP
-Name[hr]=GIMP
-Name[hu]=A GIMP
-Name[id]=GIMP
-Name[is]=GIMP
-Name[it]=GIMP
-Name[ja]=GIMP
-Name[ko]=±èÇÁ
-Name[lt]=GIMP
-Name[nl]=GIMP
-Name[no]=GIMP
-Name[pl]=GIMP
-Name[pt]=O GIMP
-Name[pt_BR]=O GIMP
-Name[ro]=GIMP
-Name[ru]=GIMP
-Name[sk]=GIMP
-Name[sv]=GIMP
-Name[tr]=GIMP
-Name[uk]=GIMP
-Name[zh_CN.GB2312]=GIMP
-Name[zh_TW.Big5]=GIMP
-Comment=GNU Image Manipulation Program
-Comment[bg]=Ïðîãðàìà çà Îáðàáîòêà íà Èçîáðàæåíèÿ / GNU
-Comment[br]=Goulev GNU Dazverad Skeudennoù
-Comment[ca]=El programa de manipulació d'imatges GNU
-Comment[cs]=Program pro úpravu obrázkù
-Comment[da]=Tegne- og billedbehandlingprogram
-Comment[de]=Das GNU-Bildbearbeitungsprogramm
-Comment[el]=Ðñüãñáììá Åðåîåñãáóßáò Åéêüíùí GNU
-Comment[es]=Programa de manipulación de imágenes GNU
-Comment[et]=GNU pilditöötlusprogramm
-Comment[eu]=GNU imaginak eraldatzeko programa
-Comment[fi]=GIMP-kuvankäsittelyohjelma
-Comment[fr]=Le Programme de Manipulation d'Images GNU
-Comment[ga]=Ríomhchlar láimhsiú Pictuirí GNC
-Comment[ga]=Ríomhchlár láimhsiú íomhá GNU
-Comment[gl]=O Programa de Edición de Imaxes de GNU
-Comment[hr]=Program za obradu forografija pod GNU licencom
-Comment[hu]=GNU képfeldolgozó program
-Comment[id]=GNU Image Manipulation Program
-Comment[is]=GNU Myndvinnsluforrit
-Comment[it]=Programma di Manipolazione Immagini GNU
-Comment[ja]=GNU²èÁüÊÔ½¸¥×¥í¥°¥é¥à
-Comment[ko]=GNU ±×¸² ÆíÁý ÇÁ·Î±×·¥
-Comment[lt]=GNU atvaizdø apdorojimo programa
-Comment[nl]=GNU beeldverwerkingsprogramma
-Comment[no]=GNU bildebehandlingsprogram
-Comment[pl]=Zaawansowany program graficzny
-Comment[pt]=Programa de Edição de Imagens GNU 
-Comment[pt_BR]=Programa de Edição de Imagens GNU 
-Comment[ro]=Program GNU pentru manipulare de imagine
-Comment[ru]=ðÒÏÇÒÁÍÍÁ ÍÁÎÉÐÕÌÑÃÉÉ ÉÚÏÂÒÁÖÅÎÉÑ GNU
-Comment[sk]=GNU Program pre spracovanie obrázkov
-Comment[sv]=GNU Image Manipulation Program
-Comment[tr]=GNU Resim deðiþtirme uygulamasý
-Comment[uk]=ðÒÏÇÒÁÍÁ GNU ÍÁΦÐÕÌÑæ§ ÚÏÂÒÁÖÅÎÎÑÍ
-Comment[wa]=Li programe da GNU po-z aspougnî des imådjes
-Comment[zh_CN.GB2312]=GNU Ó°Ïó´¦Àí³Ìʽ
-Comment[zh_TW.Big5]=GNU ¼v¹³³B²zµ{¦¡
-Icon=gnome-gimp.png
-Exec=gimp
-Terminal=false
-Type=Application
-Categories=GNOME;Application;Graphics;