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

Accepting request 660709 from home:cboltz

Browse Source 
- netconfig: write resolv.conf to /run with link to /etc (fate#325872,
  boo#1097370) [patch apparmor-nameservice-resolv-conf-link.patch]

OBS-URL: https://build.opensuse.org/request/show/660709
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=225
This commit is contained in:
Christian Boltz 2018-12-22 15:48:06 +00:00 committed by Git OBS Bridge
parent a50868b293
commit 018cfefbdb
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apparmor-nameservice-resolv-conf-link.patch Normal file
View File

@ -0,0 +1,11 @@
--- apparmor-2.13/profiles/apparmor.d/abstractions/nameservice
+++ apparmor-2.13/profiles/apparmor.d/abstractions/nameservice
@@ -39,7 +39,7 @@
/etc/resolv.conf r,
# On systems where /etc/resolv.conf is managed programmatically, it is
# a symlink to /{,var/}run/(whatever program is managing it)/resolv.conf.
- /{,var/}run/{resolvconf,NetworkManager,systemd/resolve,connman}/resolv.conf r,
+ /{,var/}run/{resolvconf,NetworkManager,systemd/resolve,connman,netconfig}/resolv.conf r,
/etc/resolvconf/run/resolv.conf r,
/{,var/}run/systemd/resolve/stub-resolv.conf r,

6
apparmor.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Dec 21 13:41:32 UTC 2018 - mt@suse.de
- netconfig: write resolv.conf to /run with link to /etc (fate#325872,
boo#1097370) [patch apparmor-nameservice-resolv-conf-link.patch]
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 21 12:59:00 UTC 2018 - Christian Boltz <suse-beta@cboltz.de> Fri Dec 21 12:59:00 UTC 2018 - Christian Boltz <suse-beta@cboltz.de>

4
apparmor.spec
View File

@ -62,6 +62,9 @@ Patch5: ruby-2_0-mkmf-destdir.patch
# bug 906858 - confine lessopen.sh (submitted upstream 2014-12-21) # bug 906858 - confine lessopen.sh (submitted upstream 2014-12-21)
Patch7: apparmor-lessopen-profile.patch Patch7: apparmor-lessopen-profile.patch
# fate#325872 netconfig: write resolv.conf to /run with link to /etc - submitted upstream 2018-12-22 https://gitlab.com/apparmor/apparmor/merge_requests/294
Patch8: apparmor-nameservice-resolv-conf-link.patch
PreReq: sed PreReq: sed
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define apparmor_bin_prefix /lib/apparmor %define apparmor_bin_prefix /lib/apparmor
@ -349,6 +352,7 @@ SubDomain.
%patch2 %patch2
%patch5 -p1 %patch5 -p1
%patch7 %patch7
%patch8 -p1
%build %build
export SUSE_ASNEEDED=0 export SUSE_ASNEEDED=0