diff options
Diffstat (limited to 'graphics/gimp')
| -rw-r--r-- | graphics/gimp/Makefile | 30 | ||||
| -rw-r--r-- | graphics/gimp/buildlink3.mk | 4 | ||||
| -rw-r--r-- | graphics/gimp/distinfo | 11 | ||||
| -rw-r--r-- | graphics/gimp/patches/patch-ab | 10 | ||||
| -rw-r--r-- | graphics/gimp/patches/patch-plug-ins_common_file-gif-load.c | 39 |
5 files changed, 24 insertions, 70 deletions
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index a1af62827dd..52a7ed2ba53 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.218 2012/08/20 12:54:01 wiz Exp $ +# $NetBSD: Makefile,v 1.219 2012/09/07 19:16:45 adam Exp $ -DISTNAME= gimp-2.8.0 -PKGREVISION= 3 +DISTNAME= gimp-2.8.2 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/ \ ${MASTER_SITE_GNU:=gimp/v${PKGVERSION_NOREV:R}/} \ @@ -13,27 +13,14 @@ HOMEPAGE= http://www.gimp.org/ COMMENT= The GNU image manipulation program LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 -BUILD_DEPENDS+= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser - PKG_DESTDIR_SUPPORT= user-destdir -CONFLICTS+= gimp<=1.2.3 - -PKG_DESTDIR_SUPPORT= user-destdir +BUILD_DEPENDS+= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser +CONFLICTS+= gimp<=1.2.3 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake intltool msgfmt pkg-config - -PKG_SYSCONFSUBDIR= gimp/2.0 - -PKGCONFIG_OVERRIDE= gimp.pc.in - -.include "../../mk/bsd.prefs.mk" - -BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.2.0 -BUILDLINK_API_DEPENDS.lcms+= lcms>=1.12 - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-perl CONFIGURE_ARGS+= --disable-python @@ -41,8 +28,12 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --without-linux-input CONFIGURE_ARGS+= --without-mac-twain +PKG_SYSCONFSUBDIR= gimp/2.0 +PKGCONFIG_OVERRIDE= gimp.pc.in UNLIMIT_RESOURCES+= datasize +.include "../../mk/bsd.prefs.mk" + EGDIR= ${PREFIX}/share/examples/gimp-2.0 .for f in controllerrc gimprc gtkrc menurc sessionrc templaterc unitrc CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} @@ -53,6 +44,9 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} PLIST_VARS+= remote +BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.2.0 +BUILDLINK_API_DEPENDS.lcms+= lcms>=1.12 + .include "options.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk index 24fe388d9b9..029f61b998c 100644 --- a/graphics/gimp/buildlink3.mk +++ b/graphics/gimp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.41 2012/08/13 14:25:40 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.42 2012/09/07 19:16:45 adam Exp $ BUILDLINK_TREE+= gimp @@ -6,7 +6,7 @@ BUILDLINK_TREE+= gimp GIMP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gimp+= gimp>=2.4.0 -BUILDLINK_ABI_DEPENDS.gimp+= gimp>=2.8.0nb2 +BUILDLINK_ABI_DEPENDS.gimp+= gimp>=2.8.2nb1 BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp pkgbase := gimp diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo index a363ba9f649..d913f6d1dc2 100644 --- a/graphics/gimp/distinfo +++ b/graphics/gimp/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.68 2012/08/20 12:54:01 wiz Exp $ +$NetBSD: distinfo,v 1.69 2012/09/07 19:16:45 adam Exp $ -SHA1 (gimp-2.8.0.tar.bz2) = 3b20d3dd10d971acbbc9345eb5cb93378c398ebc -RMD160 (gimp-2.8.0.tar.bz2) = aeff9275461d0171e22b2281aae28ca4fb4bc63f -Size (gimp-2.8.0.tar.bz2) = 20142440 bytes +SHA1 (gimp-2.8.2.tar.bz2) = 64ad90cedc5e8e348310b6eb6b7821ec110c0886 +RMD160 (gimp-2.8.2.tar.bz2) = 353cf862302417c35df902618a3ba05ac0b3af41 +Size (gimp-2.8.2.tar.bz2) = 20161424 bytes SHA1 (patch-aa) = 8107200cc3007e6ae4b9064ee05e5c9a00cca2ef -SHA1 (patch-ab) = 56affce3f484df5e57a646eb5c18d273d1298e7c +SHA1 (patch-ab) = 609c6488768f9d628e6f09ede216fef7db99721c SHA1 (patch-ad) = 7863678d59ccf54e2ce61a4ac4b883fb9eb5fb82 SHA1 (patch-app_Makefile.in) = efbd9e592cdbc154e5a6402279c7d54f3946c65c SHA1 (patch-app_base_base-utils.c) = 18dfa09c1d63530ff79cd4c3515d9f1077182d64 SHA1 (patch-app_config_Makefile.in) = a2fcebd994831fbe0f911efb84c1fecdf2e59198 SHA1 (patch-devel-docs_app_Makefile.in) = 1eb97f779d5151b9e89b4ae47afb44d1bb3b6a48 -SHA1 (patch-plug-ins_common_file-gif-load.c) = 44a83ad0e2ddc7d4601ee96b0c524121a1b29bf8 SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = 4932d82711c8010cf7b1ff5bfb12031946273c2b diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab index 8506c9f6a93..aa72f819a7c 100644 --- a/graphics/gimp/patches/patch-ab +++ b/graphics/gimp/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.34 2012/05/07 08:40:08 adam Exp $ +$NetBSD: patch-ab,v 1.35 2012/09/07 19:16:45 adam Exp $ ---- configure.orig 2012-05-02 08:56:45.000000000 +0000 +--- configure.orig 2012-08-23 18:41:09.000000000 +0000 +++ configure -@@ -19094,13 +19094,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& +@@ -19098,13 +19098,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& gimp_ok=yes fi rm -f conftest* @@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.34 2012/05/07 08:40:08 adam Exp $ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gimp_ok" >&5 $as_echo "$gimp_ok" >&6; } if test "x$gimp_ok" = xno; then -@@ -22871,7 +22871,7 @@ fi +@@ -22886,7 +22886,7 @@ fi have_xvfb_run="no (not found)" fi fi @@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.34 2012/05/07 08:40:08 adam Exp $ HAVE_XVFB_RUN_TRUE= HAVE_XVFB_RUN_FALSE='#' else -@@ -23294,7 +23294,7 @@ fi +@@ -23309,7 +23309,7 @@ fi gimpdatadir="$datadir/$PACKAGE/2.0" gimpplugindir="$libdir/$PACKAGE/2.0" diff --git a/graphics/gimp/patches/patch-plug-ins_common_file-gif-load.c b/graphics/gimp/patches/patch-plug-ins_common_file-gif-load.c deleted file mode 100644 index 1fd1c5f358b..00000000000 --- a/graphics/gimp/patches/patch-plug-ins_common_file-gif-load.c +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-plug-ins_common_file-gif-load.c,v 1.1 2012/08/20 12:54:01 wiz Exp $ - -From: Jan Lieskovsky <jlieskov@redhat.com> -Date: Tue, 14 Aug 2012 12:18:22 +0200 -Subject: [PATCH 1/2] file-gif-load: limit len and height (CVE-2012-3481) - -Ensure values of len and height can't overflow g_malloc() argument type. -(cherry picked from commit d95c2f0bcb6775bdee2bef35b7d84f6dfd490783) - -From: Nils Philippsen <nils@redhat.com> -Date: Tue, 14 Aug 2012 15:27:39 +0200 -Subject: [PATCH 2/2] file-gif-load: fix type overflow (CVE-2012-3481) - -Cast variables properly to avoid overflowing when computing how much -memory to allocate. -(cherry picked from commit 43fc9dbd8e2196944c8a71321e525b89b7df9f5c) - ---- plug-ins/common/file-gif-load.c.orig 2012-03-12 19:18:10.000000000 +0000 -+++ plug-ins/common/file-gif-load.c -@@ -1057,10 +1057,17 @@ ReadImage (FILE *fd, - cur_progress = 0; - max_progress = height; - -+ if (len > (G_MAXSIZE / height / (alpha_frame ? (promote_to_rgb ? 4 : 2) : 1))) -+ { -+ g_message ("'%s' has a larger image size than GIMP can handle.", -+ gimp_filename_to_utf8 (filename)); -+ return -1; -+ } -+ - if (alpha_frame) -- dest = (guchar *) g_malloc (len * height * (promote_to_rgb ? 4 : 2)); -+ dest = (guchar *) g_malloc ((gsize)len * (gsize)height * (promote_to_rgb ? 4 : 2)); - else -- dest = (guchar *) g_malloc (len * height); -+ dest = (guchar *) g_malloc ((gsize)len * (gsize)height); - - #ifdef GIFDEBUG - g_print ("GIF: reading %d by %d%s GIF image, ncols=%d\n", |