pool/apparmor
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 148268 from security:apparmor

Browse Source 
- update abstractions/mysql with correct paths and add MariaDB paths
  (bnc#798183) (forwarded request 148267 from cboltz)

OBS-URL: https://build.opensuse.org/request/show/148268
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=44
This commit is contained in:
Stephan Kulow 2013-01-14 08:35:25 +00:00 committed by Git OBS Bridge
commit 7615c23448
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apparmor-abstractions-mysql-path.diff Normal file
View File

@ -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,

6
apparmor.changes
View File

@ -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

4
apparmor.spec
View File

@ -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