summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@higgsboson.tk>2016-10-06 00:07:35 +0200
committerGitHub <noreply@github.com>2016-10-06 00:07:35 +0200
commit638d4b4d7147c975ee181bdb14048c63a571a9be (patch)
tree37c9b7b3d06037f720c882f6caf295110da976b2 /pkgs/os-specific
parent44bf933d9979466a9393ec305e1cdbe3515f7fa1 (diff)
parentc684eb756a015456c584975bbe099a299ce34763 (diff)
downloadnixlib-638d4b4d7147c975ee181bdb14048c63a571a9be.tar
nixlib-638d4b4d7147c975ee181bdb14048c63a571a9be.tar.gz
nixlib-638d4b4d7147c975ee181bdb14048c63a571a9be.tar.bz2
nixlib-638d4b4d7147c975ee181bdb14048c63a571a9be.tar.lz
nixlib-638d4b4d7147c975ee181bdb14048c63a571a9be.tar.xz
nixlib-638d4b4d7147c975ee181bdb14048c63a571a9be.tar.zst
nixlib-638d4b4d7147c975ee181bdb14048c63a571a9be.zip
Merge pull request #19265 from Mic92/rtkit
rtkit: apply security relevant patch
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/rtkit/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix
index 3284dfcb88ba..dd6f9ec42afa 100644
--- a/pkgs/os-specific/linux/rtkit/default.nix
+++ b/pkgs/os-specific/linux/rtkit/default.nix
@@ -13,10 +13,17 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
+    # Drop removed ControlGroup stanza
     (fetchpatch {
-      url = "https://anonscm.debian.org/cgit/pkg-multimedia/rtkit.git/plain/debian/patches/0002-Drop-Removed-ControlGroup-stanza.patch?id=21f2c6be6985c777cbf113c67043353406744050";
+      url = "http://git.0pointer.net/rtkit.git/patch/?id=6c28e20c0be2f616a025059fda0ffac84e7f4f17";
       sha256 = "0lsxk5nv08i1wjb4xh20i5fcwg3x0qq0k4f8bc0r9cczph2sv7ck";
     })
+
+    # security patch: Pass uid of caller to polkit
+    (fetchpatch {
+      url = "http://git.0pointer.net/rtkit.git/patch/?id=88d4082ef6caf6b071d749dca1c50e7edde914cc";
+      sha256 = "0hp1blbi359qz8fmr6nj4w9yc0jf3dd176f8pn25wdj38n13qkix";
+    })
   ];
 
   buildInputs = [ pkgconfig dbus libcap ];