[libreoffice] 01/01: set soffice.bin/oosplash apparmor profiles to compalain; stop installing disable symlinks

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 722c77ba929ae5dee90ca9070a98b294de8ad61f
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Wed Nov 29 20:38:36 2017 +0100

    set soffice.bin/oosplash apparmor profiles to compalain; stop installing disable symlinks
---
 changelog                      |  8 +++++++-
 patches/apparmor-complain.diff | 26 ++++++++++++++++++++++++++
 patches/series                 |  1 +
 rules                          |  2 +-
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 85435a5..827e665 100644
--- a/changelog
+++ b/changelog
@@ -1,11 +1,17 @@
-libreoffice (1:5.4.4~rc1~git20171119-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.4~rc1~git20171129-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
+  * debian/patches/apparmor-complain.diff: set complain mode for oosplash
+    and soffice.bin profiles
+
   * debian/libreoffice-common.{triggers,postinst}.in,
     debian/shell-lib-lool.sh: add trigger updating LOOLs systemplate
   * debian/libreoffice-common.triggers.in: switch to interest-noawait triggers
 
+  * debian/rules:
+    - stop installing disabled symlinks for apparmor
+
  -- Rene Engelhard <rene at debian.org>  Fri, 20 Oct 2017 13:40:01 +0000
 
 libreoffice (1:5.4.3-3) unstable; urgency=medium
diff --git a/patches/apparmor-complain.diff b/patches/apparmor-complain.diff
new file mode 100644
index 0000000..ab4b294
--- /dev/null
+++ b/patches/apparmor-complain.diff
@@ -0,0 +1,26 @@
+diff --git a/sysui/desktop/apparmor/program.oosplash b/sysui/desktop/apparmor/program.oosplash
+index fef54b7ee384..9dde31a63615 100644
+--- a/sysui/desktop/apparmor/program.oosplash
++++ b/sysui/desktop/apparmor/program.oosplash
+@@ -12,7 +12,7 @@
+ 
+ #include <tunables/global>
+ 
+-profile libreoffice-oopslash INSTDIR-program/oosplash {
++profile libreoffice-oopslash INSTDIR-program/oosplash flags=(complain) {
+   #include <abstractions/base>
+ 
+   /etc/libreoffice/                     r,
+diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
+index b4baeab8f5ee..7861c9eac9bd 100644
+--- a/sysui/desktop/apparmor/program.soffice.bin
++++ b/sysui/desktop/apparmor/program.soffice.bin
+@@ -60,7 +60,7 @@
+ 
+ #include <tunables/global>
+ 
+-profile libreoffice-soffice INSTDIR-program/soffice.bin {
++profile libreoffice-soffice INSTDIR-program/soffice.bin flags=(complain) {
+   #include <abstractions/private-files-strict>
+ 
+   #include <abstractions/audio>
diff --git a/patches/series b/patches/series
index b4e1f79..52dade8 100644
--- a/patches/series
+++ b/patches/series
@@ -37,3 +37,4 @@ icu-no-icu-config.diff
 ww8export-HAVE_MORE_FONTS.diff
 java9.diff
 icu-60.diff
+apparmor-complain.diff
diff --git a/rules b/rules
index a47b21e..44cf53e 100755
--- a/rules
+++ b/rules
@@ -532,7 +532,7 @@ BUILD_PPC64EL=y
 BUILD_ARM64=y
 SYSTEM_STUFF += gpgmepp
 INSTALL_APPARMOR_PROFILES=y
-ENABLE_APPARMOR_PROFILES=n
+ENABLE_APPARMOR_PROFILES=y
 
 # Default flags to pass to configure
 CONFIGURE_FLAGS= \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git