[24.0 backport] remove remaining uses of apparmor_parser version in apparmor packages #45500
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…template Commit 2e19a4d removed all other version- conditional statements from the AppArmor template, but left this one in place. These conditions were added in 8cf8924 to account for old versions of debian/ubuntu (apparmor_parser < 2.9) that lacked some options; > This allows us to use the apparmor profile we have in contrib/apparmor/ > and solves the problems where certain functions are not apparent on older > versions of apparmor_parser on debian/ubuntu. Those patches were from 2015/2016, and all currently supported distro versions should now have more current versions than that. Looking at the oldest supported versions; Ubuntu 18.04 "Bionic": apparmor_parser --version AppArmor parser version 2.12 Copyright (C) 1999-2008 Novell Inc. Copyright 2009-2012 Canonical Ltd. Debian 10 "Buster" apparmor_parser --version AppArmor parser version 2.13.2 Copyright (C) 1999-2008 Novell Inc. Copyright 2009-2018 Canonical Ltd. This patch removes the remaining conditionals. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit f445ee1) Signed-off-by: Sebastiaan van Stijn <[email protected]>
commit 7008a51 removed version-conditional rules from the template, so we no longer need the apparmor_parser Version. This patch removes the call to `aaparser.GetVersion()` Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit ecaab08) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Our templates no longer contain version-specific rules, so this function is no longer used. This patch deprecates it. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit e3e7156) Signed-off-by: Sebastiaan van Stijn <[email protected]>
rumpl
approved these changes
May 9, 2023
Member
Author
|
@neersighted @vvoland ptal 🤗 |
neersighted
approved these changes
May 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backports:
Relates to: