[udisks2] Allow Filesystem TakeOwnership operation. Contributes to JB…

…#42801
sailfishos · Aug 31, 2018 · 5a2ad31 · 5a2ad31
1 parent da76ecc
commit 5a2ad31
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 20 deletions.
diff --git a/rpm/0001-Disable-libblockdev-mdraid-and-part-support-from-sou.patch b/rpm/0001-Disable-libblockdev-mdraid-and-part-support-from-sou.patch
@@ -1,7 +1,7 @@
-From 1416329a39c62b7b94148128f218a4ea731be29f Mon Sep 17 00:00:00 2001
+From 5f20bf84e724921febe4afecfdaf4e94fd03e1ab 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/9] Disable libblockdev-mdraid and part support from source
+Subject: [PATCH 01/10] Disable libblockdev-mdraid and part support from source
  tree
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
@@ -314,7 +314,7 @@ index 8014664e..ef772320 100644
 
  /* ---------------------------------------------------------------------------------------------------- */
 diff --git a/src/udiskslinuxpartition.c b/src/udiskslinuxpartition.c
-index 5fa20482..70eb6477 100644
+index 5fa20482..7260c00f 100644
 --- a/src/udiskslinuxpartition.c
 +++ b/src/udiskslinuxpartition.c
 @@ -18,6 +18,10 @@

diff --git a/rpm/0002-Drop-smartata-dependencies.patch b/rpm/0002-Drop-smartata-dependencies.patch
@@ -1,7 +1,7 @@
-From cae22acf2f1cb3165c10bc9b5e63b15d1f866ee0 Mon Sep 17 00:00:00 2001
+From d554f05c411acf49d76fe76ffcbf277e21f003b9 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/9] Drop smartata dependencies
+Subject: [PATCH 02/10] Drop smartata dependencies
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
 ---

diff --git a/rpm/0003-Loosen-up-mount-unmount-rights.patch b/rpm/0003-Loosen-up-mount-unmount-rights.patch
@@ -1,7 +1,7 @@
-From 26f930ba9300ec99a277c87a3cafe116da13b417 Mon Sep 17 00:00:00 2001
+From 36b1d7d8b40e9ef3ad6403f4a21a60d84b23705a 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/9] Loosen up mount/unmount rights
+Subject: [PATCH 03/10] Loosen up mount/unmount rights
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
 ---

diff --git a/rpm/0004-Introduce-mount-sd-service-that-is-executed-as-nemo.patch b/rpm/0004-Introduce-mount-sd-service-that-is-executed-as-nemo.patch
@@ -1,7 +1,7 @@
-From 34b034aefe6a1f1954402ba68da61d4e3385f736 Mon Sep 17 00:00:00 2001
+From 83ddf467ef60d46e80381b58bffd150a9c82ab6b 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/9] Introduce mount-sd service that is executed as nemo
+Subject: [PATCH 04/10] Introduce mount-sd service that is executed as nemo
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
 ---
@@ -40,7 +40,7 @@ index ddf9e3d6..4c77ee56 100644
  systemdservicedir       = $(systemdsystemunitdir)
 diff --git a/data/mount-sd@.service b/data/mount-sd@.service
 new file mode 100644
-index 00000000..a981e303
+index 00000000..c44deebd
 --- /dev/null
 +++ b/data/mount-sd@.service
 @@ -0,0 +1,12 @@

diff --git a/rpm/0005-Add-udev-rule-for-the-sda-drives.patch b/rpm/0005-Add-udev-rule-for-the-sda-drives.patch
@@ -1,7 +1,7 @@
-From 009396002ac2592de4d5b6a7b7a9da36a321e272 Mon Sep 17 00:00:00 2001
+From 1632618a32f1b6bb0956e97e9977740609a6d80c 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/9] Add udev rule for the sda drives
+Subject: [PATCH 05/10] Add udev rule for the sda drives
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
 ---

diff --git a/rpm/0006-Disable-zram-rule-for-now.patch b/rpm/0006-Disable-zram-rule-for-now.patch
@@ -1,7 +1,7 @@
-From 6cc6f7315474139959932ef477e74d29332d494d Mon Sep 17 00:00:00 2001
+From 544e2a83c95263912917c9bc3fe63e1b7ee6eff2 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/9] Disable zram rule for now
+Subject: [PATCH 06/10] Disable zram rule for now
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
 ---

diff --git a/rpm/0007-Create-mount-path-with-755-rights.patch b/rpm/0007-Create-mount-path-with-755-rights.patch
@@ -1,7 +1,7 @@
-From cd86396dde456b4090856a0455ad68999bf07492 Mon Sep 17 00:00:00 2001
+From 000a8c7e6b9a72259e2c48314b16cbb671d9b1c3 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/9] Create mount path with 755 rights
+Subject: [PATCH 07/10] Create mount path with 755 rights
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
 ---

diff --git a/rpm/0008-Make-it-possible-to-format-from-another-seat.-Fixes-.patch b/rpm/0008-Make-it-possible-to-format-from-another-seat.-Fixes-.patch
@@ -1,7 +1,7 @@
-From 5775a7f9008849338d3da27dc93a92e6b72dfb84 Mon Sep 17 00:00:00 2001
+From 7f3e0dff659efc0393bcea52964c785570a56e18 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/9] Make it possible to format from another seat. Fixes
+Subject: [PATCH 08/10] Make it possible to format from another seat. Fixes
  JB#42414
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>

diff --git a/rpm/0009-Make-it-possible-to-unlock-from-another-seat.patch b/rpm/0009-Make-it-possible-to-unlock-from-another-seat.patch
@@ -1,7 +1,7 @@
-From a1e98f930a3906b6a5725aa5928bd61195d98cce Mon Sep 17 00:00:00 2001
+From 6c779f9f6d40c424f86047ff9e2fd00d2c9f95de 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
+Subject: [PATCH 09/10] Make it possible to unlock from another seat
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
 ---

diff --git a/rpm/0010-Allow-Filesystem-TakeOwnership-operation.-Contribute.patch b/rpm/0010-Allow-Filesystem-TakeOwnership-operation.-Contribute.patch
@@ -0,0 +1,27 @@
+From aa9a1cba46ab2084a71621a4b56eec9aae224a0f Mon Sep 17 00:00:00 2001
+From: Chris Adams <chris.adams@jollamobile.com>
+Date: Fri, 31 Aug 2018 11:35:34 +1000
+Subject: [PATCH 10/10] Allow Filesystem TakeOwnership operation. Contributes
+ to JB#42801
+
+Signed-off-by: Chris Adams <chris.adams@jolla.com>
+---
+ data/org.freedesktop.UDisks2.policy.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.freedesktop.UDisks2.policy.in b/data/org.freedesktop.UDisks2.policy.in
+index acc15f48..026d86b2 100644
+--- a/data/org.freedesktop.UDisks2.policy.in
++++ b/data/org.freedesktop.UDisks2.policy.in
+@@ -78,7 +78,7 @@
+     <defaults>
+       <allow_any>auth_admin</allow_any>
+       <allow_inactive>auth_admin</allow_inactive>
+-      <allow_active>auth_admin_keep</allow_active>
++      <allow_active>yes</allow_active>
+     </defaults>
+   </action>
+
+-- 
+2.17.1
+
diff --git a/rpm/udisks2.spec b/rpm/udisks2.spec
@@ -23,6 +23,7 @@ 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
+Patch10: 0010-Allow-Filesystem-TakeOwnership-operation.-Contribute.patch
 
 BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
 BuildRequires: pkgconfig(gobject-introspection-1.0)
@@ -112,6 +113,7 @@ dynamic library, which provides access to the udisksd daemon.
 %patch7 -p1 -b .mount-path-rights
 %patch8 -p1 -b .format-another-seat
 %patch9 -p1 -b .unlock-another-seat
+%patch10 -p1 -b .filesystem-take-ownership
 
 %build
 # Disable gtk-doc