Merge ~paelzer/ubuntu/+source/apparmor:lp-1895967-apparmor-in-containers into ubuntu/+source/apparmor:ubuntu/groovy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4276/+packages
Bug: https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/1895967

FYI
This is not for the server Team to review/upload but for the security Team to take over from here for an upload the way they prefer to maintain changes and uploads.

[Christian Ehrhardt  (paelzer)]

Got merged \o/

[Jamie Strandboge (jdstrand)]

Sorry I didn't see the MP and I uploaded with a different changelog. Thank you so much for the analysis and this MP! :)

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 45c49aa..10a6987 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apparmor (3.0.0~beta1-0ubuntu6) groovy; urgency=medium
+
+  * Drop old patch lp1824812.patch which is superseded and even conflicting
+    with 61c27d88 "Fix and simplify setting SFS_MOUNTPOINT" that is in
+    apparmor 3.0.0 (LP: #1895967). This will fix apparmor in containers
+    that support stacking.
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 22 Sep 2020 16:03:15 +0200
+
 apparmor (3.0.0~beta1-0ubuntu5) groovy; urgency=medium
 
   [ John Johansen ]
diff --git a/debian/patches/lp1824812.patch b/debian/patches/lp1824812.patch
deleted file mode 100644
index 847db01..0000000
--- a/debian/patches/lp1824812.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Jamie Strandboge <[e-mail]>
-Description: set SFS_MOUNTPOINT in is_container_with_internal_policy() since it
- is sometimes called before is_apparmor_loaded()
-Bug: https://launchpad.net/bugs/1824812
-Forwarded: yes
-
----
- parser/rc.apparmor.functions |    1 +
- 1 file changed, 1 insertion(+)
-
---- apparmor-3.0.0-beta1.orig/parser/rc.apparmor.functions
-+++ apparmor-3.0.0-beta1/parser/rc.apparmor.functions
-@@ -82,6 +82,7 @@
- is_container_with_internal_policy() {
- 	# this function is sometimes called independently of
- 	# is_apparmor_loaded(), so also define this here.
-+	SFS_MOUNTPOINT="${SECURITYFS}/${MODULE}"
- 	local ns_stacked_path="${SFS_MOUNTPOINT}/.ns_stacked"
- 	local ns_name_path="${SFS_MOUNTPOINT}/.ns_name"
- 	local ns_stacked
diff --git a/debian/patches/series b/debian/patches/series
index b95bf3b..1247a7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-lp1824812.patch
 parser-fix_cap_match.patch
 policy-provide-example-and-base-abi-to-pin-pre-3.0-p.patch
 parser-add-abi-warning-flags.patch