summaryrefslogtreecommitdiff
path: root/sysui/desktop/apparmor
diff options
context:
space:
mode:
authorBryan Quigley <gquigs@gmail.com>2016-01-06 15:11:09 -0500
committerJan-Marek Glogowski <glogow@fbihome.de>2016-03-02 16:19:27 +0000
commitcafd3adcbaa6714dc3674788401cf0f58fbbcb5e (patch)
tree869887be67d97d6bd0a838ffeea1d42109a8c5ae /sysui/desktop/apparmor
parent3fd13a33670e8526bfe32bd4af83315cb35db697 (diff)
Just use xdg-open
Remove kde4/tde/open-url.sh and have LO just use xdg-open. It's available on TDE builds as well as any recent KDE. We recently did this just for gnome-open-url and have had no reported issues. Change-Id: I4e1ee6caef368051af92023fa382b6fed9d9397e Reviewed-on: https://gerrit.libreoffice.org/21173 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'sysui/desktop/apparmor')
-rw-r--r--sysui/desktop/apparmor/program.open-url30
-rw-r--r--sysui/desktop/apparmor/program.soffice.bin2
2 files changed, 1 insertions, 31 deletions
diff --git a/sysui/desktop/apparmor/program.open-url b/sysui/desktop/apparmor/program.open-url
deleted file mode 100644
index 1d3d46638c65..000000000000
--- a/sysui/desktop/apparmor/program.open-url
+++ /dev/null
@@ -1,30 +0,0 @@
-# ------------------------------------------------------------------
-#
-# Copyright (C) 2015 Canonical Ltd.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Author: Bryan Quigley <bryan.quigley@canonical.com>
-#
-# ------------------------------------------------------------------
-
-#include <tunables/global>
-
-profile libreoffice-open-url INSTDIR-program/open-url {
- #include <abstractions/base>
- #include <abstractions/ubuntu-helpers>
-
- owner /tmp/lu** rw, #makes files like luRRRRR.tmp/lubRRRR.tmp where R is random
- #Note, usually it's lub or luc, don't know why.
- /bin/sh rmix,
- /bin/dash rmix,
- /bin/bash rmix,
- /bin/sed rmix,
- /bin/grep rmix,
- /usr/bin/xdg-open Cxr -> sanitized_helper,
- /dev/null rw,
- /usr/share/libreoffice/share/config/* r,
- owner @{HOME}/.config/libreoffice{,dev}/?/user/uno_packages/cache/log.txt rw,
-}
diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
index bbb0100698f3..e62216c8d62b 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -124,7 +124,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
INSTDIR-**.so rm,
INSTDIR-program/soffice.bin rmix,
INSTDIR-program/xpdfimport rPx,
- INSTDIR-program/open-url rPx,
+ /usr/bin/xdg-open rPUx,
INSTDIR-program/senddoc rPx,
/usr/share/java/**.jar r,