Accepting request 214262 from home:develop7:branches:security:apparmor

Fixes broken dnsmasq dns plugin in NetworkManager

OBS-URL: https://build.opensuse.org/request/show/214262
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=72

apparmor.spec

@@ -148,6 +148,9 @@ Patch21:        apparmor-utils-subdomain-compat
 # Ruby 2.0 mkmf prefixes everything with $(DESTDIR), bnc#822277, kkaempf@suse.de
 Patch22:        ruby-2_0-mkmf-destdir.patch
 
+# dnsmasq - allow to read config created by recent NetworkManager
+Patch23:        apparmor-2.8.2-nm-dnsmasq-config.patch
+
 Url:            https://launchpad.net/apparmor
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -533,6 +536,11 @@ SubDomain.
 %patch22 -p1
 %endif
 
+# affected NM is shipped since openSUSE >= 13.1
+%if 0%{?suse_version} > 1310
+%patch23
+%endif
+
 # profile for winbindd (bnc#748499, submitted upstream 2012-11-06, trunk r2078)
 test ! -e profiles/apparmor.d/usr.sbin.winbindd
 cp %{SOURCE10} profiles/apparmor.d/