From 221a8681c02379a4f2262bac85ede66b2e2b6391 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 24 Apr 2016 16:24:42 +0200 Subject: [PATCH 1/3] ubuntu-browsers abstraction: support path used by Debian's firefox-esr. --- profiles/apparmor.d/abstractions/ubuntu-browsers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers b/profiles/apparmor.d/abstractions/ubuntu-browsers index 614401acc..33e5cf667 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers @@ -30,7 +30,7 @@ # this should cover all firefox browsers and versions (including shiretoko # and abrowser) /usr/bin/firefox Cxr -> sanitized_helper, - /usr/lib/firefox*/firefox*.sh Cx -> sanitized_helper, + /usr/lib/firefox*/firefox*{,.sh} Cx -> sanitized_helper, # Iceweasel /usr/bin/iceweasel Cxr -> sanitized_helper, From fdbdf26b336e03f2339529e225529fb45f10c35e Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 24 Apr 2016 19:34:58 +0200 Subject: [PATCH 2/3] ubuntu-browsers abstraction: simplify rule. Thanks to Christian Boltz for the suggestion! --- profiles/apparmor.d/abstractions/ubuntu-browsers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers b/profiles/apparmor.d/abstractions/ubuntu-browsers index 33e5cf667..5242749ac 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers @@ -30,7 +30,7 @@ # this should cover all firefox browsers and versions (including shiretoko # and abrowser) /usr/bin/firefox Cxr -> sanitized_helper, - /usr/lib/firefox*/firefox*{,.sh} Cx -> sanitized_helper, + /usr/lib/firefox*/firefox* Cx -> sanitized_helper, # Iceweasel /usr/bin/iceweasel Cxr -> sanitized_helper, From 7c1087b20f25b21af600fafa9841d96277b61e75 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 24 Jun 2016 17:34:55 +0200 Subject: [PATCH 3/3] ubuntu-browsers abstraction: re-implement Debian's firefox-esr support in a way that does not affect other Firefox browsers. --- profiles/apparmor.d/abstractions/ubuntu-browsers | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers b/profiles/apparmor.d/abstractions/ubuntu-browsers index 5242749ac..e68b08b95 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers @@ -30,7 +30,8 @@ # this should cover all firefox browsers and versions (including shiretoko # and abrowser) /usr/bin/firefox Cxr -> sanitized_helper, - /usr/lib/firefox*/firefox* Cx -> sanitized_helper, + /usr/lib/firefox*/firefox*.sh Cx -> sanitized_helper, + /usr/lib/firefox-esr/firefox* Cx -> sanitized_helper, # Iceweasel /usr/bin/iceweasel Cxr -> sanitized_helper,