summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2017-10-05 14:59:01 +0200
committeranonym <anonym@riseup.net>2017-10-05 14:59:01 +0200
commit6ae1fb24eeb9b557cd081d74dbf6d503ea11be29 (patch)
tree873b9527d40e85575d9628fe9763e7317768b2b2
parent973248a44da6220a8eeb39df4d5680bdc7d2974a (diff)
Refresh patch for version in Debian Buster.
-rw-r--r--config/chroot_local-patches/apparmor-adjust-cupsd-profile.diff22
1 files changed, 12 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..a970b04 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/usr.sbin.cupsd 2017-10-05 14:55:01.196875278 +0200
++++ b/etc/apparmor.d/usr.sbin.cupsd 2017-10-05 14:57:07.532087292 +0200
@@ -4,6 +4,8 @@
#include <tunables/global>
@@ -9,7 +9,7 @@
/usr/sbin/cupsd flags=(attach_disconnected) {
#include <abstractions/base>
#include <abstractions/bash>
-@@ -53,9 +55,10 @@
+@@ -58,9 +60,10 @@
/dev/bus/usb/ r,
/dev/bus/usb/** rw,
/dev/parport* rw,
@@ -23,7 +23,7 @@
/etc/foomatic/* r,
/etc/gai.conf r,
/etc/papersize r,
-@@ -70,9 +73,9 @@
+@@ -75,9 +78,9 @@
@{PROC}/*/auxv r,
@{PROC}/sys/crypto/** r,
/sys/** r,
@@ -35,7 +35,7 @@
/{usr/,}sbin/* ixr,
/usr/lib/** rm,
-@@ -80,7 +83,10 @@
+@@ -85,7 +88,10 @@
/usr/lib/cups/backend/bluetooth ixr,
/usr/lib/cups/backend/dnssd ixr,
/usr/lib/cups/backend/http ixr,
@@ -46,8 +46,8 @@
/usr/lib/cups/backend/lpd ixr,
/usr/lib/cups/backend/parallel ixr,
/usr/lib/cups/backend/serial ixr,
-@@ -92,7 +98,13 @@
- /usr/lib/cups/backend/cups-pdf Px,
+@@ -102,7 +108,13 @@
+
# third party backends get no restrictions as they often need high
# privileges and this is beyond our control
- /usr/lib/cups/backend/* Cx -> third_party,
@@ -61,7 +61,7 @@
/usr/lib/cups/cgi-bin/* ixr,
/usr/lib/cups/daemon/* ixr,
-@@ -117,8 +129,13 @@
+@@ -127,8 +139,13 @@
/var/cache/cups/** rwk,
/var/log/cups/ rw,
/var/log/cups/* rw,
@@ -75,7 +75,7 @@
# third-party printer drivers; no known structure here
/opt/** rix,
-@@ -131,7 +148,7 @@
+@@ -141,7 +158,7 @@
/etc/krb5.conf r,
deny /etc/krb5.conf w,
/etc/krb5.keytab rk,
@@ -84,12 +84,14 @@
/tmp/krb5cc* k,
# likewise authentication
-@@ -184,7 +201,7 @@
+@@ -197,8 +214,8 @@
/{usr/,}bin/bash ixr,
/{usr/,}bin/cp ixr,
/etc/papersize r,
- /etc/cups/cups-pdf.conf r,
+- /etc/cups/ppd/*.ppd r,
+ @{etccups}/cups-pdf.conf r,
++ @{etccups}/ppd/*.ppd r,
@{HOME}/PDF/ rw,
@{HOME}/PDF/* rw,
/usr/bin/gs ixr,