diff options
Diffstat (limited to 'x11-toolkits/gtk20')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 3 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-pixbuf-security | 100 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/pkg-plist | 4 |
4 files changed, 7 insertions, 104 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 4e3133d15106..465abff4b3d0 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 2.4.9 -PORTREVISION= 1 +PORTVERSION= 2.4.13 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ ftp://ftp.gtk.org/pub/gtk/v2.3/ \ diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index 9e2073ed587f..fa4e781ce780 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gtk+-2.4.9.tar.bz2) = bfe3b960d334e81d8f91c3509f70868d -SIZE (gnome2/gtk+-2.4.9.tar.bz2) = 9599004 +MD5 (gnome2/gtk+-2.4.13.tar.bz2) = 3a438e1010704b11acaf060c9ba0fd7b +SIZE (gnome2/gtk+-2.4.13.tar.bz2) = 9272024 MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 diff --git a/x11-toolkits/gtk20/files/patch-pixbuf-security b/x11-toolkits/gtk20/files/patch-pixbuf-security deleted file mode 100644 index 6ad822a6b420..000000000000 --- a/x11-toolkits/gtk20/files/patch-pixbuf-security +++ /dev/null @@ -1,100 +0,0 @@ -=================================================================== -RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-ico.c,v -retrieving revision 1.34 -retrieving revision 1.34.2.1 -diff -u -r1.34 -r1.34.2.1 ---- gdk-pixbuf/io-ico.c 2004/01/07 00:26:58 1.34 -+++ gdk-pixbuf/io-ico.c 2004/09/15 14:32:13 1.34.2.1 -@@ -323,6 +323,14 @@ - - State->HeaderSize+=I; - -+ if (State->HeaderSize < 0) { -+ g_set_error (error, -+ GDK_PIXBUF_ERROR, -+ GDK_PIXBUF_ERROR_CORRUPT_IMAGE, -+ _("Invalid header in icon")); -+ return; -+ } -+ - if (State->HeaderSize>State->BytesInHeaderBuf) { - guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize); - if (!tmp) { -=================================================================== -RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-xpm.c,v -retrieving revision 1.42 -retrieving revision 1.42.2.1 -diff -u -r1.42 -r1.42.2.1 ---- gdk-pixbuf/io-xpm.c 2003/03/08 20:48:58 1.42 -+++ gdk-pixbuf/io-xpm.c 2004/09/15 14:32:13 1.42.2.1 -@@ -1079,7 +1079,7 @@ - gint key = 0; - gint current_key = 1; - gint space = 128; -- gchar word[128], color[128], current_color[128]; -+ gchar word[129], color[129], current_color[129]; - gchar *r; - - word[0] = '\0'; -@@ -1121,8 +1121,8 @@ - return NULL; - /* accumulate color name */ - if (color[0] != '\0') { -- strcat (color, " "); -- space--; -+ strncat (color, " ", space); -+ space -= MIN (space, 1); - } - strncat (color, word, space); - space -= MIN (space, strlen (word)); -@@ -1246,27 +1246,43 @@ - return NULL; - - } -- if (n_col <= 0) { -+ if (cpp <= 0 || cpp >= 32) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_CORRUPT_IMAGE, -- _("XPM file has invalid number of colors")); -+ _("XPM has invalid number of chars per pixel")); - return NULL; -- - } -- if (cpp <= 0 || cpp >= 32) { -+ if (n_col <= 0 || n_col >= G_MAXINT / (cpp + 1)) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_CORRUPT_IMAGE, -- _("XPM has invalid number of chars per pixel")); -+ _("XPM file has invalid number of colors")); - return NULL; - } - - /* The hash is used for fast lookups of color from chars */ - color_hash = g_hash_table_new (g_str_hash, g_str_equal); - -- name_buf = g_new (gchar, n_col * (cpp + 1)); -- colors = g_new (XPMColor, n_col); -+ name_buf = g_try_malloc (n_col * (cpp + 1)); -+ if (!name_buf) { -+ g_set_error (error, -+ GDK_PIXBUF_ERROR, -+ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, -+ _("Cannot allocate memory for loading XPM image")); -+ g_hash_table_destroy (color_hash); -+ return NULL; -+ } -+ colors = (XPMColor *) g_try_malloc (sizeof (XPMColor) * n_col); -+ if (!colors) { -+ g_set_error (error, -+ GDK_PIXBUF_ERROR, -+ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, -+ _("Cannot allocate memory for loading XPM image")); -+ g_hash_table_destroy (color_hash); -+ g_free (name_buf); -+ return NULL; -+ } - - for (cnt = 0; cnt < n_col; cnt++) { - gchar *color_name; diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 3e19bed3759b..6f5709dc0b39 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -293,10 +293,14 @@ share/locale/af/LC_MESSAGES/gtk20-properties.mo share/locale/af/LC_MESSAGES/gtk20.mo share/locale/am/LC_MESSAGES/gtk20-properties.mo share/locale/am/LC_MESSAGES/gtk20.mo +share/locale/ang/LC_MESSAGES/gtk20-properties.mo +share/locale/ang/LC_MESSAGES/gtk20.mo share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20-properties.mo share/locale/az/LC_MESSAGES/gtk20.mo +share/locale/az_IR/LC_MESSAGES/gtk20-properties.mo +share/locale/az_IR/LC_MESSAGES/gtk20.mo share/locale/be/LC_MESSAGES/gtk20-properties.mo share/locale/be/LC_MESSAGES/gtk20.mo share/locale/bg/LC_MESSAGES/gtk20-properties.mo |