From a8c35deb1aa75d789ac7a0ab010b809ad9f6f853eb8c3311f90b6a3ee069186a Mon Sep 17 00:00:00 2001
From: Christian Boltz <suse-beta@cboltz.de>
Date: Sun, 13 Jan 2013 14:11:59 +0000
Subject: [PATCH] Accepting request 148267 from home:cboltz

- update abstractions/mysql with correct paths and add MariaDB paths
  (bnc#798183)

OBS-URL: https://build.opensuse.org/request/show/148267
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=29
---
 apparmor-abstractions-mysql-path.diff | 21 +++++++++++++++++++++
 apparmor.changes                      |  6 ++++++
 apparmor.spec                         |  4 ++++
 3 files changed, 31 insertions(+)
 create mode 100644 apparmor-abstractions-mysql-path.diff

diff --git a/apparmor-abstractions-mysql-path.diff b/apparmor-abstractions-mysql-path.diff
new file mode 100644
index 0000000..1336b4b
--- /dev/null
+++ b/apparmor-abstractions-mysql-path.diff
@@ -0,0 +1,21 @@
+=== modified file 'profiles/apparmor.d/abstractions/mysql'
+--- profiles/apparmor.d/abstractions/mysql	2010-12-20 20:29:10 +0000
++++ profiles/apparmor.d/abstractions/mysql	2013-01-11 21:50:19 +0000
+@@ -1,6 +1,7 @@
+ # ------------------------------------------------------------------
+ #
+ #    Copyright (C) 2002-2006 Novell/SUSE
++#    Copyright (C) 2013 Christian Boltz
+ #
+ #    This program is free software; you can redistribute it and/or
+ #    modify it under the terms of version 2 of the GNU General Public
+@@ -9,5 +10,6 @@
+ # ------------------------------------------------------------------
+ 
+    /var/lib/mysql/mysql.sock rw,
+-   /usr/share/mysql/charsets/ r,
+-   /usr/share/mysql/charsets/*.xml r,
++   /{var/,}run/mysql/mysql.sock rw,
++   /usr/share/{mysql,mysql-community-server,mariadb}/charsets/ r,
++   /usr/share/{mysql,mysql-community-server,mariadb}/charsets/*.xml r,
+
diff --git a/apparmor.changes b/apparmor.changes
index 9e41548..6402848 100644
--- a/apparmor.changes
+++ b/apparmor.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jan 13 13:46:01 UTC 2013 - opensuse@cboltz.de
+
+- update abstractions/mysql with correct paths and add MariaDB paths
+  (bnc#798183)
+
 -------------------------------------------------------------------
 Thu Jan 10 10:57:40 UTC 2013 - opensuse@cboltz.de
 
diff --git a/apparmor.spec b/apparmor.spec
index 98c745f..2ad2ee4 100644
--- a/apparmor.spec
+++ b/apparmor.spec
@@ -65,6 +65,9 @@ Patch1:         apparmor-enable-profile-cache.diff
 # include autogenerated profile sniplet for samba shares (bnc#688040)
 Patch2:         apparmor-samba-include-permissions-for-shares.diff
 
+# changed paths for MySQL, add MariaDB support (bnc#798183, commited upstream 2013-01-13, trunk r2104, 2.8 branch r2070)
+Patch3:         apparmor-abstractions-mysql-path.diff
+
 # split a long string in AppArmor.pm. Not accepted upstream because they want a solution without hardcoded width.
 Patch5:         apparmor-utils-string-split
 
@@ -407,6 +410,7 @@ SubDomain.
 %setup -q
 %patch1 -p1
 %patch2 -p0
+%patch3 -p0
 %patch5 -p1
 %patch12 -p1