commit 4c294ece2d22f3339bc6a2d20356177e76c68327 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Wed Aug 22 20:55:59 2018 +0200 imlib2: updated to 1.5.1 diff --git a/imlib2/.footprint b/imlib2/.footprint index ff04a8271..da53c2159 100644 --- a/imlib2/.footprint +++ b/imlib2/.footprint @@ -51,9 +51,9 @@ drwxr-xr-x root/root usr/lib/imlib2/loaders/ -rwxr-xr-x root/root usr/lib/imlib2/loaders/zlib.so -rw-r--r-- root/root usr/lib/libImlib2.a -rwxr-xr-x root/root usr/lib/libImlib2.la -lrwxrwxrwx root/root usr/lib/libImlib2.so -> libImlib2.so.1.4.9 -lrwxrwxrwx root/root usr/lib/libImlib2.so.1 -> libImlib2.so.1.4.9 --rwxr-xr-x root/root usr/lib/libImlib2.so.1.4.9 +lrwxrwxrwx root/root usr/lib/libImlib2.so -> libImlib2.so.1.5.1 +lrwxrwxrwx root/root usr/lib/libImlib2.so.1 -> libImlib2.so.1.5.1 +-rwxr-xr-x root/root usr/lib/libImlib2.so.1.5.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/imlib2.pc drwxr-xr-x root/root usr/share/ diff --git a/imlib2/.md5sum b/imlib2/.md5sum deleted file mode 100644 index ca86b7c4a..000000000 --- a/imlib2/.md5sum +++ /dev/null @@ -1 +0,0 @@ -23ef8b49f2793bc63b16839a2062298b imlib2-1.4.9.tar.bz2 diff --git a/imlib2/.signature b/imlib2/.signature index 10e764d38..2a9bf01cb 100644 --- a/imlib2/.signature +++ b/imlib2/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bT8jMng2DMlQRpvx/jQRMhd6lj7NNoi20DA1gV1CDJhKbiwSlndtIi5asmTmeiiDJmqK4R2tfv92aTg++W8Bw4= -SHA256 (Pkgfile) = 4504d8f0ddccdfa7b83658e944c0ff4ea69c83cc1e44722c0b5e7a881fbfe96a -SHA256 (.footprint) = 6631d22a5c0603bc6261ffbcee9e66c4a6982999b87dedc631da1310fa3e3ce8 -SHA256 (imlib2-1.4.9.tar.bz2) = 7d2864972801823ce44ca8d5584a67a88f0e54e2bf47fa8cf4a514317b4f0021 +RWSE3ohX2g5d/WDo/14SjxEwXAj3670sRpR5X1j6xXDhQV6nwFhJ7Fx/XFL26Z6FnkhRZxw0fhDLiLkT+9yRA7lZ/bAG8LdmRQU= +SHA256 (Pkgfile) = 7cba6037a6839a019b4bd05989e4d5e22a31fea474c12f31e0bc99e483ba78ac +SHA256 (.footprint) = a153427396aca66e8a305f67dc3516ee67945b3f88f27d3de393cfb16df426af +SHA256 (imlib2-1.5.1.tar.bz2) = fa4e57452b8843f4a70f70fd435c746ae2ace813250f8c65f977db5d7914baae diff --git a/imlib2/Pkgfile b/imlib2/Pkgfile index f59ac9428..ad30d5926 100644 --- a/imlib2/Pkgfile +++ b/imlib2/Pkgfile @@ -4,7 +4,7 @@ # Depends on: freetype, libid3tag, libtiff, giflib, xorg-libsm, xorg-libxext name=imlib2 -version=1.4.9 +version=1.5.1 release=1 source=(http://download.sourceforge.net/enlightenment/$name-$version.tar.bz2) diff --git a/imlib2/imlib2-1.4.8-gif-oob.patch b/imlib2/imlib2-1.4.8-gif-oob.patch deleted file mode 100644 index ed297579e..000000000 --- a/imlib2/imlib2-1.4.8-gif-oob.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 16de244bd03d2f75da6508feb1ad9cb4e668e9dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bernhard=20=C3=9Cbelacker?= <bernhardu@vr-web.de> -Date: Sat, 2 Apr 2016 13:05:21 -0400 -Subject: [PATCH] gif: fix oob reads w/bad colormaps - -Verify the color map is inbounds before indexing with it. - -https://bugs.debian.org/785369 ---- - src/modules/loaders/loader_gif.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/src/modules/loaders/loader_gif.c b/src/modules/loaders/loader_gif.c -index 638df59..7bdf29c 100644 ---- a/src/modules/loaders/loader_gif.c -+++ b/src/modules/loaders/loader_gif.c -@@ -170,9 +170,16 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, - } - else - { -- r = cmap->Colors[rows[i][j]].Red; -- g = cmap->Colors[rows[i][j]].Green; -- b = cmap->Colors[rows[i][j]].Blue; -+ if (rows[i][j] < cmap->ColorCount) -+ { -+ r = cmap->Colors[rows[i][j]].Red; -+ g = cmap->Colors[rows[i][j]].Green; -+ b = cmap->Colors[rows[i][j]].Blue; -+ } -+ else -+ { -+ r = g = b = 0; -+ } - *ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b; - } - per += per_inc; --- -2.7.4 -