From 69de0489af4c0be6a8b97567b4c8651f7dfa67e632c63064609dd51949e8afcc Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Mon, 15 Apr 2019 08:28:34 +0000
Subject: [PATCH] Accepting request 694063 from
 home:cboltz:branches:games:tools

- update murmurd AppArmor profile
  - update bash path for usrMerge (boo#1132350)
  - use abstractions/openssl instead of a rule for openssl.cnf

OBS-URL: https://build.opensuse.org/request/show/694063
OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=101
---
 mumble.changes  | 7 +++++++
 mumble.spec     | 2 +-
 murmur.apparmor | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mumble.changes b/mumble.changes
index 54b30d6..bbfa725 100644
--- a/mumble.changes
+++ b/mumble.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Apr 14 15:34:43 UTC 2019 - Christian Boltz <suse-beta@cboltz.de>
+
+- update murmurd AppArmor profile
+  - update bash path for usrMerge (boo#1132350)
+  - use abstractions/openssl instead of a rule for openssl.cnf
+
 -------------------------------------------------------------------
 Fri Oct 19 04:29:34 UTC 2018 - Marguerite Su <i@marguerite.su>
 
diff --git a/mumble.spec b/mumble.spec
index 0e33a75..b6f3cda 100644
--- a/mumble.spec
+++ b/mumble.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mumble
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/murmur.apparmor b/murmur.apparmor
index e062800..08e52b3 100644
--- a/murmur.apparmor
+++ b/murmur.apparmor
@@ -4,10 +4,10 @@
 /usr/sbin/murmurd {
   #include <abstractions/base>
   #include <abstractions/nameservice>
+  #include <abstractions/openssl>
   #include <abstractions/ssl_certs>
   #include <abstractions/user-tmp>
 
-  /etc/ssl/openssl.cnf r,
   /etc/ssl/certs/** r,
   deny /usr/share/ssl/ r,
   deny /usr/share/ssl/** r,
@@ -37,7 +37,7 @@
     #include <abstractions/base>
     #include <abstractions/consoles>
 
-    /bin/bash r,
+    /{usr/,}bin/bash r,
     /proc/meminfo r,
     /usr/bin/getopt rix,
     /usr/bin/head rix,