diff options
| author | Bryan Quigley <gquigs@gmail.com> | 2015-09-29 15:47:46 -0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-30 10:11:52 +0000 |
| commit | 3de49e44c517f3482bc2a7989399a31443d07fdd (patch) | |
| tree | 1d8f1cd5e0b4822037cb5719d94ba7361c5615ac /sysui/desktop | |
| parent | 24b60f65a5dbf7f8f7e54c0ffd1210dc4ba8363d (diff) | |
Update apparmor profiles for 5.0/5.1
Java's position was moved. Add workaround instructions
to use with debs built upstream (not ubuntu/debian version)
Change-Id: Ia42426aabbcfabb2ca46d811d8b742e23b33d4b6
Reviewed-on: https://gerrit.libreoffice.org/18999
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/apparmor/program.oosplash | 2 | ||||
| -rw-r--r-- | sysui/desktop/apparmor/program.soffice.bin | 2 | ||||
| -rwxr-xr-x | sysui/desktop/share/apparmor.sh | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sysui/desktop/apparmor/program.oosplash b/sysui/desktop/apparmor/program.oosplash index 80d6f588a82c..99ba58eb6cf2 100644 --- a/sysui/desktop/apparmor/program.oosplash +++ b/sysui/desktop/apparmor/program.oosplash @@ -23,7 +23,7 @@ profile libreoffice-oopslash INSTDIR-program/oosplash { /usr/lib{,32,64}/ure/bin/javaldx Cx, /usr/share/libreoffice/program/* r, INSTDIR-program/soffice.bin rmPUx, - INSTDIR-ure/bin/javaldx rmPUx, + INSTDIR-program/javaldx rmPUx, owner @{HOME}/.Xauthority r, owner @{HOME}/.config/libreoffice{,dev}/?/user/uno_packages/cache/log.txt rw, unix peer=(addr=@/tmp/.ICE-unix/* label=unconfined), diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin index 1ae2cc64d86c..c74fcc64d947 100644 --- a/sysui/desktop/apparmor/program.soffice.bin +++ b/sysui/desktop/apparmor/program.soffice.bin @@ -127,8 +127,6 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin { INSTDIR-program/xpdfimport rPx, INSTDIR-program/open-url rPx, INSTDIR-program/senddoc rPx, - /usr/lib{,32,64}/ure/ r, - /usr/lib{,32,64}/ure/** rm, /usr/share/java/**.jar r, /usr/share/hunspell/ r, diff --git a/sysui/desktop/share/apparmor.sh b/sysui/desktop/share/apparmor.sh index 848c113f61f8..88baff83755e 100755 --- a/sysui/desktop/share/apparmor.sh +++ b/sysui/desktop/share/apparmor.sh @@ -19,9 +19,13 @@ PROFILESFROM=$2 #Where the profile files are INSTALLTO=$3 #Where should the apparmor profiles live (to be be linked to) INSTALL=$4 #True means try to run sudo to link (doesn't reload profiles) -#For example to get this to work on Ubuntu 15.04 with stock LibreOffice: +#For example to get this to work on Ubuntu 15.10 with stock LibreOffice: # ./sysui/desktop/share/apparmor.sh /usr/lib/libreoffice/ sysui/desktop/apparmor/ /mnt/store/git/libo/instdir/apparmor-testing/ true +#For example on Ubuntu 15.10, with built debs from the LibreOffice website +# At the current time you need run /opt/libreofficedev5.1/program/soffice.bin directly - splash screen doesn't work +# ./sysui/desktop/share/apparmor.sh /opt/libreofficedev5.1/ sysui/desktop/apparmor/ /mnt/store/git/libo/instdir/apparmor-testing/ true + mkdir -p $INSTALLTO #Need to convert / to . for profile names |