polkit: 0.118 -> 0.119
The 0.119 release of polkit integrates the following changes, so the
patches implemented to incorporate these changes are no longer needed.
* 273357a395
* https://gitlab.freedesktop.org/polkit/polkit/-/blob/0.119/src/polkit/polkitsystembusname.c#L438-440
Fixes: CVE-2021-3560 without a patch
This commit is contained in:
parent
b5a68e6d43
commit
5aecb4202d
|
@ -20,28 +20,14 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "polkit";
|
pname = "polkit";
|
||||||
version = "0.118";
|
version = "0.119";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.gz";
|
url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.gz";
|
||||||
sha256 = "0swmg37jsxsxfsd2b3qm0l3zxr9ldvhpjw8lsgq3j8q7wy2fjm3d";
|
sha256 = "0p0zzmr0kh3mpmqya4q27y4h9b920zp5ya0i8909ahp9hvdrymy8";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = lib.optionals stdenv.hostPlatform.isMusl [
|
||||||
# Don't use etc/dbus-1/system.d
|
|
||||||
# Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/11
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5dd4e22efd05d55833c4634b56e473812b5acbf2.patch";
|
|
||||||
sha256 = "17lv7xj5ksa27iv4zpm4zwd4iy8zbwjj4ximslfq3sasiz9kxhlp";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
# https://www.openwall.com/lists/oss-security/2021/06/03/1
|
|
||||||
# https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/79
|
|
||||||
name = "CVE-2021-3560.patch";
|
|
||||||
url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch";
|
|
||||||
sha256 = "157ddsizgr290jsb8fpafrc37gc1qw5pdvl351vnn3pzhqs7n6f4";
|
|
||||||
})
|
|
||||||
] ++ lib.optionals stdenv.hostPlatform.isMusl [
|
|
||||||
# Make netgroup support optional (musl does not have it)
|
# Make netgroup support optional (musl does not have it)
|
||||||
# Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10
|
# Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10
|
||||||
# We use the version of the patch that Alpine uses successfully.
|
# We use the version of the patch that Alpine uses successfully.
|
||||||
|
@ -110,18 +96,22 @@ stdenv.mkDerivation rec {
|
||||||
inherit doCheck;
|
inherit doCheck;
|
||||||
checkInputs = [ dbus ];
|
checkInputs = [ dbus ];
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
runHook preCheck
|
||||||
|
|
||||||
# unfortunately this test needs python-dbusmock, but python-dbusmock needs polkit,
|
# unfortunately this test needs python-dbusmock, but python-dbusmock needs polkit,
|
||||||
# leading to a circular dependency
|
# leading to a circular dependency
|
||||||
substituteInPlace test/Makefile --replace polkitbackend ""
|
substituteInPlace test/Makefile --replace polkitbackend ""
|
||||||
|
|
||||||
# tests need access to the system bus
|
# tests need access to the system bus
|
||||||
dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check'
|
dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check'
|
||||||
|
|
||||||
|
runHook postCheck
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "http://www.freedesktop.org/wiki/Software/polkit";
|
homepage = "http://www.freedesktop.org/wiki/Software/polkit";
|
||||||
description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes";
|
description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes";
|
||||||
license = licenses.gpl2;
|
license = licenses.lgpl2Plus;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = teams.freedesktop.members ++ (with maintainers; [ ]);
|
maintainers = teams.freedesktop.members ++ (with maintainers; [ ]);
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue