JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #37267: libvorbis, tremor: CVE-2018-5146 updates + SDL build impurity.

Browse Source
This commit is contained in:
Vladimír Čunát 2018-03-18 10:19:46 +01:00
commit 65cf335715
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/SDL/default.nix
View File

@ -42,6 +42,9 @@ stdenv.mkDerivation rec {
sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
}; };
# make: *** No rule to make target 'build/*.lo', needed by 'build/libSDL.la'. Stop.
postPatch = "patchShebangs ./configure";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
outputBin = "dev"; # sdl-config outputBin = "dev"; # sdl-config

14
pkgs/development/libraries/libvorbis/default.nix
View File

@ -1,26 +1,16 @@
{ stdenv, fetchurl, libogg, pkgconfig, fetchpatch }: { stdenv, fetchurl, libogg, pkgconfig, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libvorbis-1.3.5"; name = "libvorbis-1.3.6";
src = fetchurl { src = fetchurl {
url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz";
sha256 = "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal"; sha256 = "05dlzjkdpv46zb837wysxqyn8l636x3dw8v8ymlrwz2fg1dbn05g";
}; };
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];
patches = [ patches = [
(fetchpatch {
url = "https://github.com/xiph/vorbis/commit/a79ec216cd119069c68b8f3542c6a425a74ab993.patch";
sha256 = "0xhsa96n3dlh2l85bxpz4b9m78mfxfgi2ibhjp77110a0nvkjr6h";
name = "CVE-2017-14633";
})
(fetchpatch {
url = "https://github.com/xiph/vorbis/commit/c1c2831fc7306d5fbd7bc800324efd12b28d327f.patch";
sha256 = "17lb86105im6fc0h0cx5sn94p004jsdbbs2vj1m9ll6z9yb4rxwc";
name = "CVE-2017-14632";
})
(fetchpatch { (fetchpatch {
url = "https://gitlab.xiph.org/xiph/vorbis/uploads/a68cf70fa10c8081a633f77b5c6576b7/0001-CVE-2017-14160-make-sure-we-don-t-overflow.patch"; url = "https://gitlab.xiph.org/xiph/vorbis/uploads/a68cf70fa10c8081a633f77b5c6576b7/0001-CVE-2017-14160-make-sure-we-don-t-overflow.patch";
sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x"; sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x";

12
pkgs/development/libraries/tremor/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchsvn, autoreconfHook, pkgconfig, libogg }: { stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tremor-svn-${src.rev}"; name = "tremor-git-${src.rev}";
src = fetchsvn { src = fetchgit {
url = http://svn.xiph.org/trunk/Tremor; url = https://git.xiph.org/tremor.git;
rev = "17866"; rev = "562307a4a7082e24553f3d2c55dab397a17c4b4f";
sha256 = "161411cbefa1527da7a8fc087e78d8e21d19143d3a6eb42fb281e5026aad7568"; sha256 = "0m07gq4zfgigsiz8b518xyb19v7qqp76qmp7lb262825vkqzl3zq";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];