[libreoffice] 01/01: git update; update/remove apparmor patch(es)

[Rene Engelhard]

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

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

commit 18ddb7ec545ed1eded5ba18014d8f4a07a3533f4
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Dec 12 19:30:41 2017 +0100

    git update; update/remove apparmor patch(es)
---
 changelog                      |  3 +--
 patches/apparmor-fixes.diff    | 29 -----------------------------
 patches/apparmor-usrmerge.diff | 32 --------------------------------
 patches/series                 |  1 -
 4 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/changelog b/changelog
index e9f68c5..4ef38bf 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,9 @@
-libreoffice (1:6.0.0~rc1~git20171211-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~rc1~git20171212-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
   * debian/patches/apparmor-usrmerge.diff: allow also /usr/bin/dash (etc.)
     - usrmerge...
-  * debian/patches/apparmor-fixes.diff: fixes to the apparmor profiles...
 
   * debian/libreoffice-common.bug-script.in: revert running aa-status;
     Might not exist and actually displaying the status needs root. People
diff --git a/patches/apparmor-fixes.diff b/patches/apparmor-fixes.diff
deleted file mode 100644
index 6b7f154..0000000
--- a/patches/apparmor-fixes.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From 48ff651c521a07e50870f39a9ab5f4cc2ad76d03 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene at debian.org>
-Date: Mon, 11 Dec 2017 19:41:12 +0100
-Subject: [PATCH] apparmor: copy xpdfimport definition into xpdfimport and
- allow "m"
-
-Dec 11 18:46:11 sid kernel: [  176.085106] audit: type=1400 audit(1513014371.237:22): apparmor="DENIED" operation="file_mmap" profile="libreoffice-xpdfimport" name="/usr/lib/libreoffice/program/xpdfimport" pid=1511 comm="xpdfimport" requested_mask="m" denied_mask="m" fsuid=1000 ouid=0
-
-Change-Id: I31ddb412d1dd95506a00d22739a33d2e6770ba23
----
- sysui/desktop/apparmor/program.xpdfimport | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sysui/desktop/apparmor/program.xpdfimport b/sysui/desktop/apparmor/program.xpdfimport
-index 3934c0a04006..aa76e85505fe 100644
---- a/sysui/desktop/apparmor/program.xpdfimport
-+++ b/sysui/desktop/apparmor/program.xpdfimport
-@@ -22,6 +22,8 @@ profile libreoffice-xpdfimport INSTDIR-program/xpdfimport {
-   /usr/share/libreoffice/share/config/* r,
-   owner @{HOME}/.config/libreoffice{,dev}/?/user/uno_packages/cache/log.txt rw,
- 
-+  INSTDIR-program/xpdfimport        pxm,
-+
-   #Uncomment for build testing (should be one directory <- of instdir)
-   #/mnt/store/git/libo/**    r,
- }
--- 
-2.11.0
-
diff --git a/patches/apparmor-usrmerge.diff b/patches/apparmor-usrmerge.diff
index 835074a..6ddc92e 100644
--- a/patches/apparmor-usrmerge.diff
+++ b/patches/apparmor-usrmerge.diff
@@ -12,22 +12,6 @@ diff --git a/sysui/desktop/apparmor/program.senddoc b/sysui/desktop/apparmor/pro
 index 42c2740f7012..c08e78390a4f 100644
 --- a/sysui/desktop/apparmor/program.senddoc
 +++ b/sysui/desktop/apparmor/program.senddoc
-@@ -1,12 +1,14 @@
- # ------------------------------------------------------------------
- #
- #    Copyright (C) 2016 Canonical Ltd.
-+#    Copyright (C) 2017 Software in the Public Interest, Inc.
- #
- #    This Source Code Form is subject to the terms of the Mozilla Public
- #    License, v. 2.0. If a copy of the MPL was not distributed with this
- #    file, You can obtain one at http://mozilla.org/MPL/2.0/.
- #
--#    Author: Bryan Quigley <bryan.quigley at canonical.com>
-+#    Authors: Bryan Quigley <bryan.quigley at canonical.com>
-+#             Rene Engelhard <rene at debian.org>
- #
- # ------------------------------------------------------------------
- 
 @@ -17,14 +19,14 @@ profile libreoffice-senddoc INSTDIR-/usr/lib{,32,64}/libreoffice/program/senddoc
  
    owner /tmp/lu**       rw,    #makes files like luRRRRR.tmp/lubRRRR.tmp where R is random
@@ -53,22 +37,6 @@ diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor
 index b4baeab8f5ee..426a04875e13 100644
 --- a/sysui/desktop/apparmor/program.soffice.bin
 +++ b/sysui/desktop/apparmor/program.soffice.bin
-@@ -1,6 +1,7 @@
- # ------------------------------------------------------------------
- #
- #    Copyright (C) 2016 Canonical Ltd.
-+#    Copyright (C) 2017 Software in the Public Interest, Inc.
- #
- #    This Source Code Form is subject to the terms of the Mozilla Public
- #    License, v. 2.0. If a copy of the MPL was not distributed with this
-@@ -8,6 +9,7 @@
- #
- #    Authors: Jonathan Davies <jonathan.davies at canonical.com>
- #             Bryan Quigley <bryan.quigley at canonical.com>
-+#             Rene Engelhard <rene at debian.org>
- #
- # ------------------------------------------------------------------
- 
 @@ -105,9 +107,9 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
    # bluetooth send to
    network bluetooth,
diff --git a/patches/series b/patches/series
index ad10c56..6f63c9a 100644
--- a/patches/series
+++ b/patches/series
@@ -36,4 +36,3 @@ tdf108963-test.diff
 apparmor-complain.diff
 sal-fix-kfreebsd-build.diff
 apparmor-usrmerge.diff
-apparmor-fixes.diff

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