From 68889745cb52f4854adb87140489191f14848b7a Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 27 Jan 2021 19:08:20 +0100 Subject: [PATCH] libqb: 0.17.2 -> 2.0.2 Fixes CVE-2019-12779. --- pkgs/development/libraries/libqb/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index 3f0a9a28d19..f5f255b111f 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -1,19 +1,24 @@ -{ lib, stdenv, fetchurl, pkg-config }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libxml2 }: stdenv.mkDerivation rec { - name = "libqb-0.17.2"; + pname = "libqb"; + version = "2.0.2"; - src = fetchurl { - url = "https://fedorahosted.org/releases/q/u/quarterback/${name}.tar.xz"; - sha256 = "1zpl45p3n6dn1jgbsrrmccrmv2mvp8aqmnl0qxfjf7ymkrj9qhcs"; + src = fetchFromGitHub { + owner = "ClusterLabs"; + repo = pname; + rev = "v${version}"; + sha256 = "1gpfcz84igqncky09hdibxmzapzl37y8914avgq89rsizynj1wsm"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ libxml2 ]; meta = with lib; { homepage = "https://github.com/clusterlabs/libqb"; description = "A library providing high performance logging, tracing, ipc, and poll"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.unix; }; }