lp:~intrigeri/apparmor/fix-documenation-typo

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:apparmor/2.12 at revision 3486

Seth Arnold: Approve on 2016-06-24

Diff: 12 lines (+1/-1)

1 file modified

changehat/mod_apparmor/mod_apparmor.pod (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3486. By intrigeri on 2016-06-24

mod_apparmor manpage: fix "documenation" typo.

3485. By Seth Arnold on 2016-06-22

From: Simon McVittie <email address hidden>
Date: Tue, 21 Jun 2016 18:18:45 +0100
Subject: abstractions/nameservice: also support ConnMan-managed resolv.conf

Follow the same logic we already did for NetworkManager,
resolvconf and systemd-resolved. The wonderful thing about
standards is that there are so many to choose from.

Signed-off-by: Simon McVittie <email address hidden>

3484. By Christian Boltz on 2016-06-17

Drop unused escape() function from aa.py

Besides being unused, this function contains a broken regex.

References: https://bugs.launchpad.net/bugs/1593324

Acked-by: Steve Beattie <email address hidden>

3483. By Kshitij Gupta on 2016-06-09

Re-order imports in aa-mergeprof and rule/capability.py

Acked-by: Christian Boltz <email address hidden>

3482. By Christian Boltz on 2016-06-05

Add a note about still enforcing deny rules to aa-complain manpage

This behaviour makes sense (for example to force the confined program to
use a fallback path), but is probably surprising for users, so we should
document it.

References: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826218#37

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

3481. By Christian Boltz on 2016-06-05

honor 'chown' file events in logparser.py

Also add a testcase to libapparmor's log collection

Acked-by: Kshitij Gupta <email address hidden> for trunk, 2.10 and 2.9

3480. By Jamie Strandboge on 2016-06-04

profiles: Create abstraction for mozc input method editor

An abstraction to allow mozc clients to connect to the mozc-server.

Signed-off-by: Jamie Strandboge <email address hidden>
[tyhicks: Wrote commit message]
Signed-off-by: Tyler Hicks <email address hidden>
Acked-by: John Johansen <email address hidden>

3479. By Jamie Strandboge on 2016-06-04

profiles: Create abstractions for fcitx input method framework

Create a set of strict and non-strict abstractions, much like the
existing dbus abstractions, for connecting to the fcitx bus.

Signed-off-by: Jamie Strandboge <email address hidden>
[tyhicks: Wrote commit message]
Signed-off-by: Tyler Hicks <email address hidden>
Acked-by: John Johansen <email address hidden>

3478. By John Johansen on 2016-06-03

Fix: make sure overlapping safe and unsafe exec rules conflict

BugLink: https://launchpad.net/bugs/1588069

Currently

  change_profile /** -> A,
  change_profile unsafe /** -> A,

do not conflict because the safe rules only set the change_profile
permission where the unsafe set unsafe exec. To fix this we have the
safe version set exec bits as well with out setting unsafe exec.
This allows the exec conflict logic to detect any conflicts.

This is safe to do even for older kernels as the exec bits off of the
2nd term encoding in the change_onexec rules are unused.

Test files
  tst/simple_tests/change_profile/onx_no_conflict_safe1.sd
  tst/simple_tests/change_profile/onx_no_conflict_safe2.sd
by Christian Boltz <email address hidden>

Signed-off-by: John Johansen <email address hidden>
Acked-by: Tyler Hicks <email address hidden>

3477. By Christian Boltz on 2016-06-01

Document aliases for dbus send and receive in apparmor.d

Acked-by: Tyler Hicks <email address hidden>