gtk-32: 2.24.30 -> 2.24.31

This commit is contained in:
Danny Rawlins 2016-09-23 11:28:24 +10:00
parent e003856597
commit 0e616bd82f
4 changed files with 9 additions and 45 deletions

View File

@ -47,13 +47,13 @@ lrwxrwxrwx root/root usr/lib32/libgailutil.so -> libgailutil.so.18.0.1
lrwxrwxrwx root/root usr/lib32/libgailutil.so.18 -> libgailutil.so.18.0.1
-rwxr-xr-x root/root usr/lib32/libgailutil.so.18.0.1
-rw-r--r-- root/root usr/lib32/libgdk-x11-2.0.la
lrwxrwxrwx root/root usr/lib32/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.30
lrwxrwxrwx root/root usr/lib32/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.30
-rwxr-xr-x root/root usr/lib32/libgdk-x11-2.0.so.0.2400.30
lrwxrwxrwx root/root usr/lib32/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.31
lrwxrwxrwx root/root usr/lib32/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.31
-rwxr-xr-x root/root usr/lib32/libgdk-x11-2.0.so.0.2400.31
-rw-r--r-- root/root usr/lib32/libgtk-x11-2.0.la
lrwxrwxrwx root/root usr/lib32/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.30
lrwxrwxrwx root/root usr/lib32/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.30
-rwxr-xr-x root/root usr/lib32/libgtk-x11-2.0.so.0.2400.30
lrwxrwxrwx root/root usr/lib32/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.31
lrwxrwxrwx root/root usr/lib32/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.31
-rwxr-xr-x root/root usr/lib32/libgtk-x11-2.0.so.0.2400.31
drwxr-xr-x root/root usr/lib32/pkgconfig/
-rw-r--r-- root/root usr/lib32/pkgconfig/gail.pc
-rw-r--r-- root/root usr/lib32/pkgconfig/gdk-2.0.pc

View File

@ -1,2 +1 @@
26c6e8f072ff456f5a1bedb47f4bb760 CVE-2013-7447.patch
04568ba5c58b75e3c7543e45628ad789 gtk+-2.24.30.tar.xz
526a1008586094a2cbb4592fd3f9ee10 gtk+-2.24.31.tar.xz

View File

@ -1,32 +0,0 @@
From 407c89863d08780861d120f8ccfc8e13582a2fda Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 29 Jun 2013 22:06:54 -0400
Subject: Avoid integer overflow
Use g_malloc_n in gdk_cairo_set_source_pixbuf when allocating
a large block of memory, to avoid integer overflow.
Pointed out by Bert Massop in
https://bugzilla.gnome.org/show_bug.cgi?id=703220
(cherry picked from commit 894b1ae76a32720f4bb3d39cf460402e3ce331d6)
---
gdk/gdkcairo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c
index a3baa54..3fdb570 100644
--- a/gdk/gdkcairo.c
+++ b/gdk/gdkcairo.c
@@ -211,7 +211,7 @@ gdk_cairo_set_source_pixbuf (cairo_t *cr,
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);
--
cgit v0.12

View File

@ -4,16 +4,13 @@
# Depends on: atk-32 gdk-pixbuf-32 pango-32 xorg-libsm-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxcomposite-32 gtk
name=gtk-32
version=2.24.30
version=2.24.31
release=1
source=(http://download.gnome.org/sources/gtk+/${version%.*}/gtk+-$version.tar.xz
CVE-2013-7447.patch)
source=(http://download.gnome.org/sources/gtk+/${version%.*}/gtk+-$version.tar.xz)
build() {
cd gtk+-$version
patch -p1 -i $SRC/CVE-2013-7447.patch
./configure \
--prefix=/usr \
--libdir=/usr/lib32 \