From a385e46085b91f26fb1e1ee6c586f55375fc8c24 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 6 Jan 2017 08:21:09 +0000
Subject: [PATCH] apt-cacher-ng, irssi, pidgin: update from the
apparmor-profiles repository at commit 392d8ab, i.e. support merged-/usr.
---
debian/README.Debian | 8 ++++----
profiles/usr.bin.irssi | 6 +++---
profiles/usr.bin.pidgin | 4 ++--
profiles/usr.sbin.apt-cacher-ng | 8 ++++----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 1de4f3b..c7e8929 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,11 +1,11 @@
Included profiles
=================
-- apt-cacher-ng: taken from the apparmor-profiles repository at revision 169.
+- apt-cacher-ng: taken from the apparmor-profiles repository at commit 392d8ab.
- GStreamer abstraction, gst_plugin_scanner named profile: taken from
the apparmor-profiles repository at revision 169.
-- irssi: taken from the apparmor-profiles repository at revision 169.
-- Pidgin: taken from the apparmor-profiles repository at revision 169.
+- irssi: taken from the apparmor-profiles repository at commit 392d8ab.
+- Pidgin: taken from the apparmor-profiles repository at commit 392d8ab.
- tcpdump: taken from Ubuntu's tcpdump 4.7.4-3ubuntu1.
- Totem: taken from the apparmor-profiles repository with merge request
https://code.launchpad.net/~intrigeri/apparmor-profiles/+git/apparmor-profiles/+merge/301461
@@ -18,4 +18,4 @@ apparmor-profiles repository
https://code.launchpad.net/~apparmor-dev/apparmor-profiles/+git/apparmor-profiles/+ref/master
- -- intrigeri <intrigeri@debian.org>, Sun, 4 Dec 2016 18:57:55 +0100
+ -- intrigeri <intrigeri@debian.org>, Fri, 6 Jan 2017 09:19:46 +0100
diff --git a/profiles/usr.bin.irssi b/profiles/usr.bin.irssi
index cf72dcd..ab9470c 100644
--- a/profiles/usr.bin.irssi
+++ b/profiles/usr.bin.irssi
@@ -14,7 +14,7 @@
/usr/share/irssi/scripts/* r,
/usr/share/ca-certificates/** r,
@{PROC}/uptime r,
- /bin/dash ix,
+ /{usr/,}bin/dash ix,
# for screen_away
#include <abstractions/wutmp>
@@ -26,11 +26,11 @@
# for /uptime
/usr/bin/gawk ix,
/usr/bin/expr ix,
- /bin/date ix,
+ /{usr/,}bin/date ix,
# for /calc
/usr/bin/bc ix,
- /bin/which ixr,
+ /{usr/,}bin/which ixr,
# config files, etc
/etc/irssi.conf r,
diff --git a/profiles/usr.bin.pidgin b/profiles/usr.bin.pidgin
index 35795ac..d9772e7 100644
--- a/profiles/usr.bin.pidgin
+++ b/profiles/usr.bin.pidgin
@@ -56,8 +56,8 @@
# owner @{HOME}/.{cache,config}/dconf/user rw,
# owner /{,var/}run/user/[0-9]*/dconf/user rwk,
- /bin/dash rix,
- /bin/which rix,
+ /{usr/,}bin/dash rix,
+ /{usr/,}bin/which rix,
# NB: the preferred browser and proxy settings must be configured
# in the GNOME preferences: this profile does not allow running
diff --git a/profiles/usr.sbin.apt-cacher-ng b/profiles/usr.sbin.apt-cacher-ng
index 5c136ae..6c9013f 100644
--- a/profiles/usr.sbin.apt-cacher-ng
+++ b/profiles/usr.sbin.apt-cacher-ng
@@ -21,10 +21,10 @@
/var/log/apt-cacher-ng/* rw,
/{,var/}run/systemd/notify w,
- /bin/dash ixr,
- /bin/ed ixr,
- /bin/red ixr,
- /bin/sed ixr,
+ /{usr/,}bin/dash ixr,
+ /{usr/,}bin/ed ixr,
+ /{usr/,}bin/red ixr,
+ /{usr/,}bin/sed ixr,
/usr/lib/apt-cacher-ng/acngtool ixr,
--
GitLab