From: Olivier Tilloy <olivier.tilloy@canonical.com>
Date: Mon, 8 Jan 2018 15:59:17 +0000 (+0100)
Subject: tdf#114915 Apparmor profile update (invalid comments syntax)
X-Git-Tag: archive/raspbian/1%6.0.2-1+rpi1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=356ab3ab2ec848ba92c36650e88ea9abc4b521a4;p=libreoffice.git

tdf#114915 Apparmor profile update (invalid comments syntax)

The apparmor profile parser doesn't interpret # as a comment when on the same
line as a variable assignment. Ensure that comments are on their own line,
above the actual assignment.

Change-Id: If10bb05f11b0e9026746db2e271113f30da5cbef
Reviewed-on: https://gerrit.libreoffice.org/47605
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

Gbp-Pq: Name apparmor-profiles-comments.patch
---

diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
index 0809c0736cf..131d2af8c0f 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -23,12 +23,18 @@
 #Some obscure ones we're excluded (mostly input)
 
 #Generic
-@{libreoffice_ext} = [tT][xX][tT]  #.txt
-@{libreoffice_ext} += {,f,F}[oO][dDtT][tTsSpPbBgGfF]  #All the open document format
-@{libreoffice_ext} += [xX][mMsS][lL]  #.xml and xsl
-@{libreoffice_ext} += [pP][dD][fF]  #.pdf
-@{libreoffice_ext} += [uU][oO][fFtTsSpP]  #Unified office format
-@{libreoffice_ext} += {,x,X}[hH][tT][mM]{,l,L}  #(x)htm(l)
+#.txt
+@{libreoffice_ext} = [tT][xX][tT]
+#All the open document format
+@{libreoffice_ext} += {,f,F}[oO][dDtT][tTsSpPbBgGfF]
+#.xml and xsl
+@{libreoffice_ext} += [xX][mMsS][lL]
+#.pdf
+@{libreoffice_ext} += [pP][dD][fF]
+#Unified office format
+@{libreoffice_ext} += [uU][oO][fFtTsSpP]
+#(x)htm(l)
+@{libreoffice_ext} += {,x,X}[hH][tT][mM]{,l,L}
 
 #Images
 @{libreoffice_ext} += [jJ][pP][gG]
@@ -45,15 +51,19 @@
 
 #Calc
 @{libreoffice_ext} += [xX][lL][sSwWtT]{,x,X}
-@{libreoffice_ext} += [dD][iIbB][fF]  #.dif dbf
-@{libreoffice_ext} += [cCtT][sS][vV]  #.tsv .csv
+#.dif dbf
+@{libreoffice_ext} += [dD][iIbB][fF]
+#.tsv .csv
+@{libreoffice_ext} += [cCtT][sS][vV]
 @{libreoffice_ext} += [sS][lL][kK]
 
 #Impress/Draw
 @{libreoffice_ext} += [pP][pP][tTsS]{,x,X}
 @{libreoffice_ext} += [pP][oO][tT]{,m,M}
-@{libreoffice_ext} += [sS][wW][fF]  #Flash
-@{libreoffice_ext} += [pP][sS][dD]  #Photoshop
+#Flash
+@{libreoffice_ext} += [sS][wW][fF]
+#Photoshop
+@{libreoffice_ext} += [pP][sS][dD]
 
 #Math
 @{libreoffice_ext} += [mM][mM][lL]