lp://qastaging/apparmor/2.8
- Get this branch:
- bzr branch lp://qastaging/apparmor/2.8
Branch merges
Branch information
Recent revisions
- 2153. By Christian Boltz
-
backport nscd profile additions from 2.9 branch
The most important change is /proc/[
0-9]*/cmdline to allow paranoid mode. Acked-by: Seth Arnold <email address hidden>
- 2152. By Christian Boltz
-
Backport profile additions from the 2.9 branch
This patch backports most profile additions from the latest 2.9 branch
r3004, with the exception of new rule types (2.8 doesn't support dbus,
ptrace etc.) and some noisy cleanups (like /proc/*/ -> @{PROC}/@{pid}/).Acked-by: Seth Arnold <email address hidden>
- 2151. By Steve Beattie
-
libapparmor: fix parsing for yet another format
Backport from trunk revision 2830
This patch fixes the libapparmor log parsing library to take into
account yet another log format style, as well as incorporating a
testcase for it.Bugs:
https://bugs.launchpad .net/apparmor/ +bug/1399027
https://bugs.debian. org/cgi- bin/bugreport. cgi?bug= 771400
https://bugzilla. opensuse. org/show_ bug.cgi? id=905368 Nominated-by: Steve Beattie <email address hidden>
Acked-by: John Johansen <email address hidden> - 2150. By Steve Beattie
-
libaalogparse: fix for new kernel dmesg format
Merge from trunk revision 2647
The upstream kernel at some point between the 3.13 and 3.16 kernel
adjusted the output of audit messages to include an additional "audit:"
keyword. e.g. a 3.13 message would look like:kernel: [182243.243324] type=1400 audit(140968400
3.960:273342) : [SNIP] whereas in 3.16, it looks like:
kernel: [182243.243324] audit: type=1400 audit(140968400
3.960:273342) : [SNIP]
^^ ^^^^ This patch adjust the libapparmor aalogparse grammar and lexer to
compensate for this change.Nominated-by: Steve Beattie <email address hidden>
Acked-by: Seth Arnold <email address hidden> - 2149. By Christian Boltz
-
fix filename for .../nscd/hosts (which was accidently changed to "host" 3 years ago)
Acked-by: Seth Arnold <email address hidden>
- 2148. By Steve Beattie
-
toplevel Makefile: use https URI by default for vcs export
Merge from trunk commit 2261.Since --per-file-
timestamps is broken over the SSH transport (see
https://bugs.launchpad .net/bzr/ +bug/1257078), make the default use
a HTTPS URI instead. - 2146. By Steve Beattie
-
mod_apparmor: revert apache 2.4 api fix from commit 2131
This patch reverts commit 2131 which added support for the newer apache
2.4 ap_hook_check_access_ ex() api, based on a report from Christian that
it broke apache's simple authentication.Signed-off-by: Steve Beattie <email address hidden>
Acked-by: Christian Boltz <email address hidden> - 2145. By Christian Boltz
-
ntpd on openSUSE Factory needs another location for the pid file.
References: https:/
/bugzilla. novell. com/show_ bug.cgi? id=899746 Acked-by: Seth Arnold <email address hidden>
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/apparmor/2.12