about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2023-02-20 17:38:34 +0100
committerMartin Weinelt <hexa@darmstadt.ccc.de>2023-02-20 17:47:39 +0100
commitb6c9118a53558b6c141c77c5d0efac5fc595c09e (patch)
tree086f46b59c963b9fb05b59e9008aa789d07e8cfb
parentec9a71fe59086d7d16680be69425a63407cf1410 (diff)
c-ares: 1.18.1 -> 1.19.0
https://c-ares.org/changelog.html#1_19_0

Fixes: CVE-2022-4904
-rw-r--r--pkgs/development/libraries/c-ares/default.nix15
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 20ec00f4a8fc5..9c024211a71bd 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -1,5 +1,4 @@
 { lib, stdenv, fetchurl, writeTextDir
-, fetchpatch
 , withCMake ? true, cmake
 
 # sensitive downstream packages
@@ -14,23 +13,14 @@
 
 stdenv.mkDerivation rec {
   pname = "c-ares";
-  version = "1.18.1";
+  version = "1.19.0";
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://c-ares.haxx.se/download/${pname}-${version}.tar.gz";
-    sha256 = "sha256-Gn1SqKhKn7/7G+kTPA9uFyF9kepab6Yfa0cpzaeOu88=";
+    sha256 = "sha256-v866N+I/1TEpOCkALKwEAe9JptxVkj9/kiNlhbetHdM=";
   };
 
-  # c-ares is used for fetchpatch, so avoid using it for c-aresMinimal
-  patches = lib.optionals withCMake [
-    # fix .pc paths created by cmake build
-    (fetchpatch {
-      url = "https://github.com/jonringer/c-ares/commit/9806a8a2f999a8a3efa3c893f2854dce6919d5bb.patch";
-      sha256 = "sha256-nh/ZKdan2/FTrouApRQA7O8KGZrLEUuWhxGOktiiGwU=";
-    })
-  ];
-
   nativeBuildInputs = lib.optionals withCMake [ cmake ];
 
   cmakeFlags = [] ++ lib.optionals stdenv.hostPlatform.isStatic [
@@ -47,6 +37,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A C library for asynchronous DNS requests";
     homepage = "https://c-ares.haxx.se";
+    changelog = "https://c-ares.org/changelog.html#${lib.replaceStrings [ "." ] [ "_" ] version}";
     license = licenses.mit;
     platforms = platforms.all;
   };