[libreoffice] 02/03: generate and install apparmor profiles

[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 68626c7125f4a50d1b52091f7358c17890f35ce4
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Aug 5 17:34:46 2017 +0200

    generate and install apparmor profiles
---
 changelog |  3 ++-
 control   |  1 +
 rules     | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 7457605..cfe99f9 100644
--- a/changelog
+++ b/changelog
@@ -6,8 +6,9 @@ libreoffice (1:5.4.0-2) UNRELEASED; urgency=medium
       from it
     - set UNO_LIBS_DBG_ROOT to fix gdb helper installation for uno-libs3 again
       and make -core-dbgsym recommends uno-libs3-dbgsym (same reason as above)
+    - generate and install apparmor profiles
 
- -- Rene Engelhard <rene at debian.org>  Tue, 25 Jul 2017 22:30:57 +0200
+ -- Rene Engelhard <rene at debian.org>  Sat, 05 Aug 2017 14:15:19 +0000
 
 libreoffice (1:5.4.0-1) unstable; urgency=medium
 
diff --git a/control b/control
index 89fd121..6769f7e 100644
--- a/control
+++ b/control
@@ -19,6 +19,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                default-jdk (>= 2:1.7-52.1) [kfreebsd-any],
                default-jdk (>= 2:1.8-55) [sparc64],
                default-libmysqlclient-dev,
+               dh-apparmor,
                dh-python,
                dpkg-dev (>= 1.18.2~),
                fastjar,
diff --git a/rules b/rules
index 7c28bfc..85dc060 100755
--- a/rules
+++ b/rules
@@ -549,6 +549,7 @@ SYSTEM_STUFF += glm
 BUILD_PPC64EL=y
 BUILD_ARM64=y
 SYSTEM_STUFF += gpgmepp
+INSTALL_APPARMOR_PROFILES=y
 
 # Default flags to pass to configure
 CONFIGURE_FLAGS= \
@@ -1256,6 +1257,10 @@ ifeq "$(ENABLE_GDRIVE)" "y"
   CONFIGURE_FLAGS += --with-gdrive-client-id=$(GOOGLE_DEFAULT_CLIENT_ID) --with-gdrive-client-secret=$(GOOGLE_DEFAULT_CLIENT_SECRET)
 endif
 
+ifeq "$(INSTALL_APPARMOR_PROFILES)" "y"
+  BUILD_DEPS += , dh-apparmor
+endif
+
 ifeq "$(ENABLE_EOT)" "y"
  	CONFIGURE_FLAGS += --enable-eot
  ifneq (,$(filter libeot, $(SYSTEM_STUFF)))
@@ -3220,6 +3225,12 @@ ifeq "$(ENABLE_JAVA)" "y"
 	ln -sf /usr/share/java/unoil.jar $(PKGDIR)-java-common/usr/share/libreoffice/program/classes/unoil.jar
 endif
 
+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
+endif
+
 	touch $@
 
 binary-arch: $(STAMP_DIR)/binary-arch
@@ -3532,6 +3543,12 @@ endif
 	dh_link -i
 	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
+endif
 	dh_compress -i -X.py -X.mk -X.sxd -X.xcd.sample
 	dh_installdeb -i
 ifeq "$(ENABLE_JAVA)" "y"

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