diff --git a/apparmor-profiles-usrmove-abstractions-bash.diff b/apparmor-profiles-usrmove-abstractions-bash.diff new file mode 100644 index 0000000..c245d95 --- /dev/null +++ b/apparmor-profiles-usrmove-abstractions-bash.diff @@ -0,0 +1,11 @@ +=== modified file 'profiles/apparmor.d/abstractions/bash' +--- profiles/apparmor.d/abstractions/bash 2010-12-20 20:29:10 +0000 ++++ profiles/apparmor.d/abstractions/bash 2012-08-05 15:46:47 +0000 +@@ -40,5 +40,5 @@ + + # run out of /etc/bash.bashrc + /etc/DIR_COLORS r, +- /bin/ls mix, ++ /{usr/,}bin/ls mix, + /usr/bin/dircolors mix, + diff --git a/apparmor.changes b/apparmor.changes index db3191b..b4704de 100644 --- a/apparmor.changes +++ b/apparmor.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Aug 5 16:05:44 UTC 2012 - opensuse@cboltz.de + +- abstractions/bash: update /bin/ls to also match /usr/bin/ls (usrMove) + ------------------------------------------------------------------- Mon Jul 30 08:17:01 UTC 2012 - werner@suse.de diff --git a/apparmor.spec b/apparmor.spec index 57421ce..dfd3c03 100644 --- a/apparmor.spec +++ b/apparmor.spec @@ -65,6 +65,9 @@ Patch2: apparmor-samba-include-permissions-for-shares.diff # usrMove /bin/ping -> /usr/bin/ping (sent upstream 2012-07-07) Patch3: apparmor-profiles-usrmove-bin-ping.diff +# usrMove /bin/ls -> /usr/bin/ls in abstractions/bash (sent upstream 2012-08-05) +Patch4: apparmor-profiles-usrmove-abstractions-bash.diff + # split a long string in AppArmor.pm. Not accepted upstream because they want a solution without hardcoded width. Patch5: apparmor-utils-string-split @@ -406,6 +409,7 @@ SubDomain. %patch1 -p1 %patch2 -p0 %patch3 -p0 +%patch4 -p0 %patch5 -p1 %patch12 -p1