diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-03 14:27:14 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-03 14:27:14 -0700 |
| commit | a2da9cfcafee701794290bfa710cd68b0a62cdb5 (patch) | |
| tree | 59ed75f1efe274af17ae33059d25a0e36d84384a /pkgs/misc | |
| parent | 32caa604e3c4fc2704a9d9416e4a244975e4393e (diff) | |
| parent | f2d3b5ead934a3334f67405cddc705273e736ef1 (diff) | |
| download | nixlib-a2da9cfcafee701794290bfa710cd68b0a62cdb5.tar nixlib-a2da9cfcafee701794290bfa710cd68b0a62cdb5.tar.gz nixlib-a2da9cfcafee701794290bfa710cd68b0a62cdb5.tar.bz2 nixlib-a2da9cfcafee701794290bfa710cd68b0a62cdb5.tar.lz nixlib-a2da9cfcafee701794290bfa710cd68b0a62cdb5.tar.xz nixlib-a2da9cfcafee701794290bfa710cd68b0a62cdb5.tar.zst nixlib-a2da9cfcafee701794290bfa710cd68b0a62cdb5.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/dolphin-emu/master.nix | 10 | ||||
| -rw-r--r-- | pkgs/misc/ghostscript/CVE-2015-3228.patch | 20 | ||||
| -rw-r--r-- | pkgs/misc/ghostscript/default.nix | 6 |
3 files changed, 31 insertions, 5 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index f742973c08d4..06734d24c8a6 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,14 +1,14 @@ { stdenv, gcc5, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib , gettext, git, libpthreadstubs, libXrandr, libXext, readline -, openal, libXdmcp, portaudio, SDL, fetchgit, libusb +, openal, libXdmcp, portaudio, fetchgit, libusb, libevdev , libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20150609"; + name = "dolphin-emu-20150802"; src = fetchgit { url = git://github.com/dolphin-emu/dolphin.git; - rev = "e47e4c677ad22895f8c8bc78676dd295e36f2695"; - sha256 = "0g176x0rw9lssw68alr83cakldq1q38mzjwxdaf524bkvnn7fl3r"; + rev = "5097a22844b850b429872f4de390bd958b11a616"; + sha256 = "1qizkahbimpmgjs51av1cdmnnyvbz0j0gknmi5vdc38vrzxvwkrf"; fetchSubmodules = false; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ gcc5 pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal - git libXdmcp portaudio SDL libusb libpulseaudio ]; + libevdev git libXdmcp portaudio libusb libpulseaudio ]; meta = { homepage = http://dolphin-emu.org/; diff --git a/pkgs/misc/ghostscript/CVE-2015-3228.patch b/pkgs/misc/ghostscript/CVE-2015-3228.patch new file mode 100644 index 000000000000..7be18b0a7302 --- /dev/null +++ b/pkgs/misc/ghostscript/CVE-2015-3228.patch @@ -0,0 +1,20 @@ +Description: Sanity check for memory allocation. + In gs_heap_alloc_bytes(), add a sanity check to ensure we don't overflow the + variable holding the actual number of bytes we allocate. +Origin: upstream, http://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=0c0b085 +Author: Chris Liddell <chris.liddell@artifex.com> +Forwarded: yes +Bug-Debian: http://bugs.debian.org/793489 +Last-Update: 2015-07-26 + +--- a/base/gsmalloc.c ++++ b/base/gsmalloc.c +@@ -178,7 +178,7 @@ + } else { + uint added = size + sizeof(gs_malloc_block_t); + +- if (mmem->limit - added < mmem->used) ++ if (added <= size || mmem->limit - added < mmem->used) + set_msg("exceeded limit"); + else if ((ptr = (byte *) Memento_label(malloc(added), cname)) == 0) + set_msg("failed"); diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index fe86577bb7bd..3cbd156f17d2 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -57,6 +57,12 @@ stdenv.mkDerivation rec { # [] # maybe sometimes jpeg2000 support ; + patches = [ + ./urw-font-files.patch + # fetched from debian's ghostscript 9.15_dfsg-1 (called 020150707~0c0b085.patch there) + ./CVE-2015-3228.patch + ]; + makeFlags = [ "cups_serverroot=$(out)" "cups_serverbin=$(out)/lib/cups" ]; preConfigure = '' |