mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 11:22:58 +00:00
dbus: 1.14.0 -> 1.14.4
https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.14.4/NEWS Fixes: CVE-2022-42010, CVE-2022-42011, CVE-2022-42012
This commit is contained in:
parent
b31c42831f
commit
bdb347b42c
@ -1,6 +1,5 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, expat
|
||||
@ -20,27 +19,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbus";
|
||||
version = "1.14.0";
|
||||
version = "1.14.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz";
|
||||
sha256 = "sha256-zNfM43WW4KGVWP1mSNEnKrQ/AR2AyGNa6o/QutWK69Q=";
|
||||
sha256 = "sha256-fA+bjl7A/yR5OD5iwAhKOimvme3xUU6fZZuBsw1ONT4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix dbus-daemon crashing when running tests due to long XDG_DATA_DIRS.
|
||||
# https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/302
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/b551b3e9737958216a1a9d359150a4110a9d0549.patch";
|
||||
sha256 = "kOVjlklZzKvBZXmmrE1UiO4XWRoBLViGwdn6/eDH+DY=";
|
||||
})
|
||||
] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch);
|
||||
patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
|
||||
|
||||
postPatch = ''
|
||||
# We need to generate the file ourselves.
|
||||
# https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/317
|
||||
rm doc/catalog.xml
|
||||
|
||||
substituteInPlace bus/Makefile.am \
|
||||
--replace 'install-data-hook:' 'disabled:' \
|
||||
--replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':'
|
||||
|
Loading…
Reference in New Issue
Block a user