From 81c84a919422225cf40d82a74339db073a0d63e8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 28 May 2021 02:32:27 +0200 Subject: [PATCH 1/2] getdata: add security patch from Debian (cherry picked from commit 14bb4b8f9aed4b1e04c0edab0851c31144ccd7e3) --- pkgs/development/libraries/getdata/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index de76924844f..f2793e92186 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libtool }: +{ lib, stdenv, fetchurl, fetchpatch, libtool }: stdenv.mkDerivation rec { pname = "getdata"; version = "0.10.0"; @@ -7,6 +7,11 @@ stdenv.mkDerivation rec { sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym"; }; + patches = [ (fetchpatch { + url = "https://sources.debian.org/data/main/libg/libgetdata/0.10.0-10/debian/patches/CVE-2021-20204.patch"; + sha256 = "1lvp1c2pkk9kxniwlvax6d8fsmjrkpxawf71c7j4rfjm6dgvivzm"; + })]; + buildInputs = [ libtool ]; meta = with lib; { From 4330bdd24472a70f8416a3163b6ec04167cf20aa Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 30 May 2021 03:43:56 +0200 Subject: [PATCH 2/2] Update pkgs/development/libraries/getdata/default.nix (cherry picked from commit 1b77912d10ba5a5e8ddf7853f00ac3cb841d59bf) --- pkgs/development/libraries/getdata/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index f2793e92186..25321c22434 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -7,10 +7,12 @@ stdenv.mkDerivation rec { sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym"; }; - patches = [ (fetchpatch { - url = "https://sources.debian.org/data/main/libg/libgetdata/0.10.0-10/debian/patches/CVE-2021-20204.patch"; - sha256 = "1lvp1c2pkk9kxniwlvax6d8fsmjrkpxawf71c7j4rfjm6dgvivzm"; - })]; + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/libg/libgetdata/0.10.0-10/debian/patches/CVE-2021-20204.patch"; + sha256 = "1lvp1c2pkk9kxniwlvax6d8fsmjrkpxawf71c7j4rfjm6dgvivzm"; + }) + ]; buildInputs = [ libtool ];