Source: apparmor
Version: 2.11.1-3
Severity: wishlist
Dear Maintainer,
Please consider the following patch to support usrmerge: (in debdiff form)
diff -Nru apparmor-2.11.1/debian/changelog apparmor-2.11.1/debian/changelog
--- apparmor-2.11.1/debian/changelog 2017-11-05 20:26:47.000000000 +0100
+++ apparmor-2.11.1/debian/changelog 2017-11-16 19:57:03.000000000 +0100
@@ -1,3 +1,11 @@
+apparmor (2.11.1-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/apparmor-support-usrmerge.patch:
+ - add support for usrmerge in tests
+
+ -- Héctor Orón Martínez <zu...@debian.org> Thu, 16 Nov 2017 19:57:03 +0100
+
apparmor (2.11.1-3) unstable; urgency=medium
* upstream-commit-92752f5-support-Google-Chrome-beta.patch:
diff -Nru apparmor-2.11.1/debian/patches/apparmor-support-usrmerge.patch
apparmor-2.11.1/debian/patches/apparmor-support-usrmerge.patch
--- apparmor-2.11.1/debian/patches/apparmor-support-usrmerge.patch
1970-01-01 01:00:00.000000000 +0100
+++ apparmor-2.11.1/debian/patches/apparmor-support-usrmerge.patch
2017-11-16 19:56:45.000000000 +0100
@@ -0,0 +1,136 @@
+From: Héctor Orón Martínez
+ <hector.o...@collabora.co.uk>
+Date: Thu, 16 Nov 2017 18:11:43 +0100
+Subject: apparmor: support usrmerge
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: base64
+
+---
+ parser/tst/simple_tests/file/allow/ok_append_1.sd | 10 +++++-----
+ .../file/allow/ok_embedded_spaces_1.sd | 2 +-
+ .../file/allow/ok_embedded_spaces_2.sd | 2 +-
+ parser/tst/simple_tests/file/allow/ok_lock_1.sd | 22 +++++++++++-----------
+ parser/tst/simple_tests/file/allow/ok_mmap_1.sd | 10 +++++-----
+ parser/tst/simple_tests/file/allow/ok_mmap_2.sd | 12 ++++++------
+ 6 files changed, 29 insertions(+), 29 deletions(-)
+
+diff --git a/parser/tst/simple_tests/file/allow/ok_append_1.sd
b/parser/tst/simple_tests/file/allow/ok_append_1.sd
+index b1085d2..c924614 100644
+--- a/parser/tst/simple_tests/file/allow/ok_append_1.sd
++++ b/parser/tst/simple_tests/file/allow/ok_append_1.sd
+@@ -4,11 +4,11 @@
+ # vim:syntax=apparmor
+ #
+ /usr/bin/foo {
+- allow /bin/cat a,
+- allow /bin/true ra,
+- allow /bin/false ma,
++ allow /{usr/,}bin/cat a,
++ allow /{usr/,}bin/true ra,
++ allow /{usr/,}bin/false ma,
+ allow /lib/libc.so la,
+- allow /bin/less ixa,
+- allow /bin/more pxa,
++ allow /{usr/,}bin/less ixa,
++ allow /{usr/,}bin/more pxa,
+ allow /a uxa,
+ }
+diff --git a/parser/tst/simple_tests/file/allow/ok_embedded_spaces_1.sd
b/parser/tst/simple_tests/file/allow/ok_embedded_spaces_1.sd
+index 345e482..4269d5e 100644
+--- a/parser/tst/simple_tests/file/allow/ok_embedded_spaces_1.sd
++++ b/parser/tst/simple_tests/file/allow/ok_embedded_spaces_1.sd
+@@ -2,6 +2,6 @@
+ #=EXRESULT PASS
+ # vim:syntax=apparmor
+
+-/bin/foo {
++/{usr/,}bin/foo {
+ allow "/abc\ def" r,
+ }
+diff --git a/parser/tst/simple_tests/file/allow/ok_embedded_spaces_2.sd
b/parser/tst/simple_tests/file/allow/ok_embedded_spaces_2.sd
+index 3334f8d..1aba4c9 100644
+--- a/parser/tst/simple_tests/file/allow/ok_embedded_spaces_2.sd
++++ b/parser/tst/simple_tests/file/allow/ok_embedded_spaces_2.sd
+@@ -2,6 +2,6 @@
+ #=EXRESULT PASS
+ # vim:syntax=apparmor
+
+-/bin/foo {
++/{usr/,}bin/foo {
+ allow "/abc def" r,
+ }
+diff --git a/parser/tst/simple_tests/file/allow/ok_lock_1.sd
b/parser/tst/simple_tests/file/allow/ok_lock_1.sd
+index defed2f..b1d57c5 100644
+--- a/parser/tst/simple_tests/file/allow/ok_lock_1.sd
++++ b/parser/tst/simple_tests/file/allow/ok_lock_1.sd
+@@ -4,15 +4,15 @@
+ # vim:syntax=apparmor
+ #
+ /usr/bin/foo {
+- allow /bin/a k,
+- allow /bin/b rk,
+- allow /bin/c wk,
+- allow /bin/d ak,
+- allow /bin/e lk,
+- allow /bin/e mk,
+- allow /bin/f pxk,
+- allow /bin/g Pxk,
+- allow /bin/h ixk,
+- allow /bin/i uxk,
+- allow /bin/j Uxk,
++ allow /{usr/,}bin/a k,
++ allow /{usr/,}bin/b rk,
++ allow /{usr/,}bin/c wk,
++ allow /{usr/,}bin/d ak,
++ allow /{usr/,}bin/e lk,
++ allow /{usr/,}bin/e mk,
++ allow /{usr/,}bin/f pxk,
++ allow /{usr/,}bin/g Pxk,
++ allow /{usr/,}bin/h ixk,
++ allow /{usr/,}bin/i uxk,
++ allow /{usr/,}bin/j Uxk,
+ }
+diff --git a/parser/tst/simple_tests/file/allow/ok_mmap_1.sd
b/parser/tst/simple_tests/file/allow/ok_mmap_1.sd
+index c02d76b..ae1df0f 100644
+--- a/parser/tst/simple_tests/file/allow/ok_mmap_1.sd
++++ b/parser/tst/simple_tests/file/allow/ok_mmap_1.sd
+@@ -4,10 +4,10 @@
+ # vim:syntax=apparmor
+ #
+ /usr/bin/foo {
+- allow /bin/cat mix,
+- allow /bin/true mpx,
+- allow /bin/false mux,
++ allow /{usr/,}bin/cat mix,
++ allow /{usr/,}bin/true mpx,
++ allow /{usr/,}bin/false mux,
+ allow /lib/libc.so rwlm,
+- allow /bin/less mUx,
+- allow /bin/more mPx,
++ allow /{usr/,}bin/less mUx,
++ allow /{usr/,}bin/more mPx,
+ }
+diff --git a/parser/tst/simple_tests/file/allow/ok_mmap_2.sd
b/parser/tst/simple_tests/file/allow/ok_mmap_2.sd
+index 6d40c3b..3dc56a7 100644
+--- a/parser/tst/simple_tests/file/allow/ok_mmap_2.sd
++++ b/parser/tst/simple_tests/file/allow/ok_mmap_2.sd
+@@ -4,12 +4,12 @@
+ # vim:syntax=apparmor
+ #
+ /usr/bin/foo {
+- allow /bin/cat rm,
+- allow /bin/cat ix,
+- allow /bin/true px,
+- allow /bin/true m,
+- allow /bin/false m,
+- allow /bin/false ux,
++ allow /{usr/,}bin/cat rm,
++ allow /{usr/,}bin/cat ix,
++ allow /{usr/,}bin/true px,
++ allow /{usr/,}bin/true m,
++ allow /{usr/,}bin/false m,
++ allow /{usr/,}bin/false ux,
+ allow /lib/libc.so rwl,
+ allow /lib/libc.so m,
+ }
diff -Nru apparmor-2.11.1/debian/patches/series
apparmor-2.11.1/debian/patches/series
--- apparmor-2.11.1/debian/patches/series 2017-11-05 20:25:34.000000000
+0100
+++ apparmor-2.11.1/debian/patches/series 2017-11-16 19:55:27.000000000
+0100
@@ -41,3 +41,4 @@
flatpak-exports.patch
utils-logprof-python3.6.patch
utils-keep-shebang.patch
+apparmor-support-usrmerge.patch
Regards
-- System Information:
Debian Release: buster/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 4.13.0-1-amd64 (SMP w/16 CPU cores)
Locale: LANG=ca_AD.UTF-8, LC_CTYPE=ca_AD.UTF-8 (charmap=UTF-8),
LANGUAGE=ca_AD:ca (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
