diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2021-07-28 21:30:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 21:30:23 +0200 |
| commit | a1943f472962de12803f3a2992da7addbfda7e46 (patch) | |
| tree | 4ff0dcd58fe248d206eca9f17498ab44810a7519 | |
| parent | Merge pull request #131850 from NixOS/backport-131819-to-release-21.05 (diff) | |
| parent | libgrss: add patch for CVE-2016-20011 (diff) | |
| download | nixpkgs-a1943f472962de12803f3a2992da7addbfda7e46.tar.gz | |
Merge pull request #131847 from NixOS/backport-131478-to-release-21.05
[Backport release-21.05] libgrss: add patch for CVE-2016-20011
| -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 8c5ea73af0b9..5e1c2b17858d 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 ]; |