From b3768dce8da9842f1585c767c112ce406df3dac8 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sat, 3 Dec 2016 14:45:56 +0100 Subject: [PATCH] abstractions/base: turn merged-/usr-enabled ix rules into Pix, to avoid conflicts with other profiles. Example conflicts that are solved by this commit include: abstractions/ubuntu-helpers: /usr/{,local/}lib*/{,**/}* Pixr, --- profiles/apparmor.d/abstractions/base | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/profiles/apparmor.d/abstractions/base b/profiles/apparmor.d/abstractions/base index 9d7c54c85..db7494bd7 100644 --- a/profiles/apparmor.d/abstractions/base +++ b/profiles/apparmor.d/abstractions/base @@ -48,11 +48,11 @@ # available everywhere /etc/ld.so.cache mr, /etc/ld.so.preload r, - /{usr/,}lib{,32,64}/ld{,32,64}-*.so mrix, - /{usr/,}lib/@{multiarch}/ld{,32,64}-*.so mrix, - /{usr/,}lib/tls/i686/{cmov,nosegneg}/ld-*.so mrix, - /{usr/,}lib/i386-linux-gnu/tls/i686/{cmov,nosegneg}/ld-*.so mrix, - /opt/*-linux-uclibc/lib/ld-uClibc*so* mrix, + /{usr/,}lib{,32,64}/ld{,32,64}-*.so mrPix, + /{usr/,}lib/@{multiarch}/ld{,32,64}-*.so mrPix, + /{usr/,}lib/tls/i686/{cmov,nosegneg}/ld-*.so mrPix, + /{usr/,}lib/i386-linux-gnu/tls/i686/{cmov,nosegneg}/ld-*.so mrPix, + /opt/*-linux-uclibc/lib/ld-uClibc*so* mrPix, # we might as well allow everything to use common libraries /{usr/,}lib{,32,64}/** r,