tjh.dev
Merge pull request #64729 from risicle/ris-dosbox-CVEs-19.03
[r19.03] dosbox: add patches for CVE-2019-7165 & CVE-2019-12594
authored by
Graham Christensen
and committed by
GitHub
6be0d582
6d2dfd53
+15
-1
pkgs/misc/emulators/dosbox/default.nix
+15
-1
pkgs/misc/emulators/dosbox/default.nix
···
1
-
{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng }:
2
3
stdenv.mkDerivation rec {
4
name = "dosbox-0.74-2";
···
7
url = "mirror://sourceforge/dosbox/${name}.tar.gz";
8
sha256 = "1ksp1b5szi0vy4x55rm3j1y9wq5mlslpy8llpg87rpdyjlsk0xvh";
9
};
10
11
hardeningDisable = [ "format" ];
12
···
1
+
{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU_combined, libpng, fetchpatch }:
2
3
stdenv.mkDerivation rec {
4
name = "dosbox-0.74-2";
···
7
url = "mirror://sourceforge/dosbox/${name}.tar.gz";
8
sha256 = "1ksp1b5szi0vy4x55rm3j1y9wq5mlslpy8llpg87rpdyjlsk0xvh";
9
};
10
+
11
+
patches = [
12
+
(fetchpatch {
13
+
name = "cve-2019-7165.patch";
14
+
url = "https://salsa.debian.org/debian/dosbox/raw/30989a35ee478f8f4bc8e167fccbf92fc77e1519/debian/patches/cve-2019-7165.patch?inline=false";
15
+
sha256 = "12c2wq6l62x9iggg1hvs82xbdm5g5hirixvbzjpnjmkm8c4h4k38";
16
+
})
17
+
(fetchpatch {
18
+
name = "cve-2019-12594.patch";
19
+
url = "https://salsa.debian.org/debian/dosbox/raw/30989a35ee478f8f4bc8e167fccbf92fc77e1519/debian/patches/cve-2019-12594.patch?inline=false";
20
+
excludes = ["configure.in"];
21
+
sha256 = "1zrv2vnb86gdq9z4irqflzf7lz3r6rc6m46k1hdb8ldl1c88w8jj";
22
+
})
23
+
];
24
25
hardeningDisable = [ "format" ];
26