From 10529a6db704a62d9b66b768d3a5a29097b26636 Mon Sep 17 00:00:00 2001 From: Georgia Garcia Date: Wed, 19 Jul 2023 17:36:46 -0300 Subject: [PATCH] Revert "policy: pin policy to 4.0 abi for dev" This reverts commit 460c3d5b59d020d363ffcf9f61787850ecc0c3e0. The 4.0 ABI was pinned for the development cycle but it can cause in-tree uses of parser/parser.conf to fail if it cannot find the 4.0 file in /etc/apparmor.d/abi/. Signed-off-by: Georgia Garcia --- parser/parser.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/parser/parser.conf b/parser/parser.conf index 0d80fe43e..3909aee49 100644 --- a/parser/parser.conf +++ b/parser/parser.conf @@ -77,7 +77,3 @@ ## Pin older policy to the 5.4 kernel abi + out of tree network and af_unix #policy-features=/etc/apparmor.d/abi/kernel-5.4-outoftree-network - -## TO BE reverted - this is only for 4.0 dev cycle -## pin policy that doesn't have an abi to 4.0 -policy-features=/etc/apparmor.d/abi/4.0