diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-30 09:46:20 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-30 09:49:12 +0200 |
| commit | 7d580b8339a749acd7f61ca6d1f21687ec9680bb (patch) | |
| tree | 22fc9c875b060b1ba7a1b45da433f28ac89149c0 /pkgs/development/libraries/gd | |
| parent | 8a304cc2286f7c4578b618319d1079b8bf56220f (diff) | |
| download | nixpkgs-7d580b8339a749acd7f61ca6d1f21687ec9680bb.tar nixpkgs-7d580b8339a749acd7f61ca6d1f21687ec9680bb.tar.gz nixpkgs-7d580b8339a749acd7f61ca6d1f21687ec9680bb.tar.bz2 nixpkgs-7d580b8339a749acd7f61ca6d1f21687ec9680bb.tar.lz nixpkgs-7d580b8339a749acd7f61ca6d1f21687ec9680bb.tar.xz nixpkgs-7d580b8339a749acd7f61ca6d1f21687ec9680bb.tar.zst nixpkgs-7d580b8339a749acd7f61ca6d1f21687ec9680bb.zip | |
gd: 2.1.1 -> 2.2.1
Diffstat (limited to 'pkgs/development/libraries/gd')
| -rw-r--r-- | pkgs/development/libraries/gd/CVE-2016-3074.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/gd/default.nix | 11 |
2 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/development/libraries/gd/CVE-2016-3074.patch b/pkgs/development/libraries/gd/CVE-2016-3074.patch deleted file mode 100644 index 76994697729..00000000000 --- a/pkgs/development/libraries/gd/CVE-2016-3074.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gd_gd2.c b/src/gd_gd2.c -index 6f28461..a50b33d 100644 ---- a/src/gd_gd2.c -+++ b/src/gd_gd2.c -@@ -165,6 +165,8 @@ _gd2GetHeader (gdIOCtxPtr in, int *sx, int *sy, - if (gdGetInt (&cidx[i].size, in) != 1) { - goto fail2; - }; -+ if (cidx[i].offset < 0 || cidx[i].size < 0) -+ goto fail2; - }; - *chunkIdx = cidx; - }; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index bb06893e712..68c713c235e 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -3,6 +3,7 @@ , zlib , libjpeg , libpng +, libwebp , libtiff ? null , libXpm ? null , fontconfig @@ -11,19 +12,15 @@ stdenv.mkDerivation rec { name = "gd-${version}"; - version = "2.1.1"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz"; - sha256 = "11djy9flzxczphigqgp7fbbblbq35gqwwhn9xfcckawlapa1xnls"; + sha256 = "0xmrqka1ggqgml84xbmkw1y0r0lg7qn657v5b1my8pry92p651vh"; }; - patches = [ - ./CVE-2016-3074.patch - ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib fontconfig freetype libjpeg libpng libtiff libXpm ]; + buildInputs = [ zlib fontconfig freetype libjpeg libpng libwebp libtiff libXpm ]; outputs = [ "dev" "out" "bin" ]; |