From 94396b8d915a9a559cbafa306f398d07847b1c55 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 1 Apr 2016 23:59:34 +0200
Subject: [PATCH] imlib2: 1.4.6 -> 1.4.8 (security)
Fixes:
* CVE-2014-9762
* CVE-2014-9763
* CVE-2014-9764
---
pkgs/development/libraries/imlib2/default.nix | 8 +--
.../libraries/imlib2/giflib51.patch | 64 -------------------
2 files changed, 2 insertions(+), 70 deletions(-)
delete mode 100644 pkgs/development/libraries/imlib2/giflib51.patch
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index 3ff608a4ac33..8d79fcc50a8e 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -1,21 +1,17 @@
{ stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }:
stdenv.mkDerivation rec {
- name = "imlib2-1.4.6";
+ name = "imlib2-1.4.8";
src = fetchurl {
url = "mirror://sourceforge/enlightenment/${name}.tar.bz2";
- sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg";
+ sha256 = "0xxhgkd1axlcmf3kp1d7naiygparpg8l3sg3d263rhl2z0gm7aw9";
};
buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ];
nativeBuildInputs = [ pkgconfig ];
- # From
- # https://github.com/PhantomX/slackbuilds/blob/master/imlib2/patches/imlib2-giflib51.patch
- patches = [ ./giflib51.patch ];
-
preConfigure = ''
substituteInPlace imlib2-config.in \
--replace "@my_libs@" ""
diff --git a/pkgs/development/libraries/imlib2/giflib51.patch b/pkgs/development/libraries/imlib2/giflib51.patch
deleted file mode 100644
index 97eaeb0b96e6..000000000000
--- a/pkgs/development/libraries/imlib2/giflib51.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ruN imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c imlib2-1.4.6/src/modules/loaders/loader_gif.c
---- imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c 2013-12-21 10:16:10.000000000 +0000
-+++ imlib2-1.4.6/src/modules/loaders/loader_gif.c 2014-05-27 09:52:35.857291512 +0000
-@@ -36,7 +36,7 @@
- #endif
- if (fd < 0)
- return 0;
-- gif = DGifOpenFileHandle(fd);
-+ gif = DGifOpenFileHandle(fd, NULL);
- if (!gif)
- {
- close(fd);
-@@ -60,13 +60,13 @@
- h = gif->Image.Height;
- if (!IMAGE_DIMENSIONS_OK(w, h))
- {
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- return 0;
- }
- rows = malloc(h * sizeof(GifRowType *));
- if (!rows)
- {
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- return 0;
- }
- for (i = 0; i < h; i++)
-@@ -78,7 +78,7 @@
- rows[i] = malloc(w * sizeof(GifPixelType));
- if (!rows[i])
- {
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- for (i = 0; i < h; i++)
- {
- if (rows[i])
-@@ -150,7 +150,7 @@
- im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h);
- if (!im->data)
- {
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- free(rows);
- return 0;
- }
-@@ -181,7 +181,7 @@
- last_per = (int)per;
- if (!(progress(im, (int)per, 0, last_y, w, i)))
- {
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- for (i = 0; i < h; i++)
- {
- free(rows[i]);
-@@ -198,7 +198,7 @@
- {
- progress(im, 100, 0, last_y, w, h);
- }
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- for (i = 0; i < h; i++)
- {
- free(rows[i]);
\ No newline at end of file