Merge staging-next-21.05 into staging-21.05

2021-07-25 12:02:56 +00:00
parent 719e9f31c2 46a3e2b42d
commit 48b0dbb885
21 changed files with 157 additions and 140 deletions
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, gettext, fetchurl, fetchpatch }:

 stdenv.mkDerivation rec {
  name = "lrzsz-0.12.20";
@@ -8,6 +8,16 @@ stdenv.mkDerivation rec {
    sha256 = "1wcgfa9fsigf1gri74gq0pa7pyajk12m4z69x7ci9c6x9fqkd2y2";
  };

+  patches = [
+    (fetchpatch {
+      name = "CVE-2018-10195.patch";
+      url = "https://bugzilla.redhat.com/attachment.cgi?id=79507";
+      sha256 = "0jlh8w0cjaz6k56f0h3a0h4wgc51axmrdn3mdspk7apjfzqcvx3c";
+    })
+  ];
+
+  nativeBuildInputs = [ gettext ];
+
  hardeningDisable = [ "format" ];

  configureFlags = [ "--program-transform-name=s/^l//" ];