lp://staging/~intrigeri/apparmor/fix-resonable-typo

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/apparmor/2.12 at revision 3571

Christian Boltz: Approve on 2016-10-15

Diff: 12 lines (+1/-1)

1 file modified

parser/apparmor_parser.pod (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3571. By intrigeri on 2016-10-15

Fix typo: s/resonable/reasonable/.

3570. By Christian Boltz on 2016-10-14

allow reading /tmp/.X11-unix/* in abstractions/X

This is needed when starting X with "-nolisten local".

References: https://bugs.launchpad.net/apparmor/+bug/1589823

Acked-by: Seth Arnold <email address hidden> for trunk, 2.10 and 2.9

3569. By Christian Boltz on 2016-10-14

add network 'kcm' keyword to apparmor.d manpage

I already did this in the python code a month ago, and now realized that
we should also update the apparmor.d manpage ;-)

Acked-by: Seth Arnold <email address hidden> for trunk and 2.10.

3568. By Christian Boltz on 2016-10-14

Drop unused 'found' counter from aa.py ask_the_questions()

Acked-by: Seth Arnold <email address hidden>

3567. By Christian Boltz on 2016-10-14

Drop seen_events counter from aa.py

seen_events is a global variable in aa.py that gets increased at several
places, but isn't used (read or printed) anywhere. Since I can't imagine
how it could become useful, simply drop it.

Also drop an outdated comment in handle_children that lived next to a
seen_events line.

Acked-by: Seth Arnold <email address hidden>

3566. By Steve Beattie on 2016-10-14

Profile abstractions: add wayland/weston abstraction

Merged from <email address hidden>, thanks!

Bug: https://bugs.debian.org/827335

3565. By Christian Boltz on 2016-10-13

syslog-ng profile: allow writing *.qf files

These files are needed for disk-based buffering (added in syslog-ng 3.8).
This was reported to me by Peter Czanik, one of the syslog-ng developers.

Note: I'm not sure about adding @{CHROOT_BASE} to this rule, so for now
I prefer not to do it - adding it later is easy, but finding out if it
could be removed is hard ;-)

Acked-by: John Johansen <email address hidden> for trunk, 2.10 and 2.9.

3564. By Christian Boltz on 2016-10-10

Rename config_test.py to test-config.py

This little change means that the tests will run as part of 'make check'.

This commit is only a 'bzr mv utils/test/config_test.py utils/test/test-config.py'
without any changes in the file content.

Acked-by: Steve Beattie <email address hidden>

3563. By Christian Boltz on 2016-10-10

Move str_to_mode() tests to test-aamode.py

aa_test.py doesn't run in 'make check' because its filename doesn't
match the 'test-*.py' pattern, so this move means the tests now actually
get run.

While on it, migrate test-aamode.py to use the AATest base class, and
migrate the str_to_mode() tests to a tests[] array.

After this move, aa_test.py doesn't do anything anymore, so delete it.

Acked-by: Steve Beattie <email address hidden>.

Also add another test proposed by Steve:
    (None, set()),

3562. By Christian Boltz on 2016-10-10

Drop loadincludes() and mode_to_str() tests from aa_test.py

aa_test.py doesn't run in 'make check' because its filename doesn't
match the 'test-*.py' pattern.

mode_to_str() was dropped as part of the FileRule series, so it's
pointless to keep its tests. (The replacement is totally different and
has full test coverage already.)

loadincludes() still exists, but only testing if the function runs
without errors is not really helpful, so drop this test.

Also drop unused imports and add an explicit import for apparmor.aamode.

Acked-by: Steve Beattie <email address hidden>