Merge pull request #189007 from risicle/ris-openscad-CVE-2022-0496-0497

openscad: add patches for CVE-2022-0496 & CVE-2022-0497
This commit is contained in:
Robert Scott 2022-08-31 21:39:18 +01:00 committed by GitHub
commit 93300e3f1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, qtbase
, qtmultimedia
, qscintilla
@ -42,6 +43,19 @@ mkDerivation rec {
sha256 = "sha256-2tOLqpFt5klFPxHNONnHVzBKEFWn4+ufx/MU+eYbliA=";
};
patches = [
(fetchpatch {
name = "CVE-2022-0496.patch";
url = "https://github.com/openscad/openscad/commit/00a4692989c4e2f191525f73f24ad8727bacdf41.patch";
sha256 = "sha256-q3SLj2b5aM/IQ8vIDj4iVcwCajgyJ5juNV/KN35uxfI=";
})
(fetchpatch {
name = "CVE-2022-0497.patch";
url = "https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b.patch";
sha256 = "sha256-KNEVu10E2d4G2x+FJcuHo2tjD8ygMRuhUcW9NbN98bM=";
})
];
nativeBuildInputs = [ bison flex pkg-config gettext qmake ];
buildInputs = [