diff options
| author | nros <nros@pkgsrc.org> | 2016-03-02 14:32:31 +0000 |
|---|---|---|
| committer | nros <nros@pkgsrc.org> | 2016-03-02 14:32:31 +0000 |
| commit | 334ff2ae694b94cb6040d7b8efef7ca5ada86ea3 (patch) | |
| tree | 586bde2126c5e25b2b254ef3c6bc335783a07519 | |
| parent | f1a23402e0f73bef0a03eaad904d6705cbf8f6ef (diff) | |
| download | pkgsrc-334ff2ae694b94cb6040d7b8efef7ca5ada86ea3.tar.gz | |
Add patch to gtk2 to fix CVE-2013-7447.
| -rw-r--r-- | x11/gtk2/Makefile | 3 | ||||
| -rw-r--r-- | x11/gtk2/distinfo | 3 | ||||
| -rw-r--r-- | x11/gtk2/patches/patch-gdk_gdkcairo.c | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index e5fb795ef89..0b768944519 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.274 2016/02/26 11:27:14 jperkin Exp $ +# $NetBSD: Makefile,v 1.275 2016/03/02 14:32:31 nros Exp $ DISTNAME= gtk+-2.24.29 +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/gtk/gtk2/} CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/2.24/} diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index 423207de1cf..c45ac58c603 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.158 2015/12/30 10:15:07 prlw1 Exp $ +$NetBSD: distinfo,v 1.159 2016/03/02 14:32:31 nros Exp $ SHA1 (gtk+-2.24.29.tar.xz) = 23eab0093cf3cd91b36ac0dbe21e1f0f85adb6af RMD160 (gtk+-2.24.29.tar.xz) = 94e02e447afd9ab606fa1934cf7ff57d6223da18 @@ -7,5 +7,6 @@ Size (gtk+-2.24.29.tar.xz) = 13143648 bytes SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3 SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3 +SHA1 (patch-gdk_gdkcairo.c) = f4bd03706fcb94155f360ae0faf14be141cf9409 SHA1 (patch-gdk_x11_gdkwindow-x11.c) = 08c05b31da38e16727a2941cdec4c855f2fc7d77 SHA1 (patch-gtk_gtktooltips.c) = 593e43bb0aacc0b07c24959f2ac6d84dfd04a780 diff --git a/x11/gtk2/patches/patch-gdk_gdkcairo.c b/x11/gtk2/patches/patch-gdk_gdkcairo.c new file mode 100644 index 00000000000..09cc55e3c64 --- /dev/null +++ b/x11/gtk2/patches/patch-gdk_gdkcairo.c @@ -0,0 +1,15 @@ +$NetBSD: patch-gdk_gdkcairo.c,v 1.1 2016/03/02 14:32:31 nros Exp $ +Fix CVE-2013-7447. +Taken from gtk3. +https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-7447 +--- gdk/gdkcairo.c.orig 2016-03-02 14:09:03.000000000 +0000 ++++ gdk/gdkcairo.c +@@ -211,7 +211,7 @@ gdk_cairo_set_source_pixbuf (cairo_t + format = CAIRO_FORMAT_ARGB32; + + cairo_stride = cairo_format_stride_for_width (format, width); +- cairo_pixels = g_malloc (height * cairo_stride); ++ cairo_pixels = g_malloc_n (height, cairo_stride); + surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels, + format, + width, height, cairo_stride); |