summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2023-01-15 12:31:10 +0100
committerThomas Gerbet <thomas@gerbet.me>2023-01-23 18:06:42 +0100
commit72faef96c6e9265589e66fbe9a15dd1c62ac1265 (patch)
tree5e4260938662dd83f2d906ed6acecacddfb20cdd
parent020a541057b015c70097cd831fc962b07a175b85 (diff)
downloadnixpkgs-72faef96c6e9265589e66fbe9a15dd1c62ac1265.tar
nixpkgs-72faef96c6e9265589e66fbe9a15dd1c62ac1265.tar.gz
nixpkgs-72faef96c6e9265589e66fbe9a15dd1c62ac1265.tar.bz2
nixpkgs-72faef96c6e9265589e66fbe9a15dd1c62ac1265.tar.lz
nixpkgs-72faef96c6e9265589e66fbe9a15dd1c62ac1265.tar.xz
nixpkgs-72faef96c6e9265589e66fbe9a15dd1c62ac1265.tar.zst
nixpkgs-72faef96c6e9265589e66fbe9a15dd1c62ac1265.zip
libgda: apply patch for CVE-2021-39359
Upstream issue: https://gitlab.gnome.org/GNOME/libgda/-/issues/249
-rw-r--r--pkgs/development/libraries/libgda/6.x.nix6
-rw-r--r--pkgs/development/libraries/libgda/default.nix5
2 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix
index c02c6116e64..1f551ec9b4b 100644
--- a/pkgs/development/libraries/libgda/6.x.nix
+++ b/pkgs/development/libraries/libgda/6.x.nix
@@ -50,6 +50,12 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/57f618a3b2a3758ee3dcbf9bbdc566122dd8566d.patch";
       sha256 = "pyfymUd61m1kHaGyMbUQMma+szB8mlqGWwcFBBQawf8=";
     })
+
+    (fetchpatch {
+      name = "CVE-2021-39359.patch";
+      url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/bebdffb4de586fb43fd07ac549121f4b22f6812d.patch";
+      sha256 = "sha256-UjHP1nhb5n6TOdaMdQeE2s828T4wv/0ycG3FAk+I1QA=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
index e29482a34d4..1ef0a397c8e 100644
--- a/pkgs/development/libraries/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
@@ -37,6 +37,11 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/9859479884fad5f39e6c37e8995e57c28b11b1b9.diff";
       sha256 = "158sncc5bg9lkri1wb0i1ri1nhx4c34rzi47gbfkwphlp7qd4qqv";
     })
+    (fetchpatch {
+      name = "CVE-2021-39359.patch";
+      url = "https://src.fedoraproject.org/rpms/libgda5/raw/72bb769f12e861e27e883dac5fab34f1ba4bd97e/f/bebdffb4de586fb43fd07ac549121f4b22f6812d.patch";
+      sha256 = "sha256-hIKuY5NEqOzntdlLb541bA4xZU5ypTRmV1u765K6KbM=";
+    })
   ];
 
   nativeBuildInputs = [