apparmor:apparmor-3.0

Last commit made on 2024-12-10
Get this branch:
git clone -b apparmor-3.0 https://git.launchpad.net/apparmor

Branch merges

Branch information

Name:
apparmor-3.0
Repository:
lp:apparmor

Recent commits

ae60878... by Christian Boltz <email address hidden>

Merge smbd: allow capability chown

This is neeed for "inherit owner = yes" in smb.conf.

From man smb.conf:

    inherit owner (S)

    The ownership of new files and directories is normally governed by
    effective uid of the connected user. This option allows the Samba
    administrator to specify that the ownership for new files and
    directories should be controlled by the ownership of the parent
    directory.

Fixes: https://bugzilla.suse.com/show_bug.cgi?id=1234327

I propose this fix for 3.x, 4.x and master.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1456
Approved-by: Ryan Lee <email address hidden>
Approved-by: John Johansen <email address hidden>
Merged-by: John Johansen <email address hidden>

(cherry picked from commit a315d89a2b0a90bab58b574b3a16ea998e6adc64)

d3050285 smbd: allow capability chown

Co-authored-by: John Johansen <email address hidden>

dc5e935... by Christian Boltz

Merge [3.0 cherry-pick] Merge utils: catch TypeError exception for binary logs

When a log like system.journal is passed on to aa-genprof, for
example, the user receives a TypeError exception: in method
'parse_record', argument 1 of type 'char *'

This patch catches that exception and displays a more meaningful
message.

Fixes: https://gitlab.com/apparmor/apparmor/-/issues/436
Signed-off-by: Georgia Garcia <email address hidden>

Closes #436
MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1354
Approved-by: Christian Boltz <email address hidden>
Merged-by: John Johansen <email address hidden>

(cherry picked from commit cb0f84e1014e0c002735381f09a929ef4dff892c)
Signed-off-by: Georgia Garcia <email address hidden>

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1392
Approved-by: Christian Boltz <email address hidden>
Merged-by: Christian Boltz <email address hidden>

e7d5937... by John Johansen <email address hidden>

Merge utils: catch TypeError exception for binary logs

When a log like system.journal is passed on to aa-genprof, for
example, the user receives a TypeError exception: in method
'parse_record', argument 1 of type 'char *'

This patch catches that exception and displays a more meaningful
message.

Fixes: https://gitlab.com/apparmor/apparmor/-/issues/436
Signed-off-by: Georgia Garcia <email address hidden>

Closes #436
MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1354
Approved-by: Christian Boltz <email address hidden>
Merged-by: John Johansen <email address hidden>

(cherry picked from commit cb0f84e1014e0c002735381f09a929ef4dff892c)
Signed-off-by: Georgia Garcia <email address hidden>

bdb650b... by Christian Boltz <email address hidden>

.gitignore: add mod_apparmor and pam_apparmor files

... that are generated during `make`

I propose this patch for 3.x..master.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1374
Approved-by: Ryan Lee <email address hidden>
Approved-by: Steve Beattie <email address hidden>
Merged-by: Steve Beattie <email address hidden>

(cherry picked from commit 347855890413cbab3eab3faf74bbcd3fe032dcb1)

2ea82b86 .gitignore: add mod_apparmor and pam_apparmor files

Co-authored-by: Steve Beattie <email address hidden>

a5523e3... by Christian Boltz <email address hidden>

Merge [3.x+4.0] nameservice: add support for libnss-libvirt

cherry picked from !1379 / commit e53f300821919fa4cc61b190d5e121d6156431b5 and from !1362 / commit 5be4295b5ae833491b56f5892144454e769889dd

I propose this patch for 3.x and 4.0.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1383
Approved-by: Georgia Garcia <email address hidden>
Merged-by: Christian Boltz <email address hidden>

(cherry picked from commit 1ffc1d9ac44578bfbaffd760991c313ce89346c7)

b7a4745b nameservice: add support for libnss-libvirt
b98433c7 abstractions/nameservice: tighten libnss_libvirt file access

Co-authored-by: Christian Boltz <email address hidden>

602e4f6... by Christian Boltz

Merge [3.0 cherry-pick] Merge utils: fixes when handling owner file rules

Fixes: https://gitlab.com/apparmor/apparmor/-/issues/429
Fixes: https://gitlab.com/apparmor/apparmor/-/issues/430

Closes #429 and #430
MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1320
Approved-by: John Johansen <email address hidden>
Merged-by: John Johansen <email address hidden>

(cherry picked from commit 1940b1b7cd779f8ae2892054278c5f6fc7b15f8c)
Signed-off-by: Georgia Garcia <email address hidden>

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1365
Approved-by: Christian Boltz <email address hidden>
Merged-by: Christian Boltz <email address hidden>

aa986e3... by John Johansen <email address hidden>

Merge utils: fixes when handling owner file rules

Fixes: https://gitlab.com/apparmor/apparmor/-/issues/429
Fixes: https://gitlab.com/apparmor/apparmor/-/issues/430

Closes #429 and #430
MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1320
Approved-by: John Johansen <email address hidden>
Merged-by: John Johansen <email address hidden>

(cherry picked from commit 1940b1b7cd779f8ae2892054278c5f6fc7b15f8c)
Signed-off-by: Georgia Garcia <email address hidden>

06ead72... by Christian Boltz <email address hidden>

Merge [3.0 + 3.1] ping: allow reading /proc/sys/net/ipv6/conf/all/disable_ipv6

Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1082190

(cherry picked from commit df4d7cb8dac31d0fc15a74edbb451c14a4b94fca,
 without the test update because test-logprof doesn't exist in 3.x yet)

This is the 3.x variant of https://gitlab.com/apparmor/apparmor/-/merge_requests/1340

I propose this patch for 3.0 and 3.1.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1343
Approved-by: Georgia Garcia <email address hidden>
Merged-by: Christian Boltz <email address hidden>

(cherry picked from commit 22a68a05f0fc263c2ecdf6688a09f606d3bad53a)

a84bcec4 ping: allow reading /proc/sys/net/ipv6/conf/all/disable_ipv6

Co-authored-by: Christian Boltz <email address hidden>

cb9a152... by Christian Boltz <email address hidden>

Merge abstractions/mesa: allow ~/.cache/mesa_shader_cache_db/

... which is used by Mesa 24.2.2

Reported by darix.

Fixes: https://bugs.launchpad.net/bugs/2081692

I propose this addition for 3.x, 4.0 and master

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1333
Approved-by: Georgia Garcia <email address hidden>
Merged-by: Christian Boltz <email address hidden>

(cherry picked from commit 62ff290c02d4646dc1db69766fea6be4b6456d78)

49b9a209 abstractions/mesa: allow ~/.cache/mesa_shader_cache_db/

Co-authored-by: Christian Boltz <email address hidden>

6ebf1cb... by Christian Boltz <email address hidden>

Merge apparmor.vim: Add missing units for rlimit cpu and rttime

... and allow whitespace between the number and the unit.

I propose this patch for 3.x, 4.0 and master.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1336
Approved-by: Georgia Garcia <email address hidden>
Merged-by: Christian Boltz <email address hidden>

(cherry picked from commit 247bdd5deb51bd950b1f7be735234553d0c8c1c2)

9cb591c5 apparmor.vim: Add missing units for rlimit cpu and rttime

Co-authored-by: Christian Boltz <email address hidden>