Merge lp://qastaging/~apparmor-dev/apparmor/apparmor-ubuntu-citrain.abstract into lp://qastaging/~apparmor-dev/apparmor/apparmor-ubuntu-citrain

changehat/mod_apparmor/mod_apparmor.c (+188/-167)
changehat/mod_apparmor/mod_apparmor.pod (+23/-20)
common/.stamp_rev (+1/-0)
debian/apparmor-profiles.install (+0/-1)
debian/apparmor.init (+20/-22)
debian/apparmor.install (+1/-0)
debian/apparmor.upstart (+15/-18)
debian/changelog (+58/-0)
debian/control (+1/-1)
debian/lib/apparmor/functions (+21/-0)
debian/patches/01-tests-unix_socket_lists.patch (+144/-0)
debian/patches/02-tests-accept_unix_rules_in_mkprofile.patch (+63/-0)
debian/patches/03-tests-unix_sockets_v7_pathnames.patch (+43/-0)
debian/patches/04-tests-migrate_from_poll_to_sockio_timeout.patch (+178/-0)
debian/patches/05-tests-add_abstract_socket_tests.patch (+228/-0)
debian/patches/06-tests-use_socketpair_and_none.patch (+412/-0)
debian/patches/07-parser-fix_local_perms.patch (+75/-0)
debian/patches/08-phpsysinfo-policy-updates.patch (+51/-0)
debian/patches/09-apache2-policy-instructions.patch (+35/-0)
debian/patches/add-chromium-browser.patch (+45/-7)
debian/patches/dnsmasq-libvirtd-signal-ptrace.patch (+0/-17)
debian/patches/drop-peer_addr-with-local-addr-in-base.patch (+22/-0)
debian/patches/libapparmor-layout-deb.patch (+1/-1)
debian/patches/parser-include-usr-share-apparmor.patch (+24/-0)
debian/patches/perl-multiarch.patch (+0/-73)
debian/patches/series (+19/-10)
debian/patches/update-base-abstraction-for-signals-and-ptrace.patch (+0/-32)
debian/patches/update-chromium-browser.patch (+0/-100)
debian/patches/update-nameservice-abstraction-for-extrausers.patch (+0/-20)
deprecated/rc.aaeventd.redhat (+137/-0)
deprecated/rc.aaeventd.suse (+133/-0)
deprecated/utils/Immunix/AppArmor.pm (+35/-8)
libraries/libapparmor/include/Makefile.in (+684/-0)
libraries/libapparmor/include/aalogparse.h (+7/-0)
libraries/libapparmor/include/sys/Makefile.in (+568/-0)
libraries/libapparmor/src/grammar.y (+29/-8)
libraries/libapparmor/src/libaalogparse.c (+14/-0)
libraries/libapparmor/src/scanner.l (+11/-0)
libraries/libapparmor/swig/python/test/Makefile.in (+837/-0)
libraries/libapparmor/test-driver (+139/-0)
libraries/libapparmor/testsuite/test_multi.c (+7/-0)
libraries/libapparmor/testsuite/test_multi/syslog_audit_01.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_audit_01.out (+15/-0)
libraries/libapparmor/testsuite/test_multi/testcase_mount_01.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/testcase_mount_01.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/testcase_pivotroot_01.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/testcase_pivotroot_01.out (+12/-0)
libraries/libapparmor/testsuite/test_multi/testcase_ptrace_01.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/testcase_ptrace_01.out (+13/-0)
libraries/libapparmor/testsuite/test_multi/testcase_signal_01.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/testcase_signal_01.out (+14/-0)
libraries/libapparmor/testsuite/test_multi/testcase_signal_02.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/testcase_signal_02.out (+14/-0)
parser/Makefile (+28/-18)
parser/af_rule.cc (+171/-0)
parser/af_rule.h (+78/-0)
parser/af_unix.cc (+416/-0)
parser/af_unix.h (+63/-0)
parser/apparmor.d.pod (+154/-3)
parser/dbus.cc (+0/-2)
parser/lib.c (+0/-1)
parser/libapparmor_re/aare_rules.cc (+59/-42)
parser/libapparmor_re/aare_rules.h (+1/-0)
parser/libapparmor_re/expr-tree.h (+225/-46)
parser/libapparmor_re/hfa.cc (+41/-29)
parser/libapparmor_re/hfa.h (+2/-175)
parser/libapparmor_re/parse.y (+1/-1)
parser/network.c (+407/-0)
parser/network.h (+136/-0)
parser/parser.h (+4/-30)
parser/parser_alias.c (+0/-2)
parser/parser_common.c (+2/-3)
parser/parser_include.c (+0/-2)
parser/parser_interface.c (+18/-25)
parser/parser_lex.l (+29/-11)
parser/parser_main.c (+4/-3)
parser/parser_merge.c (+0/-2)
parser/parser_misc.c (+1/-310)
parser/parser_policy.c (+0/-2)
parser/parser_regex.c (+9/-3)
parser/parser_symtab.c (+0/-2)
parser/parser_variable.c (+0/-3)
parser/parser_yacc.y (+121/-15)
parser/po/bs.po (+34/-33)
parser/po/fi.po (+5/-5)
parser/po/ms.po (+151/-112)
parser/profile.cc (+14/-0)
parser/profile.h (+3/-21)
parser/rc.aaeventd.redhat (+0/-137)
parser/rc.aaeventd.suse (+0/-133)
parser/tst/features_files/features.all (+6/-2)
parser/tst/simple_tests/profile/flags/flags_bad.sd (+0/-8)
parser/tst/simple_tests/profile/flags/flags_bad10.sd (+0/-2)
parser/tst/simple_tests/profile/flags/flags_bad11.sd (+0/-2)
parser/tst/simple_tests/profile/flags/flags_bad12.sd (+0/-2)
parser/tst/simple_tests/profile/flags/flags_bad13.sd (+0/-2)
parser/tst/simple_tests/profile/flags/flags_bad2.sd (+0/-2)
parser/tst/simple_tests/profile/flags/flags_bad3.sd (+0/-2)
parser/tst/simple_tests/profile/flags/flags_bad4.sd (+0/-2)
parser/tst/simple_tests/profile/flags/flags_bad5.sd (+0/-8)
parser/tst/simple_tests/profile/flags/flags_bad6.sd (+0/-2)
parser/tst/simple_tests/profile/flags/flags_bad7.sd (+0/-2)
parser/tst/simple_tests/profile/flags/flags_bad8.sd (+0/-2)
parser/tst/simple_tests/unix/bad_bind_1.sd (+8/-0)
parser/tst/simple_tests/unix/bad_bind_2.sd (+8/-0)
parser/tst/simple_tests/unix/bad_modifier_1.sd (+7/-0)
parser/tst/simple_tests/unix/bad_modifier_2.sd (+7/-0)
parser/tst/simple_tests/unix/bad_modifier_3.sd (+7/-0)
parser/tst/simple_tests/unix/bad_modifier_4.sd (+7/-0)
parser/tst/simple_tests/unix/bad_peer_1.sd (+9/-0)
parser/tst/simple_tests/unix/bad_regex_01.sd (+8/-0)
parser/tst/simple_tests/unix/bad_regex_02.sd (+8/-0)
parser/tst/simple_tests/unix/bad_regex_03.sd (+8/-0)
parser/tst/simple_tests/unix/bad_regex_04.sd (+8/-0)
parser/tst/simple_tests/unix/ok_accept_1.sd (+7/-0)
parser/tst/simple_tests/unix/ok_accept_2.sd (+7/-0)
parser/tst/simple_tests/unix/ok_attr_1.sd (+7/-0)
parser/tst/simple_tests/unix/ok_attr_2.sd (+7/-0)
parser/tst/simple_tests/unix/ok_attr_3.sd (+7/-0)
parser/tst/simple_tests/unix/ok_attr_4.sd (+7/-0)
parser/tst/simple_tests/unix/ok_bind_1.sd (+7/-0)
parser/tst/simple_tests/unix/ok_bind_2.sd (+7/-0)
parser/tst/simple_tests/unix/ok_bind_3.sd (+7/-0)
parser/tst/simple_tests/unix/ok_connect_1.sd (+7/-0)
parser/tst/simple_tests/unix/ok_connect_2.sd (+7/-0)
parser/tst/simple_tests/unix/ok_create_1.sd (+7/-0)
parser/tst/simple_tests/unix/ok_create_2.sd (+7/-0)
parser/tst/simple_tests/unix/ok_listen_1.sd (+7/-0)
parser/tst/simple_tests/unix/ok_listen_2.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_1.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_10.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_11.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_12.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_13.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_14.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_15.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_16.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_17.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_18.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_19.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_2.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_3.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_4.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_5.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_6.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_7.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_8.sd (+7/-0)
parser/tst/simple_tests/unix/ok_msg_9.sd (+7/-0)
parser/tst/simple_tests/unix/ok_opt_1.sd (+7/-0)
parser/tst/simple_tests/unix/ok_opt_2.sd (+7/-0)
parser/tst/simple_tests/unix/ok_opt_3.sd (+7/-0)
parser/tst/simple_tests/unix/ok_opt_4.sd (+7/-0)
parser/tst/simple_tests/unix/ok_shutdown_1.sd (+7/-0)
parser/tst/simple_tests/unix/ok_shutdown_2.sd (+7/-0)
profiles/apparmor.d/abstractions/X (+3/-0)
profiles/apparmor.d/abstractions/apache2-common (+2/-0)
profiles/apparmor.d/abstractions/base (+35/-0)
profiles/apparmor.d/abstractions/dbus-session-strict (+4/-0)
profiles/apparmor.d/abstractions/dovecot-common (+19/-0)
profiles/apparmor.d/abstractions/kde (+1/-0)
profiles/apparmor.d/abstractions/nameservice (+10/-1)
profiles/apparmor.d/abstractions/perl (+4/-2)
profiles/apparmor.d/abstractions/php5 (+3/-0)
profiles/apparmor.d/abstractions/postfix-common (+24/-0)
profiles/apparmor.d/abstractions/samba (+2/-0)
profiles/apparmor.d/program-chunks/postfix-common (+0/-24)
profiles/apparmor.d/sbin.syslog-ng (+3/-0)
profiles/apparmor.d/sbin.syslogd (+3/-0)
profiles/apparmor.d/usr.lib.dovecot.anvil (+1/-1)
profiles/apparmor.d/usr.lib.dovecot.auth (+4/-5)
profiles/apparmor.d/usr.lib.dovecot.config (+1/-4)
profiles/apparmor.d/usr.lib.dovecot.deliver (+2/-2)
profiles/apparmor.d/usr.lib.dovecot.dict (+1/-1)
profiles/apparmor.d/usr.lib.dovecot.dovecot-auth (+1/-1)
profiles/apparmor.d/usr.lib.dovecot.dovecot-lda (+1/-1)
profiles/apparmor.d/usr.lib.dovecot.imap (+1/-1)
profiles/apparmor.d/usr.lib.dovecot.imap-login (+1/-1)
profiles/apparmor.d/usr.lib.dovecot.lmtp (+1/-3)
profiles/apparmor.d/usr.lib.dovecot.log (+1/-4)
profiles/apparmor.d/usr.lib.dovecot.managesieve (+11/-0)
profiles/apparmor.d/usr.lib.dovecot.managesieve-login (+4/-1)
profiles/apparmor.d/usr.lib.dovecot.pop3 (+1/-1)
profiles/apparmor.d/usr.lib.dovecot.pop3-login (+1/-1)
profiles/apparmor.d/usr.lib.dovecot.ssl-params (+1/-4)
profiles/apparmor.d/usr.sbin.avahi-daemon (+2/-0)
profiles/apparmor.d/usr.sbin.dnsmasq (+11/-3)
profiles/apparmor.d/usr.sbin.dovecot (+2/-0)
profiles/apparmor.d/usr.sbin.identd (+3/-1)
profiles/apparmor.d/usr.sbin.mdnsd (+2/-0)
profiles/apparmor.d/usr.sbin.smbd (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.anvil (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.bounce (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.cleanup (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.error (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.flush (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.lmtp (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.local (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.master (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.nqmgr (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.oqmgr (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.pickup (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.proxymap (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.qmgr (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.qmqpd (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.scache (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.showq (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.smtp (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.smtpd (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.spawn (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.tlsmgr (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.trivial-rewrite (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.verify (+1/-1)
profiles/apparmor/profiles/extras/usr.lib.postfix.virtual (+1/-1)
profiles/apparmor/profiles/extras/usr.sbin.postalias (+1/-1)
profiles/apparmor/profiles/extras/usr.sbin.postdrop (+1/-1)
profiles/apparmor/profiles/extras/usr.sbin.postmap (+1/-1)
profiles/apparmor/profiles/extras/usr.sbin.postqueue (+1/-1)
profiles/apparmor/profiles/extras/usr.sbin.sendmail (+1/-1)
profiles/apparmor/profiles/extras/usr.sbin.sendmail.postfix (+1/-1)
tests/regression/apparmor/Makefile (+3/-3)
tests/regression/apparmor/unix_socket.c (+191/-0)
tests/regression/apparmor/unix_socket.sh (+172/-0)
tests/regression/apparmor/unix_socket_client.c (+139/-0)
tests/regression/apparmor/unix_socket_file.c (+0/-177)
tests/regression/apparmor/unix_socket_file.sh (+0/-106)
tests/regression/apparmor/unix_socket_file_client.c (+0/-126)
utils/aa-mergeprof (+64/-47)
utils/apparmor/aa.py (+53/-32)
utils/apparmor/aamode.py (+1/-1)
utils/apparmor/cleanprofile.py (+1/-1)
utils/apparmor/logparser.py (+2/-10)
utils/apparmor/rules.py (+29/-59)
utils/apparmor/ui.py (+11/-2)
utils/logprof.conf (+2/-0)
utils/po/tr.po (+350/-0)
utils/severity.db (+4/-0)
utils/test/aa_test.py (+1/-3)
utils/test/common_test.py (+21/-2)
utils/test/config_test.py (+0/-2)
utils/test/logprof.conf (+2/-0)
utils/test/minitools_test.py (+1/-1)
utils/test/regex_tests.ini (+31/-1)
utils/test/runtests-py2.sh (+5/-1)
utils/test/runtests-py3.sh (+33/-1)
utils/test/severity.db (+3/-0)
utils/test/severity_broken.db (+3/-0)
utils/test/severity_test.py (+1/-4)
utils/test/test-aa-decode.py (+1/-1)
utils/test/test-dbus_parse.py (+13/-15)
utils/test/test-mount_parse.py (+31/-67)
utils/test/test-pivot_root_parse.py (+14/-20)
utils/test/test-ptrace_parse.py (+20/-38)
utils/test/test-regex_matches.py (+48/-9)
utils/test/test-signal_parse.py (+23/-47)
utils/test/test-unix_parse.py (+39/-0)
utils/vim/create-apparmor.vim.py (+3/-1)