diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2021-07-28 19:45:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-28 19:45:19 +0200 |
commit | 923457614b378e71f120fa76287930ba84d0753f (patch) | |
tree | 7e3510b71bf6477c11b8fbe537a262186ed14daf /pkgs/development | |
parent | 9f09ec4319a10d041b202e69fa661c6fb7265580 (diff) | |
parent | b50d7d0683d61bf00a101ce7b67c7b0f065d7ff6 (diff) | |
download | nixpkgs-923457614b378e71f120fa76287930ba84d0753f.tar nixpkgs-923457614b378e71f120fa76287930ba84d0753f.tar.gz nixpkgs-923457614b378e71f120fa76287930ba84d0753f.tar.bz2 nixpkgs-923457614b378e71f120fa76287930ba84d0753f.tar.lz nixpkgs-923457614b378e71f120fa76287930ba84d0753f.tar.xz nixpkgs-923457614b378e71f120fa76287930ba84d0753f.tar.zst nixpkgs-923457614b378e71f120fa76287930ba84d0753f.zip |
Merge pull request #131478 from risicle/ris-libgrss-CVE-2016-20011
libgrss: add patch for CVE-2016-20011
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/libgrss/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index 8c5ea73af0b..5e1c2b17858 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: let version = "0.7.0"; @@ -14,6 +14,15 @@ stdenv.mkDerivation { sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7"; }; + patches = [ + (fetchpatch { + name = "CVE-2016-20011.patch"; + # https://gitlab.gnome.org/GNOME/libgrss/-/merge_requests/7, not yet merged! + url = "https://gitlab.gnome.org/GNOME/libgrss/-/commit/2c6ea642663e2a44efc8583fae7c54b7b98f72b3.patch"; + sha256 = "1ijvq2jl97vphcvrbrqxvszdmv6yyjfygdca9vyaijpafwyzzb18"; + }) + ]; + nativeBuildInputs = [ pkg-config vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ glib libxml2 libsoup ]; |