Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

many: update apparmor to 4.0.1 #14150

Merged
merged 17 commits into from
Jul 11, 2024
Merged

many: update apparmor to 4.0.1 #14150

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
70e1d20
build-aux: update vendored apparmor to 4.0.1 release
alexmurray Oct 25, 2023
21a500c
build-aux: add autoconf-archive to apparmor/build-packages
alexmurray Mar 19, 2024
3d7f8c1
build-aux: remove apparmor parser performance patch
alexmurray May 31, 2024
9054d87
build-aux: remove remote patch application logic
zyga Jul 4, 2024
8e4d4bf
build-aux: remove local patch application logic
zyga Jul 4, 2024
e00e683
cmd/configure.ac: expect apparmor 4.0.1 when building as a snap
alexmurray Oct 25, 2023
1368576
sandbox/apparmor: use apparmor 4.0 abi with vendored parser
alexmurray Oct 25, 2023
4068f94
sandbox/apparmor: add debug logging when probing parser features
alexmurray Oct 25, 2023
592758b
sandbox/apparmor: log apparmor_parser version when probing features
alexmurray Nov 10, 2023
3f176dd
tests/main: update for new vendored apparmor 4.0
alexmurray Oct 26, 2023
c52a550
Reapply "i/builtin: allow docker-support to use mqueue (#13738)" (#13…
zyga Jul 4, 2024
6ff315b
interfaces: adjust docker-support test to handle mqueue
zyga Jul 8, 2024
700f794
sandbox/apparmor: mask mqueue feature until apparmor 4.0.1
zyga Jul 10, 2024
c5df0af
sandbox/apparmor: support bundled 3.0 or 4.0 (preferred) abi
zyga Jul 10, 2024
1ec2e54
sandbox/apparmor: unify test mocking logic
zyga Jul 10, 2024
ae4c83e
sandbox/apparmor: refactor appArmorParserVersion not to clobber cmd
zyga Jul 10, 2024
93867c1
sandbox/apparmor: fix pair of typos
zyga Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions build-aux/snap/local/apparmor/af_names.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
/*
this file was generated on a Ubuntu kinetic install from the upstream
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably remove this file once we have moved to using core24 as build base. Right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a bit of an annoying part. The parser looks at the host's socket.h file to determine what kind of sockets one can create and to know their names.

If the snap is built on an old system, where the definition of old is always inaccurate. In theory we could drop it but we'd alwayd be at the risk of compiling but silently failing to understand specific network types.

apparmor-3.0.7 release tarball as follows:
this file was generated on a Ubuntu mantic install from the upstream
apparmor-4.0.1 release tarball as follows:

AA_VER=3.0.7
AA_VER=4.0.1
TARBALL_NAME="apparmor-v${AA_VER}"
wget \
"https://launchpad.net/apparmor/3.0/${AA_VER}/+download/apparmor-${AA_VER}.tar.gz"
tar xf "apparmor-${AA_VER}.tar.gz"
cd "apparmor-${AA_VER}"
"https://gitlab.com/apparmor/apparmor/-/archive/v${AA_VER}/${TARBALL_NAME}.tar.gz"
tar xf "${TARBALL_NAME}.tar.gz"
cd "${TARBALL_NAME}"
make -C parser af_names.h
cp ./parser/af_names.h <path-to-this-file>
# manually append this header

*/
#ifndef AF_UNSPEC
Expand Down
Loading
Loading