From c1fc59a7956543a0ab93be816595987981faae30 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Wed, 29 Jun 2022 13:52:21 -0700 Subject: [PATCH 1/2] libdwarf_0_4: 0.4.0 -> 0.4.1 This commit should fix #177227 --- pkgs/development/libraries/libdwarf/0.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdwarf/0.4.nix b/pkgs/development/libraries/libdwarf/0.4.nix index 5d8634bc25b3..bbe93ddbdcc0 100644 --- a/pkgs/development/libraries/libdwarf/0.4.nix +++ b/pkgs/development/libraries/libdwarf/0.4.nix @@ -1,7 +1,7 @@ { callPackage, zlib }: callPackage ./common.nix rec { - version = "0.4.0"; + version = "0.4.1"; url = "https://www.prevanders.net/libdwarf-${version}.tar.xz"; - sha512 = "30e5c6c1fc95aa28a014007a45199160e1d9ba870b196d6f98e6dd21a349e9bb31bba1bd6817f8ef9a89303bed0562182a7d46fcbb36aedded76c2f1e0052e1e"; + sha512 = "793fe487de80fe6878f022b90f49ec334a0d7db071ff22a11902db5e3457cc7f3f853945a9ac74de2c40f7f388277f21c5b2e62745bca92d2bb55c51e9577693"; buildInputs = [ zlib ]; } From d10999d7335191ec644cf89ba81624a73300f893 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Tue, 5 Jul 2022 17:08:02 +0000 Subject: [PATCH 2/2] Add knownVulnerabilities to libdwarf --- pkgs/development/libraries/libdwarf/0.4.nix | 1 + pkgs/development/libraries/libdwarf/common.nix | 3 ++- pkgs/development/libraries/libdwarf/default.nix | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdwarf/0.4.nix b/pkgs/development/libraries/libdwarf/0.4.nix index bbe93ddbdcc0..c5b14f5a05ef 100644 --- a/pkgs/development/libraries/libdwarf/0.4.nix +++ b/pkgs/development/libraries/libdwarf/0.4.nix @@ -4,4 +4,5 @@ callPackage ./common.nix rec { url = "https://www.prevanders.net/libdwarf-${version}.tar.xz"; sha512 = "793fe487de80fe6878f022b90f49ec334a0d7db071ff22a11902db5e3457cc7f3f853945a9ac74de2c40f7f388277f21c5b2e62745bca92d2bb55c51e9577693"; buildInputs = [ zlib ]; + knownVulnerabilities = []; } diff --git a/pkgs/development/libraries/libdwarf/common.nix b/pkgs/development/libraries/libdwarf/common.nix index 7087e833c0ed..32dc6eaa6e4e 100644 --- a/pkgs/development/libraries/libdwarf/common.nix +++ b/pkgs/development/libraries/libdwarf/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildInputs, sha512, version, libelf, url }: +{ lib, stdenv, fetchurl, buildInputs, sha512, version, libelf, url, knownVulnerabilities }: stdenv.mkDerivation rec { pname = "libdwarf"; @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.atry ]; + inherit knownVulnerabilities; }; } diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 2b105027bd16..5bb2d6aa6f72 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -4,4 +4,5 @@ callPackage ./common.nix rec { url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870"; buildInputs = [ zlib libelf ]; + knownVulnerabilities = [ "CVE-2022-32200" ]; }