summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbertagaz <bertagaz@ptitcanardnoir.org>2018-02-20 11:44:49 +0100
committerbertagaz <bertagaz@ptitcanardnoir.org>2018-02-20 11:44:49 +0100
commit94be75abd4875b3a8cd1a52b72c8620dd135fb83 (patch)
tree1619eb5481cf6002ba66f0efa2a00fa88e3fa197
parent9e49bc3c3be4defee6cbb755b140f64d74cc375d (diff)
parent49f7a105f189b7944701c67d9a3c28026ea4b6bc (diff)
Merge remote-tracking branch 'origin/bugfix/15029-AppArmor-cups-backends' into devel
Fix-committed: #15029
-rw-r--r--config/chroot_local-patches/apparmor-adjust-cupsd-profile.diff17
1 files changed, 7 insertions, 10 deletions
diff --git a/config/chroot_local-patches/apparmor-adjust-cupsd-profile.diff b/config/chroot_local-patches/apparmor-adjust-cupsd-profile.diff
index 9d46be8..b9be743 100644
--- a/config/chroot_local-patches/apparmor-adjust-cupsd-profile.diff
+++ b/config/chroot_local-patches/apparmor-adjust-cupsd-profile.diff
@@ -1,5 +1,5 @@
---- a/etc/apparmor.d/usr.sbin.cupsd 2017-01-18 13:06:44.000000000 +0000
-+++ b/etc/apparmor.d/usr.sbin.cupsd 2017-01-30 12:21:27.499144568 +0000
+--- a/etc/apparmor.d.orig/usr.sbin.cupsd 2017-01-31 07:00:49.000000000 +0000
++++ b/etc/apparmor.d/usr.sbin.cupsd 2017-12-09 11:35:09.514218451 +0000
@@ -4,6 +4,8 @@
#include <tunables/global>
@@ -35,18 +35,15 @@
/{usr/,}sbin/* ixr,
/usr/lib/** rm,
-@@ -80,7 +83,10 @@
- /usr/lib/cups/backend/bluetooth ixr,
+@@ -81,6 +84,7 @@
/usr/lib/cups/backend/dnssd ixr,
/usr/lib/cups/backend/http ixr,
-+ /usr/lib/cups/backend/https ixr,
/usr/lib/cups/backend/ipp ixr,
+ /usr/lib/cups/backend/ipp[0-9][0-9] ixr,
-+ /usr/lib/cups/backend/ipps ixr,
/usr/lib/cups/backend/lpd ixr,
/usr/lib/cups/backend/parallel ixr,
/usr/lib/cups/backend/serial ixr,
-@@ -92,7 +98,13 @@
+@@ -92,7 +96,13 @@
/usr/lib/cups/backend/cups-pdf Px,
# third party backends get no restrictions as they often need high
# privileges and this is beyond our control
@@ -61,7 +58,7 @@
/usr/lib/cups/cgi-bin/* ixr,
/usr/lib/cups/daemon/* ixr,
-@@ -117,8 +129,13 @@
+@@ -117,8 +127,13 @@
/var/cache/cups/** rwk,
/var/log/cups/ rw,
/var/log/cups/* rw,
@@ -75,7 +72,7 @@
# third-party printer drivers; no known structure here
/opt/** rix,
-@@ -131,7 +148,7 @@
+@@ -131,7 +146,7 @@
/etc/krb5.conf r,
deny /etc/krb5.conf w,
/etc/krb5.keytab rk,
@@ -84,7 +81,7 @@
/tmp/krb5cc* k,
# likewise authentication
-@@ -184,7 +201,7 @@
+@@ -184,7 +199,7 @@
/{usr/,}bin/bash ixr,
/{usr/,}bin/cp ixr,
/etc/papersize r,