commit bc2048133472bbea38b7e7730a8268428b0ba629
Author: Thomas Penteker <tek(a)serverop.de>
Date: Mon Sep 8 22:02:53 2014 +0200
gimp: 2.8.10 -> 2.8.14
diff --git a/gimp/.footprint b/gimp/.footprint
index fa96ae0..6d70b4d 100644
--- a/gimp/.footprint
+++ b/gimp/.footprint
@@ -439,41 +439,41 @@ drwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/whirl-pinch
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/wind
-rwxr-xr-x root/root usr/lib/libgimp-2.0.la
-lrwxrwxrwx root/root usr/lib/libgimp-2.0.so -> libgimp-2.0.so.0.800.10
-lrwxrwxrwx root/root usr/lib/libgimp-2.0.so.0 -> libgimp-2.0.so.0.800.10
--rwxr-xr-x root/root usr/lib/libgimp-2.0.so.0.800.10
+lrwxrwxrwx root/root usr/lib/libgimp-2.0.so -> libgimp-2.0.so.0.800.14
+lrwxrwxrwx root/root usr/lib/libgimp-2.0.so.0 -> libgimp-2.0.so.0.800.14
+-rwxr-xr-x root/root usr/lib/libgimp-2.0.so.0.800.14
-rwxr-xr-x root/root usr/lib/libgimpbase-2.0.la
-lrwxrwxrwx root/root usr/lib/libgimpbase-2.0.so -> libgimpbase-2.0.so.0.800.10
-lrwxrwxrwx root/root usr/lib/libgimpbase-2.0.so.0 -> libgimpbase-2.0.so.0.800.10
--rwxr-xr-x root/root usr/lib/libgimpbase-2.0.so.0.800.10
+lrwxrwxrwx root/root usr/lib/libgimpbase-2.0.so -> libgimpbase-2.0.so.0.800.14
+lrwxrwxrwx root/root usr/lib/libgimpbase-2.0.so.0 -> libgimpbase-2.0.so.0.800.14
+-rwxr-xr-x root/root usr/lib/libgimpbase-2.0.so.0.800.14
-rwxr-xr-x root/root usr/lib/libgimpcolor-2.0.la
-lrwxrwxrwx root/root usr/lib/libgimpcolor-2.0.so -> libgimpcolor-2.0.so.0.800.10
-lrwxrwxrwx root/root usr/lib/libgimpcolor-2.0.so.0 -> libgimpcolor-2.0.so.0.800.10
--rwxr-xr-x root/root usr/lib/libgimpcolor-2.0.so.0.800.10
+lrwxrwxrwx root/root usr/lib/libgimpcolor-2.0.so -> libgimpcolor-2.0.so.0.800.14
+lrwxrwxrwx root/root usr/lib/libgimpcolor-2.0.so.0 -> libgimpcolor-2.0.so.0.800.14
+-rwxr-xr-x root/root usr/lib/libgimpcolor-2.0.so.0.800.14
-rwxr-xr-x root/root usr/lib/libgimpconfig-2.0.la
-lrwxrwxrwx root/root usr/lib/libgimpconfig-2.0.so -> libgimpconfig-2.0.so.0.800.10
-lrwxrwxrwx root/root usr/lib/libgimpconfig-2.0.so.0 -> libgimpconfig-2.0.so.0.800.10
--rwxr-xr-x root/root usr/lib/libgimpconfig-2.0.so.0.800.10
+lrwxrwxrwx root/root usr/lib/libgimpconfig-2.0.so -> libgimpconfig-2.0.so.0.800.14
+lrwxrwxrwx root/root usr/lib/libgimpconfig-2.0.so.0 -> libgimpconfig-2.0.so.0.800.14
+-rwxr-xr-x root/root usr/lib/libgimpconfig-2.0.so.0.800.14
-rwxr-xr-x root/root usr/lib/libgimpmath-2.0.la
-lrwxrwxrwx root/root usr/lib/libgimpmath-2.0.so -> libgimpmath-2.0.so.0.800.10
-lrwxrwxrwx root/root usr/lib/libgimpmath-2.0.so.0 -> libgimpmath-2.0.so.0.800.10
--rwxr-xr-x root/root usr/lib/libgimpmath-2.0.so.0.800.10
+lrwxrwxrwx root/root usr/lib/libgimpmath-2.0.so -> libgimpmath-2.0.so.0.800.14
+lrwxrwxrwx root/root usr/lib/libgimpmath-2.0.so.0 -> libgimpmath-2.0.so.0.800.14
+-rwxr-xr-x root/root usr/lib/libgimpmath-2.0.so.0.800.14
-rwxr-xr-x root/root usr/lib/libgimpmodule-2.0.la
-lrwxrwxrwx root/root usr/lib/libgimpmodule-2.0.so -> libgimpmodule-2.0.so.0.800.10
-lrwxrwxrwx root/root usr/lib/libgimpmodule-2.0.so.0 -> libgimpmodule-2.0.so.0.800.10
--rwxr-xr-x root/root usr/lib/libgimpmodule-2.0.so.0.800.10
+lrwxrwxrwx root/root usr/lib/libgimpmodule-2.0.so -> libgimpmodule-2.0.so.0.800.14
+lrwxrwxrwx root/root usr/lib/libgimpmodule-2.0.so.0 -> libgimpmodule-2.0.so.0.800.14
+-rwxr-xr-x root/root usr/lib/libgimpmodule-2.0.so.0.800.14
-rwxr-xr-x root/root usr/lib/libgimpthumb-2.0.la
-lrwxrwxrwx root/root usr/lib/libgimpthumb-2.0.so -> libgimpthumb-2.0.so.0.800.10
-lrwxrwxrwx root/root usr/lib/libgimpthumb-2.0.so.0 -> libgimpthumb-2.0.so.0.800.10
--rwxr-xr-x root/root usr/lib/libgimpthumb-2.0.so.0.800.10
+lrwxrwxrwx root/root usr/lib/libgimpthumb-2.0.so -> libgimpthumb-2.0.so.0.800.14
+lrwxrwxrwx root/root usr/lib/libgimpthumb-2.0.so.0 -> libgimpthumb-2.0.so.0.800.14
+-rwxr-xr-x root/root usr/lib/libgimpthumb-2.0.so.0.800.14
-rwxr-xr-x root/root usr/lib/libgimpui-2.0.la
-lrwxrwxrwx root/root usr/lib/libgimpui-2.0.so -> libgimpui-2.0.so.0.800.10
-lrwxrwxrwx root/root usr/lib/libgimpui-2.0.so.0 -> libgimpui-2.0.so.0.800.10
--rwxr-xr-x root/root usr/lib/libgimpui-2.0.so.0.800.10
+lrwxrwxrwx root/root usr/lib/libgimpui-2.0.so -> libgimpui-2.0.so.0.800.14
+lrwxrwxrwx root/root usr/lib/libgimpui-2.0.so.0 -> libgimpui-2.0.so.0.800.14
+-rwxr-xr-x root/root usr/lib/libgimpui-2.0.so.0.800.14
-rwxr-xr-x root/root usr/lib/libgimpwidgets-2.0.la
-lrwxrwxrwx root/root usr/lib/libgimpwidgets-2.0.so -> libgimpwidgets-2.0.so.0.800.10
-lrwxrwxrwx root/root usr/lib/libgimpwidgets-2.0.so.0 -> libgimpwidgets-2.0.so.0.800.10
--rwxr-xr-x root/root usr/lib/libgimpwidgets-2.0.so.0.800.10
+lrwxrwxrwx root/root usr/lib/libgimpwidgets-2.0.so -> libgimpwidgets-2.0.so.0.800.14
+lrwxrwxrwx root/root usr/lib/libgimpwidgets-2.0.so.0 -> libgimpwidgets-2.0.so.0.800.14
+-rwxr-xr-x root/root usr/lib/libgimpwidgets-2.0.so.0.800.14
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/gimp-2.0.pc
-rw-r--r-- root/root usr/lib/pkgconfig/gimpthumb-2.0.pc
@@ -482,6 +482,7 @@ drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/gimp-2.8.1.gz
lrwxrwxrwx root/root usr/man/man1/gimp-console-2.8.1.gz -> gimp-2.8.1.gz
+lrwxrwxrwx root/root usr/man/man1/gimp-console.1.gz -> gimp-console-2.8.1.gz
lrwxrwxrwx root/root usr/man/man1/gimp.1.gz -> gimp-2.8.1.gz
-rw-r--r-- root/root usr/man/man1/gimptool-2.0.1.gz
drwxr-xr-x root/root usr/man/man5/
diff --git a/gimp/.md5sum b/gimp/.md5sum
index 50b76ac..35df098 100644
--- a/gimp/.md5sum
+++ b/gimp/.md5sum
@@ -1,3 +1,3 @@
dcc2acc9f9962a7c83ffb4243c08c469 cve-2013-1913
901643efc82fae57af466d8a0a8991ff cve-2013-1978
-84c964aab7044489af69f7319bb59b47 gimp-2.8.10.tar.bz2
+233c948203383fa078434cc3f8f925cb gimp-2.8.14.tar.bz2
diff --git a/gimp/Pkgfile b/gimp/Pkgfile
index a77be57..3b69e27 100644
--- a/gimp/Pkgfile
+++ b/gimp/Pkgfile
@@ -6,15 +6,14 @@
# Nice to have: gimp-print, libsdl, ghostscript, librsvg, libmng
name=gimp
-version=2.8.10
+version=2.8.14
release=1
-source=(http://ftp.gimp.org/pub/gimp/v2.8/gimp-$version.tar.bz2 cve-2013-1913 cve-2013-1978)
+source=(http://ftp.gimp.org/pub/gimp/v2.8/gimp-$version.tar.bz2 cve-2013-1913)
build() {
cd gimp-$version
patch -p1 -i ../cve-2013-1913
- patch -p1 -i ../cve-2013-1978
sed -i -e '/$(helpbrowser)/d' plug-ins/Makefile.in
./configure --prefix=/usr \
diff --git a/gimp/cve-2013-1978 b/gimp/cve-2013-1978
deleted file mode 100644
index 48f9123..0000000
--- a/gimp/cve-2013-1978
+++ /dev/null
@@ -1,150 +0,0 @@
-From 23f685931e5f000dd033a45c60c1e60d7f78caf4 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils(a)redhat.com>
-Date: Tue, 26 Nov 2013 09:49:42 +0000
-Subject: file-xwd: sanity check # of colors and map entries (CVE-2013-1978)
-
-The number of colors in an image shouldn't be higher than the number of
-colormap entries. Additionally, consolidate post error cleanup in
-load_image().
----
-diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c
-index 343129a..4df9ce8 100644
---- a/plug-ins/common/file-xwd.c
-+++ b/plug-ins/common/file-xwd.c
-@@ -429,9 +429,9 @@ static gint32
- load_image (const gchar *filename,
- GError **error)
- {
-- FILE *ifp;
-+ FILE *ifp = NULL;
- gint depth, bpp;
-- gint32 image_ID;
-+ gint32 image_ID = -1;
- L_XWDFILEHEADER xwdhdr;
- L_XWDCOLOR *xwdcolmap = NULL;
-
-@@ -441,7 +441,7 @@ load_image (const gchar *filename,
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
- _("Could not open '%s' for reading: %s"),
- gimp_filename_to_utf8 (filename), g_strerror (errno));
-- return -1;
-+ goto out;
- }
-
- read_xwd_header (ifp, &xwdhdr);
-@@ -450,8 +450,7 @@ load_image (const gchar *filename,
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
- _("Could not read XWD header from '%s'"),
- gimp_filename_to_utf8 (filename));
-- fclose (ifp);
-- return -1;
-+ goto out;
- }
-
- #ifdef XWD_COL_WAIT_DEBUG
-@@ -473,12 +472,18 @@ load_image (const gchar *filename,
- g_message (_("'%s':\nIllegal number of colormap entries: %ld"),
- gimp_filename_to_utf8 (filename),
- (long)xwdhdr.l_colormap_entries);
-- fclose (ifp);
-- return -1;
-+ goto out;
- }
-
- if (xwdhdr.l_colormap_entries > 0)
- {
-+ if (xwdhdr.l_colormap_entries < xwdhdr.l_ncolors)
-+ {
-+ g_message (_("'%s':\nNumber of colormap entries < number of colors"),
-+ gimp_filename_to_utf8 (filename));
-+ goto out;
-+ }
-+
- xwdcolmap = g_new (L_XWDCOLOR, xwdhdr.l_colormap_entries);
-
- read_xwd_cols (ifp, &xwdhdr, xwdcolmap);
-@@ -498,9 +503,7 @@ load_image (const gchar *filename,
- if (xwdhdr.l_file_version != 7)
- {
- g_message (_("Can't read color entries"));
-- g_free (xwdcolmap);
-- fclose (ifp);
-- return (-1);
-+ goto out;
- }
- }
-
-@@ -508,9 +511,7 @@ load_image (const gchar *filename,
- {
- g_message (_("'%s':\nNo image width specified"),
- gimp_filename_to_utf8 (filename));
-- g_free (xwdcolmap);
-- fclose (ifp);
-- return (-1);
-+ goto out;
- }
-
- if (xwdhdr.l_pixmap_width > GIMP_MAX_IMAGE_SIZE
-@@ -518,27 +519,21 @@ load_image (const gchar *filename,
- {
- g_message (_("'%s':\nImage width is larger than GIMP can handle"),
- gimp_filename_to_utf8 (filename));
-- g_free (xwdcolmap);
-- fclose (ifp);
-- return (-1);
-+ goto out;
- }
-
- if (xwdhdr.l_pixmap_height <= 0)
- {
- g_message (_("'%s':\nNo image height specified"),
- gimp_filename_to_utf8 (filename));
-- g_free (xwdcolmap);
-- fclose (ifp);
-- return (-1);
-+ goto out;
- }
-
- if (xwdhdr.l_pixmap_height > GIMP_MAX_IMAGE_SIZE)
- {
- g_message (_("'%s':\nImage height is larger than GIMP can handle"),
- gimp_filename_to_utf8 (filename));
-- g_free (xwdcolmap);
-- fclose (ifp);
-- return (-1);
-+ goto out;
- }
-
- gimp_progress_init_printf (_("Opening '%s'"),
-@@ -591,11 +586,6 @@ load_image (const gchar *filename,
- }
- gimp_progress_update (1.0);
-
-- fclose (ifp);
--
-- if (xwdcolmap)
-- g_free (xwdcolmap);
--
- if (image_ID == -1 && ! (error && *error))
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
- _("XWD-file %s has format %d, depth %d and bits per pixel %d. "
-@@ -603,6 +593,17 @@ load_image (const gchar *filename,
- gimp_filename_to_utf8 (filename),
- (gint) xwdhdr.l_pixmap_format, depth, bpp);
-
-+out:
-+ if (ifp)
-+ {
-+ fclose (ifp);
-+ }
-+
-+ if (xwdcolmap)
-+ {
-+ g_free (xwdcolmap);
-+ }
-+
- return image_ID;
- }
-
---
-cgit v0.9.2
