Commit 1dc9a8e7 authored by Raine Makelainen's avatar Raine Makelainen

Merge branch 'jb42415' into 'master'

[udisks2] Make possible to unlock from another seat. Contributes to JB#42415

See merge request !8
parents 43069f6d c2abccf4
From 66b9026ffbd0653d698e96674c229d006b7503bc Mon Sep 17 00:00:00 2001
From 1416329a39c62b7b94148128f218a4ea731be29f Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Tue, 5 Dec 2017 11:17:50 +0200
Subject: [PATCH 1/8] Disable libblockdev-mdraid and part support from source
Subject: [PATCH 1/9] Disable libblockdev-mdraid and part support from source
tree
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
......
From 8f3aad8fcdefa494421c23c0cc172974d0089d5b Mon Sep 17 00:00:00 2001
From cae22acf2f1cb3165c10bc9b5e63b15d1f866ee0 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Thu, 7 Dec 2017 13:15:34 +0200
Subject: [PATCH 2/8] Drop smartata dependencies
Subject: [PATCH 2/9] Drop smartata dependencies
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From 90d266f78e8b7f32adcd189d12aee699b0cb047c Mon Sep 17 00:00:00 2001
From 26f930ba9300ec99a277c87a3cafe116da13b417 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Tue, 6 Feb 2018 14:01:16 +0200
Subject: [PATCH 3/8] Loosen up mount/unmount rights
Subject: [PATCH 3/9] Loosen up mount/unmount rights
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From 297ddec9abf15899ebed74f187232dadae0f49fc Mon Sep 17 00:00:00 2001
From 34b034aefe6a1f1954402ba68da61d4e3385f736 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Tue, 6 Feb 2018 14:08:59 +0200
Subject: [PATCH 4/8] Introduce mount-sd service that is executed as nemo
Subject: [PATCH 4/9] Introduce mount-sd service that is executed as nemo
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From 1cc5f25e78e0b22134cdc175b32195f872cc0588 Mon Sep 17 00:00:00 2001
From 009396002ac2592de4d5b6a7b7a9da36a321e272 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Mon, 12 Mar 2018 10:18:03 +0200
Subject: [PATCH 5/8] Add udev rule for the sda drives
Subject: [PATCH 5/9] Add udev rule for the sda drives
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From 4667c9b0ce05d48e2b7002a3f6b198ca0207d8f1 Mon Sep 17 00:00:00 2001
From 6cc6f7315474139959932ef477e74d29332d494d Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Wed, 11 Apr 2018 11:11:53 +0300
Subject: [PATCH 6/8] Disable zram rule for now
Subject: [PATCH 6/9] Disable zram rule for now
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From 0cd18d6a72de3d800f6e8e9a55681484b79a9cb8 Mon Sep 17 00:00:00 2001
From cd86396dde456b4090856a0455ad68999bf07492 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Wed, 18 Apr 2018 18:00:00 +0300
Subject: [PATCH 7/8] Create mount path with 755 rights
Subject: [PATCH 7/9] Create mount path with 755 rights
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From 72dce4ff132fd0dc4aa6fda56047c1c91f182e9d Mon Sep 17 00:00:00 2001
From 5775a7f9008849338d3da27dc93a92e6b72dfb84 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Mon, 16 Jul 2018 15:40:23 +0300
Subject: [PATCH 8/8] Make it possible to format from another seat. Fixes
Subject: [PATCH 8/9] Make it possible to format from another seat. Fixes
JB#42414
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
......
From a1e98f930a3906b6a5725aa5928bd61195d98cce Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Fri, 3 Aug 2018 09:39:20 +0300
Subject: [PATCH 9/9] Make it possible to unlock from another seat
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
data/org.freedesktop.UDisks2.policy.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/org.freedesktop.UDisks2.policy.in b/data/org.freedesktop.UDisks2.policy.in
index fedab426..acc15f48 100644
--- a/data/org.freedesktop.UDisks2.policy.in
+++ b/data/org.freedesktop.UDisks2.policy.in
@@ -111,9 +111,9 @@
<_description>Unlock an encrypted device plugged into another seat</_description>
<_message>Authentication is required to unlock an encrypted device</_message>
<defaults>
- <allow_any>auth_admin</allow_any>
- <allow_inactive>auth_admin</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
+ <allow_any>auth_self</allow_any>
+ <allow_inactive>auth_self</allow_inactive>
+ <allow_active>auth_self_keep</allow_active>
</defaults>
</action>
--
2.17.1
......@@ -22,6 +22,7 @@ Patch5: 0005-Add-udev-rule-for-the-sda-drives.patch
Patch6: 0006-Disable-zram-rule-for-now.patch
Patch7: 0007-Create-mount-path-with-755-rights.patch
Patch8: 0008-Make-it-possible-to-format-from-another-seat.-Fixes-.patch
Patch9: 0009-Make-it-possible-to-unlock-from-another-seat.patch
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gobject-introspection-1.0)
......@@ -109,6 +110,7 @@ dynamic library, which provides access to the udisksd daemon.
%patch6 -p1 -b .udev-disable-zram
%patch7 -p1 -b .mount-path-rights
%patch8 -p1 -b .format-another-seat
%patch9 -p1 -b .unlock-another-seat
# Disable gtk-doc
sed -i 's/SUBDIRS = data udisks src tools modules po doc/SUBDIRS = data udisks src tools modules po/' Makefile.am
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment