From 130681d7f5908d7b580cc1f5867eb6c6ea32044cec53591a93d84a8f562219ef Mon Sep 17 00:00:00 2001
From: Christian Boltz <suse-beta@cboltz.de>
Date: Mon, 23 Apr 2018 16:00:03 +0000
Subject: [PATCH] Accepting request 600114 from home:cboltz

- add fix-apparmor-systemd-perms.diff:
  fix permissions of /lib/apparmor/apparmor.systemd (boo#1090545)

OBS-URL: https://build.opensuse.org/request/show/600114
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=211
---
 apparmor.changes                |  6 ++++++
 apparmor.spec                   |  4 ++++
 fix-apparmor-systemd-perms.diff | 13 +++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 fix-apparmor-systemd-perms.diff

diff --git a/apparmor.changes b/apparmor.changes
index b4e4851..1199be4 100644
--- a/apparmor.changes
+++ b/apparmor.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 23 15:27:55 UTC 2018 - suse-beta@cboltz.de
+
+- add fix-apparmor-systemd-perms.diff - fix permissions of
+  /lib/apparmor/apparmor.systemd (boo#1090545)
+
 -------------------------------------------------------------------
 Thu Apr 19 22:13:40 UTC 2018 - suse-beta@cboltz.de
 
diff --git a/apparmor.spec b/apparmor.spec
index 428eab0..fa458f8 100644
--- a/apparmor.spec
+++ b/apparmor.spec
@@ -65,6 +65,9 @@ Patch7:         apparmor-lessopen-profile.patch
 # install aa-teardown to /usr/sbin, not /sbin (merged upstream 2018-04-15 https://gitlab.com/apparmor/apparmor/merge_requests/97)
 Patch8:         aa-teardown-path.diff
 
+# fix permissions of apparmor.systemd (boo#1090545)
+Patch9:         fix-apparmor-systemd-perms.diff
+
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define apparmor_bin_prefix /lib/apparmor
@@ -353,6 +356,7 @@ SubDomain.
 %patch5 -p1
 %patch7
 %patch8
+%patch9 -p1
 
 %build
 export SUSE_ASNEEDED=0
diff --git a/fix-apparmor-systemd-perms.diff b/fix-apparmor-systemd-perms.diff
new file mode 100644
index 0000000..3c5c8cc
--- /dev/null
+++ b/fix-apparmor-systemd-perms.diff
@@ -0,0 +1,13 @@
+diff --git a/parser/Makefile b/parser/Makefile
+index 70fb27fe..04996fb7 100644
+--- a/parser/Makefile
++++ b/parser/Makefile
+@@ -383,7 +383,7 @@ install-indep: indep
+ install-systemd:
+ 	install -m 755 -d $(SYSTEMD_UNIT_DIR)
+ 	install -m 644 apparmor.service $(SYSTEMD_UNIT_DIR)
+-	install -m 644 apparmor.systemd $(APPARMOR_BIN_PREFIX)
++	install -m 755 apparmor.systemd $(APPARMOR_BIN_PREFIX)
+ 	install -m 755 -d $(DESTDIR)/usr/sbin
+ 	install -m 755 aa-teardown $(DESTDIR)/usr/sbin
+