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

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

Browse Source 
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
This commit is contained in:
Christian Boltz 2014-01-17 17:13:27 +00:00 committed by Git OBS Bridge
parent 5d66f079f8
commit 645ce4a678
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apparmor-2.8.2-nm-dnsmasq-config.patch Normal file
View File

@ -0,0 +1,13 @@
Index: profiles/apparmor.d/usr.sbin.dnsmasq
===================================================================
--- profiles/apparmor.d/usr.sbin.dnsmasq.orig
+++ profiles/apparmor.d/usr.sbin.dnsmasq
@@ -54,6 +54,8 @@
# NetworkManager integration
/{,var/}run/nm-dns-dnsmasq.conf r,
/{,var/}run/sendsigs.omit.d/*dnsmasq.pid w,
+ # new dnsmasq config path (as of 2012-11-05)
+ /{,var/}run/NetworkManager/dnsmasq.conf r,
# Site-specific additions and overrides. See local/README for details.
#include <local/usr.sbin.dnsmasq>

8
apparmor.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jan 17 16:29:54 UTC 2014 - develop7@develop7.info
- add apparmor-2.8.2-nm-dnsmasq-config.patch - allow dnsmasq read config
created by recent NetworkManager (see
http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=d82669d3fdaa7ec70ef1b64941c101ac810c394b
for update details)
-------------------------------------------------------------------
Sat Jan 4 12:04:25 UTC 2014 - opensuse@cboltz.de

8
apparmor.spec
View File

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