--- Begin Message ---
Package: cups-daemon
Version: 2.2.1-2
Severity: normal
Tags: patch
User: pkg-apparmor-team@lists.alioth.debian.org
Usertags: usrmerge
X-Debbugs-Cc: pkg-apparmor-team@lists.alioth.debian.org
Hi,
the attached commit makes the included AppArmor profile compatible
with merged-/usr. Please consider applying it.
Not that it is needed, regardless of what happens on #846828.
Cheers!
--
intrigeri
>From e8f3f081993f23233b9be68935bc1abde84ca283 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@debian.org>
Date: Sat, 3 Dec 2016 19:10:19 +0000
Subject: [PATCH] AppArmor profile: support merged-/usr.
---
debian/local/apparmor-profile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/debian/local/apparmor-profile b/debian/local/apparmor-profile
index e0c7e40..7ef397d 100644
--- a/debian/local/apparmor-profile
+++ b/debian/local/apparmor-profile
@@ -42,9 +42,9 @@
network econet dgram,
network ash dgram,
- /bin/bash ixr,
- /bin/dash ixr,
- /bin/hostname ixr,
+ /{usr/,}bin/bash ixr,
+ /{usr/,}bin/dash ixr,
+ /{usr/,}bin/hostname ixr,
/dev/lp* rw,
deny /dev/tty rw, # silence noise
/dev/ttyS* rw,
@@ -72,8 +72,8 @@
/sys/** r,
/usr/bin/* ixr,
/usr/sbin/* ixr,
- /bin/* ixr,
- /sbin/* ixr,
+ /{usr/,}bin/* ixr,
+ /{usr/,}sbin/* ixr,
/usr/lib/** rm,
# backends which come with CUPS can be confined
@@ -180,9 +180,9 @@
@{PROC}/*/auxv r,
- /bin/dash ixr,
- /bin/bash ixr,
- /bin/cp ixr,
+ /{usr/,}bin/dash ixr,
+ /{usr/,}bin/bash ixr,
+ /{usr/,}bin/cp ixr,
/etc/papersize r,
/etc/cups/cups-pdf.conf r,
@{HOME}/PDF/ rw,
--
2.10.2
--- End Message ---
--- Begin Message ---
Source: cups
Source-Version: 2.2.1-4
We believe that the bug you reported is fixed in the latest version of
cups, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 846868@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Didier Raboud <odyx@debian.org> (supplier of updated cups package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Tue, 20 Dec 2016 08:58:02 +0100
Source: cups
Binary: libcups2 libcupsimage2 libcupscgi1 libcupsmime1 libcupsppdc1 cups cups-core-drivers cups-daemon cups-client cups-ipp-utils libcups2-dev libcupsimage2-dev cups-bsd cups-common cups-server-common cups-ppdc
Architecture: source
Version: 2.2.1-4
Distribution: unstable
Urgency: medium
Maintainer: Debian Printing Team <debian-printing@lists.debian.org>
Changed-By: Didier Raboud <odyx@debian.org>
Description:
cups - Common UNIX Printing System(tm) - PPD/driver support, web interfa
cups-bsd - Common UNIX Printing System(tm) - BSD commands
cups-client - Common UNIX Printing System(tm) - client programs (SysV)
cups-common - Common UNIX Printing System(tm) - common files
cups-core-drivers - Common UNIX Printing System(tm) - PPD-less printing
cups-daemon - Common UNIX Printing System(tm) - daemon
cups-ipp-utils - Common UNIX Printing System(tm) - IPP developer/admin utilities
cups-ppdc - Common UNIX Printing System(tm) - PPD manipulation utilities
cups-server-common - Common UNIX Printing System(tm) - server common files
libcups2 - Common UNIX Printing System(tm) - Core library
libcups2-dev - Common UNIX Printing System(tm) - Development files CUPS library
libcupscgi1 - Common UNIX Printing System(tm) - CGI library
libcupsimage2 - Common UNIX Printing System(tm) - Raster image library
libcupsimage2-dev - Common UNIX Printing System(tm) - Development files CUPS image li
libcupsmime1 - Common UNIX Printing System(tm) - MIME library
libcupsppdc1 - Common UNIX Printing System(tm) - PPD manipulation library
Closes: 846868 848718
Changes:
cups (2.2.1-4) unstable; urgency=medium
.
[ Didier Raboud ]
* Cleanup the cups debconf questions from 'parallel' leftovers
(Closes: #848718)
.
[ intrigeri ]
* AppArmor profile: support merged-/usr (Closes: #846868)
Checksums-Sha1:
c69bcdee14a67d34d61ca72ae3b79efbc9d573a9 3396 cups_2.2.1-4.dsc
46eca2d818e2c6dc931900d94dc5e33f6ae2189d 357896 cups_2.2.1-4.debian.tar.xz
Checksums-Sha256:
f7973f48b7f541a205ae10447dc2441f4eea5acdbbfa5754b71bcfaf8bf9c401 3396 cups_2.2.1-4.dsc
1fa692546c96abed5f332964c1c0d78a59ed9f2d1bd559b02a8444a76daeb010 357896 cups_2.2.1-4.debian.tar.xz
Files:
dff7eb34e76114626b17cfa47274babb 3396 net optional cups_2.2.1-4.dsc
e3f25a11453391090db0c69190f4fdc8 357896 net optional cups_2.2.1-4.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
iQGzBAEBCgAdFiEEe+WPIRpjNw1/GSB7i8+nHsoWNFUFAlhY5v4ACgkQi8+nHsoW
NFVc+gv/Sbe9WMBBDIA99Nf+oQ8ZSi3ZEC//3bbb20XzVS8VZTqogZpCBpwosVvT
7ydl+22vnFuFPnMKYUae1cTPKjl8n5zADJHhGWk5t0ctnPYYGl6/yyfjuQw9/rNQ
8qnThDMDU/OtT2qplqS+690wmZDqvcy1XMU59IyTcD/GSE8YMBT49jMsRfVdx6Ih
N2i+uDHBhJAai6cRSWYWHkBOmnPRm+uq/humiTeSDUWEU/dkNMLcfkDYRx4ZmYpA
eFp1af/0eI/NNK+r2qwjIdwTkEK9Gjzk3T1SogFx3RI5EkwM0P6jRL4849gZR1Pz
Z6dXWzKWfCH87+fWq9K8c/gcpr+kBfLKja99pyMKMtCoXOM+poLN1/YIXMMIb/cN
P820aIhXRFofl1FNdv/O0ez7wTUJ+Y3F09gUHy/dAAXCSKD5J6nEKkfv/i9WZxEX
l2Xd3pPnjNG4Q6I2rTic9F4zOMVfptlFMKq+tHoKIf78otY+lVVu42Jfdikb4jUM
4hdKAb9c
=V2qj
-----END PGP SIGNATURE-----
--- End Message ---