[libreoffice] 03/04: change BRAND_BASE_DIR in fundamentalrc so that we don't get /usr/lib/libreoffice/program/../program/xpdfimport calls. we know the path.

[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 7af1d9d5b79cc2947106804034d9ecde3ba05d43
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Dec 7 23:36:03 2017 +0100

    change BRAND_BASE_DIR in fundamentalrc so that we don't get /usr/lib/libreoffice/program/../program/xpdfimport calls. we know the path.
---
 changelog | 3 +++
 rules     | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/changelog b/changelog
index 5c87974..2fa4078 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,9 @@ libreoffice (1:5.4.4~rc1-1) UNRELEASED; urgency=medium
     - stop installing disabled symlinks for apparmor (closes: #883800)
     - actually install the OpenSymbol fontconfig snippet into a 
       /etc/fonts.d/30_opensymbol.conf
+    - change BRAND_BASE_DIR in fundamentalrc so that we don't get
+      /usr/lib/libreoffice/program/../program/xpdfimport calls. We know
+      the path and the apparmor profile doesn't allow this
   * debian/libreoffice-common.bug-script.in: run aa-status
 
   [ intrigeri ]
diff --git a/rules b/rules
index 9a0053b..7a4ef1b 100755
--- a/rules
+++ b/rules
@@ -3287,6 +3287,12 @@ ifeq "$(INSTALL_APPARMOR_PROFILES)" "y"
   endif
 endif
 
+	# fix fundamentalrc to not cause 
+	# /usr/lib/libreoffice/program/../program/xpdfimport calls
+	# we know the path and the apparmor profiles disallow this...
+	sed -i "s,^BRAND_BASE_DIR=.*,BRAND_BASE_DIR=file:///$(OODIR)," \
+		$(PKGDIR)-common/$(OODIR)/program/fundamentalrc
+
 	touch $@
 
 binary-arch: $(STAMP_DIR)/binary-arch

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