From 853167e5b151069362cd18330691fe7596ce0822 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 22 May 2021 10:27:02 +0200 Subject: [PATCH] sssd: 1.16.4 -> 1.16.5 Fixes CVE-2018-16838. https://sssd.io/release-notes/sssd-1.16.5.html (cherry picked from commit affda4029fdc80149c0f30c8cc6021cf4efda0e7) --- pkgs/os-specific/linux/sssd/default.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 22e2da79c8cd..5cd63eb381ea 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl, - cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen, +{ stdenv, fetchFromGitHub, autoreconfHook, fetchpatch, glibc, augeas, dnsutils, c-ares, curl, + cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen, pkg-config, python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper, @@ -12,11 +12,13 @@ let in stdenv.mkDerivation rec { pname = "sssd"; - version = "1.16.4"; + version = "1.16.5"; - src = fetchurl { - url = "https://fedorahosted.org/released/sssd/${pname}-${version}.tar.gz"; - sha256 = "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb"; + src = fetchFromGitHub { + owner = "SSSD"; + repo = pname; + rev = "${pname}-${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "0zbs04lkjbp7y92anmafl7gzamcnq1f147p13hc4byyvjk9rg6f7"; }; patches = [ # Fix build failure against samba 4.12.0rc1 @@ -55,8 +57,9 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss - samba nfs-utils doxygen python python3 popt + samba nfs-utils python python3 popt talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos cifs-utils glib keyutils dbus fakeroot libxslt libxml2 libuuid ldap systemd nspr check cmocka uid_wrapper @@ -90,8 +93,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "System Security Services Daemon"; - homepage = "https://fedorahosted.org/sssd/"; - license = licenses.gpl3; + homepage = "https://sssd.io/"; + changelog = "https://sssd.io/release-notes/sssd-${version}.html"; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.e-user ]; };