summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorBryan Quigley <gquigs@gmail.com>2016-07-06 17:46:47 -0400
committerCaolán McNamara <caolanm@redhat.com>2016-07-07 11:57:34 +0000
commita8c2d1c9fa60ca85a0474429a579e74384317aea (patch)
tree179aac2b8a6e38aece95ae5e7b41d8cf457d7cb5 /sysui
parent68585e3045e07c1b8d269d3e8d428d7a38646dbb (diff)
AppArmor fixes to fix tests
This lets you run LO build tests while that LO is confined by apparmor. It assumes that you can have RW access to wherever LO actually needs it in the instdir. This obviously doesn't superseed file permissions so you can still make the binaries read-only, etc. Change-Id: I313459cdf115f4fda5f621b2a0c9a1da022ef525 Reviewed-on: https://gerrit.libreoffice.org/26987 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sysui')
-rw-r--r--sysui/desktop/apparmor/program.soffice.bin11
-rw-r--r--sysui/desktop/apparmor/program.xpdfimport3
2 files changed, 8 insertions, 6 deletions
diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
index 285b499f4dee..b4baeab8f5ee 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -120,13 +120,12 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
/usr/lib{,32,64}/jvm/ r,
/usr/lib{,32,64}/jvm/** r,
- INSTDIR-** ra,
- INSTDIR-**.so rm,
- INSTDIR-share/uno_packages/cache/* rw,
- INSTDIR-program/soffice.bin rmix,
- INSTDIR-program/xpdfimport rpx,
+ INSTDIR-** rw,
+ INSTDIR-**.so m,
+ INSTDIR-program/soffice.bin mix,
+ INSTDIR-program/xpdfimport px,
+ INSTDIR-program/senddoc px,
/usr/bin/xdg-open rPUx,
- INSTDIR-program/senddoc rpx,
/usr/share/java/**.jar r,
/usr/share/hunspell/ r,
diff --git a/sysui/desktop/apparmor/program.xpdfimport b/sysui/desktop/apparmor/program.xpdfimport
index ba0e1d2cf247..3934c0a04006 100644
--- a/sysui/desktop/apparmor/program.xpdfimport
+++ b/sysui/desktop/apparmor/program.xpdfimport
@@ -21,5 +21,8 @@ profile libreoffice-xpdfimport INSTDIR-program/xpdfimport {
/usr/share/poppler/** r,
/usr/share/libreoffice/share/config/* r,
owner @{HOME}/.config/libreoffice{,dev}/?/user/uno_packages/cache/log.txt rw,
+
+ #Uncomment for build testing (should be one directory <- of instdir)
+ #/mnt/store/git/libo/** r,
}