[libreoffice] 02/02: install the apparmor profiles disabled for now (closes: #882597)

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit d1d1e52502a27856178611c5398105f930ae5309
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Nov 25 14:05:14 2017 +0100

    install the apparmor profiles disabled for now (closes: #882597)
---
 changelog |  1 +
 rules     | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index d180600..00ebc1c 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,7 @@ libreoffice (1:5.4.3-3) UNRELEASED; urgency=medium
       $(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for
       --disable-dependency-tracking
     - enable missed sr-Latn but merge into -sr
+    - install the apparmor profiles disabled for now (closes: #882597)
   * debian/control.in:
     - clean up mozilla suggests to just firefox-esr | thunderbird | firefox
     - add versions to openjdk-{7,8}-jre-headless conflicts now that they are
diff --git a/rules b/rules
index 77ef437..35e0c47 100755
--- a/rules
+++ b/rules
@@ -532,6 +532,7 @@ BUILD_PPC64EL=y
 BUILD_ARM64=y
 SYSTEM_STUFF += gpgmepp
 INSTALL_APPARMOR_PROFILES=y
+ENABLE_APPARMOR_PROFILES=n
 
 # Default flags to pass to configure
 CONFIGURE_FLAGS= \
@@ -3256,6 +3257,15 @@ ifeq "$(INSTALL_APPARMOR_PROFILES)" "y"
 	mkdir -p $(PKGDIR)-common/etc/apparmor.d
 	./sysui/desktop/share/apparmor.sh /$(OODIR)/ sysui/desktop/apparmor/ \
 			$(PKGDIR)-common/etc/apparmor.d/ false
+  ifneq "$(ENABLE_APPARMOR_PROFILES)" "y"
+	# disable the apparmor files per default
+	mkdir -p $(PKGDIR)-common/etc/apparmor.d/disable
+	cd $(PKGDIR)-common/etc/apparmor.d/disable
+	for i in oosplash senddoc soffice.bin xpdfimport; do \
+		ln -sf /etc/apparmor.d/usr.lib.libreoffice.program.$$i \
+			usr.lib.libreoffice.program.$$i; \
+	done
+  endif
 endif
 
 	touch $@
@@ -3588,10 +3598,9 @@ endif
 	dh_fixperms -i
 	dh_icons -i
 ifeq "$(INSTALL_APPARMOR_PROFILES)" "y"
-	dh_apparmor -plibreoffice-common --profile-name=usr.lib.libreoffice.program.oosplash
-	dh_apparmor -plibreoffice-common --profile-name=usr.lib.libreoffice.program.senddoc
-	dh_apparmor -plibreoffice-common --profile-name=usr.lib.libreoffice.program.soffice.bin
-	dh_apparmor -plibreoffice-common --profile-name=usr.lib.libreoffice.program.xpdfimport
+	for i in oosplash senddoc soffice.bin xpdfimport; do \
+		dh_apparmor -plibreoffice-common --profile-name=usr.lib.libreoffice.program.$$i; \
+	done
 endif
 	dh_compress -i -X.py -X.mk -X.sxd -X.xcd.sample
 	dh_strip_nondeterminism -i

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