Commit a8d03981 authored by Raine Makelainen's avatar Raine Makelainen

Merge branch 'jb41482' into 'master'

[udisks2] Create mount path with 755 rights. Fixes JB#41482

See merge request !6
parents 191ebd41 4c6898e0
From 2ed93f6461ef8c5facfec54e1f8a8d87a91612f9 Mon Sep 17 00:00:00 2001
From 4f1e2b1bdfe5886ebdb6c830dbe9f966cd1e0d8a 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/6] Disable libblockdev-mdraid and part support from source
Subject: [PATCH 1/7] Disable libblockdev-mdraid and part support from source
tree
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
......
From 8287ff270ce821ed03c4a89951cfe972a0332188 Mon Sep 17 00:00:00 2001
From e1ae99dfbabce1cd04b0f8dccbaf12650331d496 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/6] Drop smartata dependencies
Subject: [PATCH 2/7] Drop smartata dependencies
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From 3c65269d65fb0ea11b3480185e3bf13f325e8912 Mon Sep 17 00:00:00 2001
From 0dd3182fe80c7bdc28b2be5ab9b23782f015e1f3 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/6] Loosen up mount/unmount rights
Subject: [PATCH 3/7] Loosen up mount/unmount rights
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From 1f3f452e09a5c3054f075bd9abdb74886d025346 Mon Sep 17 00:00:00 2001
From a8f138d9bcaeb24e955b88b42b94de85af41112a 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/6] Introduce mount-sd service that is executed as nemo
Subject: [PATCH 4/7] Introduce mount-sd service that is executed as nemo
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From fd532c0758787d5f57e65ef3ad9520b550b173af Mon Sep 17 00:00:00 2001
From b878553a1f192deef54ea184c4aef3f55b3ab569 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/6] Add udev rule for the sda drives
Subject: [PATCH 5/7] Add udev rule for the sda drives
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From 124b3423084437bd62838f4c496f9a05419aab31 Mon Sep 17 00:00:00 2001
From d1845fbea73382a985d1b1eac5a8bd16d684d928 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/6] Disable zram rule for now
Subject: [PATCH 6/7] Disable zram rule for now
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From c4d624a4aad1733d11f5d7fd81b39f37b528352d 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/7] Create mount path with 755 rights
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
src/udiskslinuxfilesystem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
index c91a1279..6366bd76 100644
--- a/src/udiskslinuxfilesystem.c
+++ b/src/udiskslinuxfilesystem.c
@@ -939,7 +939,7 @@ calculate_mount_point (UDisksDaemon *daemon,
}
/* Then create the per-user MOUNT_BASE/$USER */
#ifdef HAVE_ACL
- if (g_mkdir (mount_dir, 0700) != 0 && errno != EEXIST)
+ if (g_mkdir (mount_dir, 0755) != 0 && errno != EEXIST)
#else
if (g_mkdir (mount_dir, 0750) != 0 && errno != EEXIST)
#endif
--
2.14.3
......@@ -20,6 +20,7 @@ Patch3: 0003-Loosen-up-mount-unmount-rights.patch
Patch4: 0004-Introduce-mount-sd-service-that-is-executed-as-nemo.patch
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
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gobject-introspection-1.0)
......@@ -105,6 +106,7 @@ dynamic library, which provides access to the udisksd daemon.
%patch4 -p1 -b .mount-sd-service
%patch5 -p1 -b .udev-rules-for-sda
%patch6 -p1 -b .udev-disable-zram
%patch7 -p1 -b .mount-path-rights
# 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