nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #64729 from risicle/ris-dosbox-CVEs-19.03

Browse Source 
[r19.03] dosbox: add patches for CVE-2019-7165 & CVE-2019-12594
This commit is contained in:
Graham Christensen
2019-07-18 17:33:12 -04:00
committed by GitHub
parent 6d2dfd5372 9f66b1baa2
commit 6be0d5824c
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/misc/emulators/dosbox/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng }:
{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng, fetchpatch }:
stdenv.mkDerivation rec {
name = "dosbox-0.74-2";
@@ -8,6 +8,20 @@ stdenv.mkDerivation rec {
sha256 = "1ksp1b5szi0vy4x55rm3j1y9wq5mlslpy8llpg87rpdyjlsk0xvh";
};
patches = [
(fetchpatch {
name = "cve-2019-7165.patch";
url = "https://salsa.debian.org/debian/dosbox/raw/30989a35ee478f8f4bc8e167fccbf92fc77e1519/debian/patches/cve-2019-7165.patch?inline=false";
sha256 = "12c2wq6l62x9iggg1hvs82xbdm5g5hirixvbzjpnjmkm8c4h4k38";
})
(fetchpatch {
name = "cve-2019-12594.patch";
url = "https://salsa.debian.org/debian/dosbox/raw/30989a35ee478f8f4bc8e167fccbf92fc77e1519/debian/patches/cve-2019-12594.patch?inline=false";
excludes = ["configure.in"];
sha256 = "1zrv2vnb86gdq9z4irqflzf7lz3r6rc6m46k1hdb8ldl1c88w8jj";
})
];
hardeningDisable = [ "format" ];
buildInputs = [ SDL SDL_net SDL_sound libGLU_combined libpng ];