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

Proposed by Jamie Strandboge
Status: Merged
Approved by: Jamie Strandboge
Approved revision: 1499
Merged at revision: 1496
Proposed branch: lp://qastaging/~apparmor-dev/apparmor/apparmor-ubuntu-citrain.2.8.95-trusty
Merge into: lp://qastaging/~apparmor-dev/apparmor/apparmor-ubuntu-citrain
Diff against target: 201863 lines (+81757/-91852)
849 files modified
Makefile (+3/-1)
README (+34/-1)
changehat/mod_apparmor/Makefile (+39/-6)
changehat/mod_apparmor/mod_apparmor.c (+122/-69)
changehat/mod_apparmor/mod_apparmor.pod (+19/-14)
changehat/pam_apparmor/Makefile (+42/-4)
changehat/pam_apparmor/pam_apparmor.c (+1/-1)
changehat/tomcat_apparmor/tomcat_5_0/src/jni_src/JNIChangeHat.c (+1/-1)
changehat/tomcat_apparmor/tomcat_5_5/src/jni_src/JNIChangeHat.c (+1/-1)
common/.stamp_rev (+1/-1)
common/Make.rules (+27/-2)
common/Version (+1/-1)
debian/apparmor-easyprof.install (+0/-1)
debian/apparmor-utils.install (+3/-4)
debian/apparmor-utils.manpages (+2/-0)
debian/apparmor.dirs (+1/-0)
debian/apparmor.install (+7/-0)
debian/apparmor.postinst (+34/-3)
debian/apparmor.postrm (+3/-0)
debian/changelog (+89/-0)
debian/control (+29/-7)
debian/debhelper/dh_apparmor (+7/-2)
debian/libapparmor-dev.manpages (+4/-0)
debian/libapparmor1.manpages (+0/-4)
debian/libapparmor1.symbols (+3/-1)
debian/patches/0001-add-chromium-browser.patch (+0/-230)
debian/patches/0002-add-debian-integration-to-lighttpd.patch (+0/-23)
debian/patches/0003-ubuntu-manpage-updates.patch (+0/-88)
debian/patches/0004-lp941808.patch (+0/-17)
debian/patches/0005-lp1019274.patch (+0/-412)
debian/patches/0006-cap-epollwakeup.patch (+0/-18)
debian/patches/0007-setuptools-python3.patch (+0/-25)
debian/patches/0008-libapparmor-layout-deb.patch (+0/-18)
debian/patches/0009-lp1003856.patch (+0/-32)
debian/patches/0011-lp1013887.patch (+0/-32)
debian/patches/0013-lp987578.patch (+0/-15)
debian/patches/0014-lp933440.patch (+0/-107)
debian/patches/0015-fontconfig.patch (+0/-19)
debian/patches/0016-cap-block-suspend.patch (+0/-18)
debian/patches/0017-gnome-poppler-data.patch (+0/-15)
debian/patches/0018-lp1056391.patch (+0/-17)
debian/patches/0019-vdpau_wrapper.patch (+0/-23)
debian/patches/0020-coredump_tests.patch (+0/-140)
debian/patches/0021-webapps_abstraction.patch (+0/-23)
debian/patches/0022-aa-decode-stdin.patch (+0/-288)
debian/patches/0023-python-config.patch (+0/-25)
debian/patches/0024-lp1091642-parser-reset_matchflags.patch (+0/-102)
debian/patches/0025-update-pulseaudio-paths.patch (+0/-18)
debian/patches/0026-add-vm_overcommit_memory.patch (+0/-19)
debian/patches/0027-add-gnome-keyring-to-strict.patch (+0/-17)
debian/patches/0028-add-upstart-to-private.patch (+0/-17)
debian/patches/0029-easyprof-update-for-aa-sandbox.patch (+0/-1404)
debian/patches/0030-easyprof-sdk.patch (+0/-2673)
debian/patches/0031-move-poppler-cmap-to-fonts.patch (+0/-25)
debian/patches/0032-lp1195362.patch (+0/-27)
debian/patches/0036-libapache2-mod-apparmor-profile-2.4.patch (+0/-189)
debian/patches/0037-easyprof-sdk-pt2.patch (+0/-1441)
debian/patches/0038-lp1200392.patch (+0/-15)
debian/patches/0039-fix-parser-cache-loc.patch (+0/-71)
debian/patches/0040-libapparmor-support-pkg-config.patch (+0/-70)
debian/patches/0041-parser-fix-flags.patch (+0/-28)
debian/patches/0042-Fix-mount-rule-preprocessor-output.patch (+0/-53)
debian/patches/0043-libapparmor-Safeguard-aa_getpeercon-buffer-reallocat.patch (+0/-42)
debian/patches/0044-libapparmor-fix-return-value-of-aa_getpeercon_raw.patch (+0/-25)
debian/patches/0045-libapparmor-Move-mode-parsing-into-separate-function.patch (+0/-78)
debian/patches/0046-libapparmor-Parse-mode-from-confinement-string-in-ge.patch (+0/-109)
debian/patches/0047-libapparmor-Make-aa_getpeercon_raw-similar-to-aa_get.patch (+0/-105)
debian/patches/0048-libapparmor-Update-aa_getcon-man-page-to-reflect-get.patch (+0/-58)
debian/patches/0049-parser-Update-man-page-for-DBus-rules.patch (+0/-127)
debian/patches/0050-parser-Add-support-for-DBus-rules.patch (+0/-1085)
debian/patches/0051-parser-Regression-tests-for-DBus-rules.patch (+0/-206)
debian/patches/0052-parser-Binary-profile-equality-tests-for-DBus-rules.patch (+0/-203)
debian/patches/0053-libapparmor-Export-a-label-based-query-interface.patch (+0/-237)
debian/patches/0054-libaalogparse-Parse-dbus-daemon-audit-messages.patch (+0/-415)
debian/patches/0055-libaalogparse-Regression-tests-for-dbus-daemon-audit.patch (+0/-216)
debian/patches/0056-tests-Add-an-optional-final-check-to-checktestfg.patch (+0/-43)
debian/patches/0057-tests-Add-required-features-check.patch (+0/-53)
debian/patches/0058-tests-Add-regression-tests-for-dbus.patch (+0/-1429)
debian/patches/0059-dbus-rules-for-dbus-abstractions.patch (+0/-39)
debian/patches/0060-utils-make_clean_fixup.patch (+0/-22)
debian/patches/0061-profiles-dnsmasq-needs-dbus-abstraction.patch (+0/-24)
debian/patches/0062-fix-clone-test-on-arm.patch (+0/-36)
debian/patches/0063-utils-ignore-unsupported-rules.patch (+0/-30)
debian/patches/0064-lp1218099.patch (+0/-379)
debian/patches/0065-lp1220861.patch (+0/-42)
debian/patches/0066-lp1196880.patch (+0/-22)
debian/patches/0067-libapparmor-mode-strings-are-not-to-be-freed.patch (+0/-179)
debian/patches/0068-libapparmor-mention-dbus-method-in-getcon-man.patch (+0/-43)
debian/patches/0069-p11kit-abstraction.patch (+0/-17)
debian/patches/0070-etc-writable.patch (+0/-61)
debian/patches/0071-lp1226356.patch (+0/-511)
debian/patches/0072-lp1229393.patch (+0/-42)
debian/patches/0073-lp1208988.patch (+0/-516)
debian/patches/0074-lp1228882.patch (+0/-18)
debian/patches/0075-lp1211380.patch (+0/-20)
debian/patches/0076_sanitized_helper_dbus_access.patch (+0/-17)
debian/patches/0077_aa-status-is-bilingual.patch (+0/-15)
debian/patches/0078-parser-check-for-dbus-kernel-support.patch (+0/-88)
debian/patches/0079-utils-ignore-unsupported-log-events.patch (+0/-34)
debian/patches/0080-tests-use-ldconfig-for-library-detection.patch (+0/-32)
debian/patches/0081-python-abstraction-updates.patch (+0/-27)
debian/patches/0082-parser-fix-FTBFS-with-bison-3.patch (+0/-23)
debian/patches/0083-libapparmor-require-libtoolize.patch (+0/-45)
debian/patches/0084-parser-add-dbus-eavesdrop-perm.patch (+0/-539)
debian/patches/0085-push-normalize-tree-ops-into-expr-tree-classes.patch (+0/-229)
debian/patches/0086-add-diff-state-compression-to-dfa.patch (+0/-829)
debian/patches/0087-fix-dfa-minimization.patch (+0/-311)
debian/patches/0088-fix-pol-generation-for-small-dfas.patch (+0/-139)
debian/patches/aa-utils_are_bilingual.patch (+129/-0)
debian/patches/aare-to-class.patch (+628/-0)
debian/patches/add-chromium-browser.patch (+230/-0)
debian/patches/add-debian-integration-to-lighttpd.patch (+25/-0)
debian/patches/add-decimal-interp.patch (+203/-0)
debian/patches/add-mediation-unix.patch (+122/-0)
debian/patches/caching.patch (+66/-0)
debian/patches/convert-to-rules.patch (+2449/-0)
debian/patches/etc-writable.patch (+68/-0)
debian/patches/feature_file.patch (+578/-0)
debian/patches/fix-failpath.patch (+39/-0)
debian/patches/fix-lexer-debug.patch (+90/-0)
debian/patches/fix-network.patch (+45/-0)
debian/patches/fix-ppc-endian-ftbfs.patch (+88/-0)
debian/patches/fix-serialize.patch (+771/-0)
debian/patches/label-class.patch (+36/-0)
debian/patches/libapparmor-layout-deb.patch (+36/-0)
debian/patches/libapparmor-mention-dbus-method-in-getcon-man.patch (+43/-0)
debian/patches/list-fns.patch (+113/-0)
debian/patches/opt_arg.patch (+473/-0)
debian/patches/parse-mode.patch (+198/-0)
debian/patches/parser_version.patch (+299/-0)
debian/patches/policy_mediates.patch (+71/-0)
debian/patches/series (+26/-83)
debian/patches/tests-cond-dbus.patch (+81/-0)
debian/patches/ubuntu-manpage-updates.patch (+92/-0)
debian/patches/use-diff-encode.patch (+68/-0)
debian/python-apparmor.install (+1/-0)
debian/python3-apparmor.install (+1/-0)
debian/rules (+15/-1)
kernel-patches/3.10/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch (+285/-0)
kernel-patches/3.10/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch (+602/-0)
kernel-patches/3.10/0003-apparmor-Fix-quieting-of-audit-messages-for-network-.patch (+38/-0)
kernel-patches/3.10/0004-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch (+956/-0)
kernel-patches/3.11/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch (+285/-0)
kernel-patches/3.11/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch (+602/-0)
kernel-patches/3.11/0003-apparmor-Fix-quieting-of-audit-messages-for-network-.patch (+38/-0)
kernel-patches/3.11/0004-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch (+956/-0)
kernel-patches/3.12/0001-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch (+607/-0)
kernel-patches/3.12/0002-apparmor-Fix-quieting-of-audit-messages-for-network-.patch (+38/-0)
kernel-patches/3.12/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch (+965/-0)
kernel-patches/3.5/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch (+285/-0)
kernel-patches/3.5/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch (+603/-0)
kernel-patches/3.5/0003-apparmor-Fix-quieting-of-audit-messages-for-network-.patch (+38/-0)
kernel-patches/3.5/0004-apparmor-Ensure-apparmor-does-not-mediate-kernel-bas.patch (+98/-0)
kernel-patches/3.5/0005-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch (+957/-0)
kernel-patches/3.5/0006-apparmor-fix-IRQ-stack-overflow-during-free_profile.patch (+70/-0)
kernel-patches/3.6/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch (+285/-0)
kernel-patches/3.6/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch (+603/-0)
kernel-patches/3.6/0003-apparmor-Fix-quieting-of-audit-messages-for-network-.patch (+38/-0)
kernel-patches/3.6/0004-apparmor-Ensure-apparmor-does-not-mediate-kernel-bas.patch (+98/-0)
kernel-patches/3.6/0005-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch (+957/-0)
kernel-patches/3.6/0006-apparmor-fix-IRQ-stack-overflow-during-free_profile.patch (+70/-0)
kernel-patches/3.7/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch (+285/-0)
kernel-patches/3.7/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch (+602/-0)
kernel-patches/3.7/0003-apparmor-Fix-quieting-of-audit-messages-for-network-.patch (+38/-0)
kernel-patches/3.7/0004-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch (+956/-0)
kernel-patches/3.8/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch (+285/-0)
kernel-patches/3.8/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch (+602/-0)
kernel-patches/3.8/0003-apparmor-Fix-quieting-of-audit-messages-for-network-.patch (+38/-0)
kernel-patches/3.8/0004-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch (+956/-0)
kernel-patches/3.9/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch (+285/-0)
kernel-patches/3.9/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch (+602/-0)
kernel-patches/3.9/0003-apparmor-Fix-quieting-of-audit-messages-for-network-.patch (+38/-0)
kernel-patches/3.9/0004-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch (+956/-0)
libraries/libapparmor/Makefile.am (+1/-1)
libraries/libapparmor/README (+3/-1)
libraries/libapparmor/autogen.sh (+4/-3)
libraries/libapparmor/configure.ac (+87/-0)
libraries/libapparmor/configure.in (+0/-86)
libraries/libapparmor/doc/aa_change_hat.pod (+13/-4)
libraries/libapparmor/doc/aa_change_profile.pod (+11/-4)
libraries/libapparmor/doc/aa_find_mountpoint.pod (+1/-1)
libraries/libapparmor/doc/aa_getcon.pod (+20/-7)
libraries/libapparmor/include/Makefile.am (+4/-0)
libraries/libapparmor/include/Makefile.in (+684/-0)
libraries/libapparmor/include/aalogparse.h (+175/-0)
libraries/libapparmor/include/sys/Makefile.am (+3/-0)
libraries/libapparmor/include/sys/Makefile.in (+568/-0)
libraries/libapparmor/include/sys/apparmor.h (+107/-0)
libraries/libapparmor/m4/ac_python_devel.m4 (+28/-24)
libraries/libapparmor/src/Makefile.am (+46/-14)
libraries/libapparmor/src/aalogparse.h (+0/-168)
libraries/libapparmor/src/apparmor.h (+0/-80)
libraries/libapparmor/src/grammar.y (+75/-4)
libraries/libapparmor/src/kernel_interface.c (+200/-49)
libraries/libapparmor/src/libaalogparse.c (+13/-1)
libraries/libapparmor/src/libapparmor.map (+16/-0)
libraries/libapparmor/src/libapparmor.pc.in (+10/-0)
libraries/libapparmor/src/libimmunix_warning.c (+0/-30)
libraries/libapparmor/src/scanner.l (+54/-4)
libraries/libapparmor/src/tst_aalogmisc.c (+1/-1)
libraries/libapparmor/swig/SWIG/libapparmor.i (+19/-5)
libraries/libapparmor/swig/perl/Makefile.PL.in (+1/-1)
libraries/libapparmor/swig/perl/Makefile.am (+4/-2)
libraries/libapparmor/swig/python/Makefile.am (+3/-1)
libraries/libapparmor/swig/python/setup.py.in (+15/-15)
libraries/libapparmor/swig/python/test/Makefile.am (+21/-0)
libraries/libapparmor/swig/python/test/Makefile.in (+837/-0)
libraries/libapparmor/swig/python/test/test_python.py.in (+147/-0)
libraries/libapparmor/swig/ruby/Makefile.am (+2/-2)
libraries/libapparmor/test-driver (+127/-0)
libraries/libapparmor/testsuite/Makefile.am (+1/-1)
libraries/libapparmor/testsuite/test_multi.c (+58/-134)
libraries/libapparmor/testsuite/test_multi/avc_audit_01.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/avc_audit_02.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/avc_audit_03.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/avc_audit_invalid_audit_id.out (+1/-3)
libraries/libapparmor/testsuite/test_multi/avc_syslog_01.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/avc_syslog_02.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/avc_syslog_03.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_01.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_02.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_03.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_04.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_05.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_06.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_07.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_08.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_09.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_10.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_11.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_12.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_13.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_14.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_15.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_16.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_17.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/old_style_log_18.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/syslog_audit_05.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/syslog_audit_06.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_01.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_01.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_02.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_02.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_03.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_03.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_04.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_04.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_05.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_05.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_06.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_06.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_07.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_07.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_08.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_08.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_09.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_09.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_10.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_10.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_11.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_11.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_12.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_12.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_13.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_13.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_14.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_14.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_15.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_15.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_16.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_16.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_17.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_17.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_18.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/syslog_datetime_18.out (+16/-0)
libraries/libapparmor/testsuite/test_multi/syslog_other_01.out (+1/-3)
libraries/libapparmor/testsuite/test_multi/syslog_other_02.out (+1/-3)
libraries/libapparmor/testsuite/test_multi/syslog_other_03.out (+1/-3)
libraries/libapparmor/testsuite/test_multi/syslog_other_04.out (+1/-3)
libraries/libapparmor/testsuite/test_multi/testcase01.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase02.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase03.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase04.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase05.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase06.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase07.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase08.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase09.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase10.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase11.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase12.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase13.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase14.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase15.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase16.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase17.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase18.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase19.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase21.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase22.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase24.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase25.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase26.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase31.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase32.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase33.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase35.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_dbus_01.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/testcase_dbus_01.out (+13/-0)
libraries/libapparmor/testsuite/test_multi/testcase_dbus_02.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/testcase_dbus_02.out (+9/-0)
libraries/libapparmor/testsuite/test_multi/testcase_dbus_03.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/testcase_dbus_03.out (+14/-0)
libraries/libapparmor/testsuite/test_multi/testcase_dbus_04.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/testcase_dbus_04.out (+17/-0)
libraries/libapparmor/testsuite/test_multi/testcase_dbus_05.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/testcase_dbus_05.out (+13/-0)
libraries/libapparmor/testsuite/test_multi/testcase_dbus_06.in (+1/-0)
libraries/libapparmor/testsuite/test_multi/testcase_dbus_06.out (+18/-0)
libraries/libapparmor/testsuite/test_multi/testcase_encoded_comm.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_encoded_profile.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_network_01.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_network_02.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_network_03.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_network_04.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_network_05.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_ouid.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_stack_crash.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_syslog_capability.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_syslog_changehat_negative_error.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_syslog_link_01.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_syslog_mkdir.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_syslog_rename_dest.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_syslog_rename_src.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_syslog_status_offset.out (+1/-1)
libraries/libapparmor/testsuite/test_multi/testcase_syslog_truncate.out (+1/-1)
parser/Makefile (+93/-54)
parser/README (+12/-8)
parser/README.devel (+96/-0)
parser/apparmor.d.pod (+91/-2)
parser/apparmor.pod (+29/-23)
parser/apparmor.vim.pod (+0/-58)
parser/apparmor_parser.pod (+109/-40)
parser/dbus.c (+219/-0)
parser/dbus.h (+49/-0)
parser/immunix.h (+1/-6)
parser/lib.c (+137/-0)
parser/lib.h (+7/-0)
parser/libapparmor_re/Makefile (+3/-3)
parser/libapparmor_re/aare_rules.cc (+18/-9)
parser/libapparmor_re/aare_rules.h (+2/-2)
parser/libapparmor_re/apparmor_re.h (+35/-31)
parser/libapparmor_re/chfa.cc (+14/-6)
parser/libapparmor_re/chfa.h (+5/-0)
parser/libapparmor_re/expr-tree.cc (+62/-42)
parser/libapparmor_re/expr-tree.h (+15/-2)
parser/libapparmor_re/flex-tables.h (+1/-0)
parser/libapparmor_re/hfa.cc (+459/-38)
parser/libapparmor_re/hfa.h (+51/-8)
parser/libapparmor_re/parse.y (+2/-1)
parser/mount.c (+15/-7)
parser/parser.h (+65/-130)
parser/parser_alias.c (+34/-31)
parser/parser_common.c (+5/-6)
parser/parser_include.c (+16/-10)
parser/parser_include.h (+2/-2)
parser/parser_interface.c (+87/-108)
parser/parser_lex.l (+409/-508)
parser/parser_main.c (+266/-203)
parser/parser_merge.c (+47/-79)
parser/parser_misc.c (+301/-87)
parser/parser_policy.c (+195/-609)
parser/parser_regex.c (+577/-341)
parser/parser_symtab.c (+67/-61)
parser/parser_variable.c (+182/-124)
parser/parser_yacc.y (+295/-232)
parser/po/af.po (+433/-372)
parser/po/apparmor-parser.pot (+199/-89)
parser/po/ar.po (+430/-254)
parser/po/bg.po (+373/-251)
parser/po/bn.po (+396/-310)
parser/po/bs.po (+360/-227)
parser/po/ca.po (+412/-313)
parser/po/cs.po (+437/-253)
parser/po/cy.po (+360/-227)
parser/po/da.po (+387/-234)
parser/po/de.po (+467/-269)
parser/po/el.po (+423/-284)
parser/po/en_AU.po (+653/-0)
parser/po/en_CA.po (+653/-0)
parser/po/en_GB.po (+569/-335)
parser/po/en_US.po (+0/-437)
parser/po/es.po (+446/-260)
parser/po/et.po (+381/-280)
parser/po/fi.po (+414/-248)
parser/po/fr.po (+499/-303)
parser/po/gl.po (+359/-225)
parser/po/gu.po (+427/-369)
parser/po/he.po (+360/-227)
parser/po/hi.po (+397/-298)
parser/po/hr.po (+415/-252)
parser/po/hu.po (+347/-228)
parser/po/id.po (+358/-222)
parser/po/it.po (+472/-271)
parser/po/ja.po (+398/-236)
parser/po/ka.po (+359/-329)
parser/po/km.po (+409/-246)
parser/po/ko.po (+379/-230)
parser/po/lo.po (+360/-226)
parser/po/lt.po (+383/-266)
parser/po/mk.po (+360/-226)
parser/po/mr.po (+434/-376)
parser/po/ms.po (+653/-0)
parser/po/nb.po (+381/-234)
parser/po/nl.po (+457/-264)
parser/po/oc.po (+653/-0)
parser/po/pa.po (+382/-278)
parser/po/pl.po (+422/-251)
parser/po/pt.po (+423/-253)
parser/po/pt_BR.po (+459/-264)
parser/po/ro.po (+414/-265)
parser/po/ru.po (+438/-261)
parser/po/si.po (+360/-226)
parser/po/sk.po (+379/-261)
parser/po/sl.po (+379/-262)
parser/po/sq.po (+653/-0)
parser/po/sr.po (+360/-226)
parser/po/sv.po (+453/-262)
parser/po/ta.po (+401/-309)
parser/po/th.po (+376/-252)
parser/po/tr.po (+419/-349)
parser/po/ug.po (+653/-0)
parser/po/uk.po (+441/-258)
parser/po/vi.po (+360/-226)
parser/po/wa.po (+371/-249)
parser/po/xh.po (+457/-384)
parser/po/zh_CN.po (+397/-236)
parser/po/zh_TW.po (+397/-236)
parser/po/zu.po (+413/-318)
parser/policydb.h (+3/-2)
parser/profile.cc (+95/-0)
parser/profile.h (+242/-0)
parser/subdomain.conf.pod (+1/-1)
parser/tst/Makefile (+19/-8)
parser/tst/README (+5/-1)
parser/tst/caching.py (+438/-0)
parser/tst/caching.sh (+0/-129)
parser/tst/equality.sh (+235/-0)
parser/tst/gen-dbus.pl (+167/-0)
parser/tst/minimize.sh (+11/-8)
parser/tst/simple.pl (+29/-17)
parser/tst/simple_tests/capability/bad_5.sd (+9/-0)
parser/tst/simple_tests/capability/bad_6.sd (+9/-0)
parser/tst/simple_tests/capability/ok_allow1.sd (+41/-0)
parser/tst/simple_tests/capability/ok_allow10.sd (+11/-0)
parser/tst/simple_tests/capability/ok_allow2.sd (+101/-0)
parser/tst/simple_tests/capability/ok_allow3.sd (+11/-0)
parser/tst/simple_tests/capability/ok_allow4.sd (+41/-0)
parser/tst/simple_tests/capability/ok_allow5.sd (+102/-0)
parser/tst/simple_tests/capability/ok_allow6.sd (+11/-0)
parser/tst/simple_tests/capability/ok_allow7.sd (+9/-0)
parser/tst/simple_tests/capability/ok_allow8.sd (+11/-0)
parser/tst/simple_tests/capability/ok_allow9.sd (+9/-0)
parser/tst/simple_tests/capability/ok_dup_allow1.sd (+12/-0)
parser/tst/simple_tests/capability/ok_dup_allow2.sd (+12/-0)
parser/tst/simple_tests/capability/ok_dup_allow3.sd (+14/-0)
parser/tst/simple_tests/capability/ok_dup_allow4.sd (+14/-0)
parser/tst/simple_tests/capability/ok_dup_allow5.sd (+17/-0)
parser/tst/simple_tests/capability/ok_dup_allow6.sd (+16/-0)
parser/tst/simple_tests/dbus/bad_bind_1.sd (+8/-0)
parser/tst/simple_tests/dbus/bad_bind_2.sd (+8/-0)
parser/tst/simple_tests/dbus/bad_eavesdrop_1.sd (+7/-0)
parser/tst/simple_tests/dbus/bad_modifier_1.sd (+7/-0)
parser/tst/simple_tests/dbus/ok_eavesdrop_1.sd (+7/-0)
parser/tst/simple_tests/file/allow/ok_1.sd (+8/-0)
parser/tst/simple_tests/file/allow/ok_3.sd (+10/-0)
parser/tst/simple_tests/file/allow/ok_append_1.sd (+14/-0)
parser/tst/simple_tests/file/allow/ok_carat_1.sd (+8/-0)
parser/tst/simple_tests/file/allow/ok_carat_2.sd (+8/-0)
parser/tst/simple_tests/file/allow/ok_comma_1.sd (+8/-0)
parser/tst/simple_tests/file/allow/ok_comma_2.sd (+8/-0)
parser/tst/simple_tests/file/allow/ok_embedded_spaces_1.sd (+7/-0)
parser/tst/simple_tests/file/allow/ok_embedded_spaces_2.sd (+7/-0)
parser/tst/simple_tests/file/allow/ok_embedded_spaces_3.sd (+7/-0)
parser/tst/simple_tests/file/allow/ok_inv_char_class.sd (+8/-0)
parser/tst/simple_tests/file/allow/ok_lock_1.sd (+18/-0)
parser/tst/simple_tests/file/allow/ok_mmap_1.sd (+13/-0)
parser/tst/simple_tests/file/allow/ok_mmap_2.sd (+15/-0)
parser/tst/simple_tests/file/allow/ok_other_1.sd (+7/-0)
parser/tst/simple_tests/file/allow/ok_other_2.sd (+7/-0)
parser/tst/simple_tests/file/bad_append_2.sd (+8/-0)
parser/tst/simple_tests/file/bad_re_brace_1.sd (+8/-0)
parser/tst/simple_tests/file/bad_re_brace_2.sd (+8/-0)
parser/tst/simple_tests/file/bad_re_brace_3.sd (+8/-0)
parser/tst/simple_tests/file/file/ok_alternations_1.sd (+7/-0)
parser/tst/simple_tests/file/file/ok_alternations_2.sd (+7/-0)
parser/tst/simple_tests/file/ok_2.sd (+7/-0)
parser/tst/simple_tests/file/ok_4.sd (+7/-0)
parser/tst/simple_tests/file/ok_5.sd (+7/-0)
parser/tst/simple_tests/file/ok_alternations_1.sd (+7/-0)
parser/tst/simple_tests/file/ok_alternations_2.sd (+7/-0)
parser/tst/simple_tests/file/ok_alternations_3.sd (+8/-0)
parser/tst/simple_tests/file/ok_deny_1.sd (+9/-0)
parser/tst/simple_tests/file/ok_deny_2.sd (+9/-0)
parser/tst/simple_tests/file/ok_deny_3.sd (+10/-0)
parser/tst/simple_tests/file/ok_deny_4.sd (+10/-0)
parser/tst/simple_tests/file/ok_link_1.sd (+10/-0)
parser/tst/simple_tests/file/ok_link_2.sd (+10/-0)
parser/tst/simple_tests/file/ok_link_3.sd (+10/-0)
parser/tst/simple_tests/file/ok_octal_1.sd (+8/-0)
parser/tst/simple_tests/file/ok_octal_2.sd (+8/-0)
parser/tst/simple_tests/file/ok_other_1.sd (+7/-0)
parser/tst/simple_tests/file/ok_other_2.sd (+7/-0)
parser/tst/simple_tests/file/ok_other_3.sd (+7/-0)
parser/tst/simple_tests/file/ok_quoted_1.sd (+9/-0)
parser/tst/simple_tests/file/ok_quoted_2.sd (+9/-0)
parser/tst/simple_tests/file/ok_quoted_3.sd (+9/-0)
parser/tst/simple_tests/file/ok_quoted_4.sd (+9/-0)
parser/tst/simple_tests/file/ok_quoted_5.sd (+9/-0)
parser/tst/simple_tests/file/ok_slashquote_1.sd (+8/-0)
parser/tst/simple_tests/file/owner/ok_alternations_1.sd (+7/-0)
parser/tst/simple_tests/file/owner/ok_alternations_2.sd (+7/-0)
parser/tst/simple_tests/network/network_bad_5.sd (+0/-7)
parser/tst/simple_tests/network/network_bad_6.sd (+0/-7)
parser/tst/simple_tests/network/network_ok_5.sd (+7/-0)
parser/tst/simple_tests/network/network_ok_6.sd (+7/-0)
parser/tst/simple_tests/profile/flags/flags_bad14.sd (+10/-0)
parser/tst/simple_tests/profile/flags/flags_bad15.sd (+10/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_01.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_02.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_03.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_04.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_05.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_06.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_07.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_08.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_09.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_10.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_11.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_12.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_13.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_14.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_15.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_16.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_17.sd (+7/-0)
parser/tst/simple_tests/rlimits/ok_rlimit_18.sd (+7/-0)
parser/tst/simple_tests/vars/vars_alternation_3.sd (+8/-0)
parser/tst/simple_tests/vars/vars_alternation_4.sd (+8/-0)
parser/tst/simple_tests/vars/vars_alternation_5.sd (+8/-0)
parser/tst/simple_tests/vars/vars_bad_6.sd (+7/-0)
parser/tst/simple_tests/vars/vars_bad_7.sd (+7/-0)
parser/tst/simple_tests/vars/vars_bad_8.sd (+7/-0)
parser/tst/simple_tests/vars/vars_bad_add_assignment_1.sd (+10/-0)
parser/tst/simple_tests/vars/vars_dbus_1.sd (+11/-0)
parser/tst/simple_tests/vars/vars_dbus_10.sd (+14/-0)
parser/tst/simple_tests/vars/vars_dbus_11.sd (+14/-0)
parser/tst/simple_tests/vars/vars_dbus_2.sd (+11/-0)
parser/tst/simple_tests/vars/vars_dbus_3.sd (+10/-0)
parser/tst/simple_tests/vars/vars_dbus_4.sd (+13/-0)
parser/tst/simple_tests/vars/vars_dbus_5.sd (+12/-0)
parser/tst/simple_tests/vars/vars_dbus_6.sd (+11/-0)
parser/tst/simple_tests/vars/vars_dbus_7.sd (+11/-0)
parser/tst/simple_tests/vars/vars_dbus_8.sd (+13/-0)
parser/tst/simple_tests/vars/vars_dbus_9.sd (+18/-0)
parser/tst/simple_tests/xtrans/x-conflict2.sd (+39/-0)
parser/tst/testlib.py (+199/-0)
parser/tst/valgrind_simple.py (+121/-0)
parser/unit_test.h (+57/-0)
profiles/Makefile (+25/-26)
profiles/apparmor-profiles.spec.in (+1/-1)
profiles/apparmor.d/abstractions/X (+6/-2)
profiles/apparmor.d/abstractions/apache2-common (+1/-1)
profiles/apparmor.d/abstractions/apparmor_api/change_profile (+11/-0)
profiles/apparmor.d/abstractions/apparmor_api/examine (+12/-0)
profiles/apparmor.d/abstractions/apparmor_api/find_mountpoint (+14/-0)
profiles/apparmor.d/abstractions/apparmor_api/introspect (+12/-0)
profiles/apparmor.d/abstractions/apparmor_api/is_enabled (+17/-0)
profiles/apparmor.d/abstractions/audio (+6/-3)
profiles/apparmor.d/abstractions/base (+4/-1)
profiles/apparmor.d/abstractions/bash (+2/-2)
profiles/apparmor.d/abstractions/cups-client (+1/-1)
profiles/apparmor.d/abstractions/dbus (+6/-3)
profiles/apparmor.d/abstractions/dbus-accessibility (+16/-0)
profiles/apparmor.d/abstractions/dbus-accessibility-strict (+17/-0)
profiles/apparmor.d/abstractions/dbus-session (+6/-2)
profiles/apparmor.d/abstractions/dbus-session-strict (+21/-0)
profiles/apparmor.d/abstractions/dbus-strict (+19/-0)
profiles/apparmor.d/abstractions/dconf (+7/-0)
profiles/apparmor.d/abstractions/fonts (+19/-8)
profiles/apparmor.d/abstractions/freedesktop.org (+1/-0)
profiles/apparmor.d/abstractions/gnome (+15/-13)
profiles/apparmor.d/abstractions/gnupg (+6/-6)
profiles/apparmor.d/abstractions/kde (+7/-7)
profiles/apparmor.d/abstractions/kerberosclient (+1/-1)
profiles/apparmor.d/abstractions/mysql (+4/-2)
profiles/apparmor.d/abstractions/nameservice (+8/-2)
profiles/apparmor.d/abstractions/nvidia (+5/-2)
profiles/apparmor.d/abstractions/openssl (+1/-0)
profiles/apparmor.d/abstractions/p11-kit (+6/-0)
profiles/apparmor.d/abstractions/private-files (+2/-0)
profiles/apparmor.d/abstractions/private-files-strict (+3/-0)
profiles/apparmor.d/abstractions/python (+10/-10)
profiles/apparmor.d/abstractions/ruby (+10/-14)
profiles/apparmor.d/abstractions/samba (+3/-0)
profiles/apparmor.d/abstractions/ssl_certs (+2/-0)
profiles/apparmor.d/abstractions/ubuntu-browsers.d/java (+13/-11)
profiles/apparmor.d/abstractions/ubuntu-browsers.d/multimedia (+6/-5)
profiles/apparmor.d/abstractions/ubuntu-browsers.d/plugins-common (+1/-1)
profiles/apparmor.d/abstractions/ubuntu-browsers.d/ubuntu-integration (+10/-0)
profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files (+0/-1)
profiles/apparmor.d/abstractions/ubuntu-helpers (+7/-3)
profiles/apparmor.d/abstractions/ubuntu-konsole (+3/-3)
profiles/apparmor.d/abstractions/ubuntu-unity7-base (+167/-0)
profiles/apparmor.d/abstractions/ubuntu-unity7-launcher (+7/-0)
profiles/apparmor.d/abstractions/ubuntu-unity7-messaging (+7/-0)
profiles/apparmor.d/abstractions/user-download (+5/-2)
profiles/apparmor.d/abstractions/user-write (+10/-9)
profiles/apparmor.d/abstractions/web-data (+4/-0)
profiles/apparmor.d/abstractions/winbind (+2/-0)
profiles/apparmor.d/apache2.d/phpsysinfo (+1/-1)
profiles/apparmor.d/bin.ping (+1/-1)
profiles/apparmor.d/tunables/apparmorfs (+11/-0)
profiles/apparmor.d/tunables/dovecot (+20/-0)
profiles/apparmor.d/tunables/global (+3/-1)
profiles/apparmor.d/tunables/kernelvars (+22/-0)
profiles/apparmor.d/tunables/securityfs (+12/-0)
profiles/apparmor.d/tunables/sys (+10/-0)
profiles/apparmor.d/tunables/xdg-user-dirs (+24/-0)
profiles/apparmor.d/tunables/xdg-user-dirs.d/site.local (+21/-0)
profiles/apparmor.d/usr.lib.dovecot.anvil (+25/-0)
profiles/apparmor.d/usr.lib.dovecot.auth (+42/-0)
profiles/apparmor.d/usr.lib.dovecot.config (+32/-0)
profiles/apparmor.d/usr.lib.dovecot.deliver (+19/-10)
profiles/apparmor.d/usr.lib.dovecot.dict (+30/-0)
profiles/apparmor.d/usr.lib.dovecot.dovecot-auth (+13/-2)
profiles/apparmor.d/usr.lib.dovecot.dovecot-lda (+33/-0)
profiles/apparmor.d/usr.lib.dovecot.imap (+17/-12)
profiles/apparmor.d/usr.lib.dovecot.imap-login (+11/-1)
profiles/apparmor.d/usr.lib.dovecot.lmtp (+35/-0)
profiles/apparmor.d/usr.lib.dovecot.log (+25/-0)
profiles/apparmor.d/usr.lib.dovecot.managesieve (+23/-0)
profiles/apparmor.d/usr.lib.dovecot.managesieve-login (+12/-1)
profiles/apparmor.d/usr.lib.dovecot.pop3 (+17/-8)
profiles/apparmor.d/usr.lib.dovecot.pop3-login (+12/-1)
profiles/apparmor.d/usr.lib.dovecot.ssl-params (+27/-0)
profiles/apparmor.d/usr.sbin.apache2 (+83/-0)
profiles/apparmor.d/usr.sbin.avahi-daemon (+1/-1)
profiles/apparmor.d/usr.sbin.dnsmasq (+8/-2)
profiles/apparmor.d/usr.sbin.dovecot (+33/-9)
profiles/apparmor.d/usr.sbin.nmbd (+3/-1)
profiles/apparmor.d/usr.sbin.nscd (+7/-13)
profiles/apparmor.d/usr.sbin.ntpd (+5/-8)
profiles/apparmor.d/usr.sbin.smbd (+7/-6)
profiles/apparmor.d/usr.sbin.winbindd (+34/-0)
profiles/apparmor/profiles/extras/README (+5/-5)
profiles/apparmor/profiles/extras/bin.netstat (+10/-10)
profiles/apparmor/profiles/extras/etc.cron.daily.logrotate (+1/-1)
profiles/apparmor/profiles/extras/sbin.dhclient (+1/-1)
profiles/apparmor/profiles/extras/usr.bin.evolution-2.10 (+1/-1)
profiles/apparmor/profiles/extras/usr.bin.gaim (+1/-1)
profiles/apparmor/profiles/extras/usr.bin.opera (+1/-1)
profiles/apparmor/profiles/extras/usr.bin.skype (+59/-18)
profiles/apparmor/profiles/extras/usr.lib.firefox.firefox (+8/-8)
profiles/apparmor/profiles/extras/usr.sbin.cupsd (+2/-2)
profiles/apparmor/profiles/extras/usr.sbin.smbd (+1/-1)
profiles/apparmor/profiles/extras/usr.sbin.squid (+1/-1)
profiles/apparmor/profiles/extras/usr.sbin.sshd (+14/-8)
profiles/apparmor/profiles/extras/usr.sbin.useradd (+1/-1)
profiles/apparmor/profiles/extras/usr.sbin.userdel (+1/-1)
tests/regression/apparmor/Makefile (+82/-33)
tests/regression/apparmor/README (+2/-2)
tests/regression/apparmor/capabilities.sh (+88/-0)
tests/regression/apparmor/changehat.h (+3/-46)
tests/regression/apparmor/changehat_twice.c (+2/-1)
tests/regression/apparmor/changehat_wrapper.c (+1/-1)
tests/regression/apparmor/clone.c (+3/-1)
tests/regression/apparmor/coredump.sh (+42/-10)
tests/regression/apparmor/dbus.conf (+30/-0)
tests/regression/apparmor/dbus.inc (+118/-0)
tests/regression/apparmor/dbus_common.c (+254/-0)
tests/regression/apparmor/dbus_common.h (+29/-0)
tests/regression/apparmor/dbus_eavesdrop.c (+148/-0)
tests/regression/apparmor/dbus_eavesdrop.sh (+77/-0)
tests/regression/apparmor/dbus_message.c (+325/-0)
tests/regression/apparmor/dbus_message.sh (+154/-0)
tests/regression/apparmor/dbus_service.c (+313/-0)
tests/regression/apparmor/dbus_service.sh (+138/-0)
tests/regression/apparmor/fd_inheritance.c (+59/-0)
tests/regression/apparmor/fd_inheritance.sh (+76/-0)
tests/regression/apparmor/fd_inheritor.c (+61/-0)
tests/regression/apparmor/introspect.c (+3/-2)
tests/regression/apparmor/mkprofile.pl (+13/-3)
tests/regression/apparmor/onexec.sh (+4/-1)
tests/regression/apparmor/prologue.inc (+37/-2)
tests/regression/apparmor/query_label.c (+180/-0)
tests/regression/apparmor/query_label.sh (+207/-0)
tests/regression/apparmor/unix_fd_server.sh (+90/-17)
tests/regression/apparmor/unix_socket_file.c (+177/-0)
tests/regression/apparmor/unix_socket_file.sh (+105/-0)
tests/regression/apparmor/unix_socket_file_client.c (+126/-0)
tests/regression/apparmor/uservars.inc (+0/-15)
tests/regression/apparmor/uservars.inc.source (+14/-0)
tests/regression/apparmor/uservars.inc.system (+14/-0)
utils/Immunix/AppArmor.pm (+0/-6800)
utils/Immunix/Config.pm (+0/-124)
utils/Immunix/Reports.pm (+0/-2024)
utils/Immunix/Repository.pm (+0/-354)
utils/Immunix/Severity.pm (+0/-221)
utils/Makefile (+14/-19)
utils/README.md (+3/-0)
utils/aa-audit (+29/-120)
utils/aa-audit.pod (+17/-4)
utils/aa-autodep (+19/-110)
utils/aa-autodep.pod (+16/-2)
utils/aa-cleanprof (+31/-0)
utils/aa-cleanprof.pod (+39/-0)
utils/aa-complain (+18/-119)
utils/aa-complain.pod (+13/-6)
utils/aa-decode (+28/-12)
utils/aa-disable (+18/-139)
utils/aa-disable.pod (+14/-7)
utils/aa-easyprof (+63/-30)
utils/aa-easyprof.pod (+168/-3)
utils/aa-enforce (+18/-130)
utils/aa-enforce.pod (+15/-8)
utils/aa-eventd (+0/-940)
utils/aa-exec (+1/-3)
utils/aa-exec.pod (+1/-1)
utils/aa-genprof (+148/-199)
utils/aa-genprof.pod (+12/-4)
utils/aa-logprof (+40/-59)
utils/aa-logprof.pod (+21/-11)
utils/aa-mergeprof (+678/-0)
utils/aa-mergeprof.pod (+33/-0)
utils/aa-repo.pl (+0/-821)
utils/aa-sandbox (+36/-0)
utils/aa-sandbox.pod (+214/-0)
utils/aa-status (+1/-1)
utils/aa-status.pod (+1/-1)
utils/aa-unconfined (+82/-101)
utils/aa-unconfined.pod (+10/-3)
utils/apparmor/__init__.py (+1/-0)
utils/apparmor/aa.py (+4392/-0)
utils/apparmor/aamode.py (+280/-0)
utils/apparmor/cleanprofile.py (+153/-0)
utils/apparmor/common.py (+289/-0)
utils/apparmor/config.py (+297/-0)
utils/apparmor/easyprof.py (+646/-89)
utils/apparmor/logparser.py (+395/-0)
utils/apparmor/rules.py (+57/-0)
utils/apparmor/sandbox.py (+726/-0)
utils/apparmor/severity.py (+208/-0)
utils/apparmor/tools.py (+266/-0)
utils/apparmor/translations.py (+21/-0)
utils/apparmor/ui.py (+449/-0)
utils/apparmor/yasti.py (+106/-0)
utils/convert-profile.pl (+0/-135)
utils/easyprof/policygroups/networking (+0/-2)
utils/easyprof/templates/default (+1/-1)
utils/easyprof/templates/sandbox (+29/-0)
utils/easyprof/templates/sandbox-x (+46/-0)
utils/easyprof/templates/user-application (+1/-1)
utils/logprof.conf (+28/-3)
utils/logprof.conf.pod (+1/-1)
utils/po/Makefile (+1/-1)
utils/po/README (+10/-0)
utils/po/af.po (+0/-943)
utils/po/apparmor-utils.pot (+349/-0)
utils/po/ar.po (+0/-640)
utils/po/bg.po (+0/-927)
utils/po/bn.po (+0/-935)
utils/po/bs.po (+267/-432)
utils/po/ca.po (+0/-945)
utils/po/cs.po (+0/-640)
utils/po/cy.po (+0/-875)
utils/po/da.po (+0/-775)
utils/po/de.po (+498/-311)
utils/po/el.po (+0/-784)
utils/po/en_GB.po (+0/-561)
utils/po/en_US.po (+0/-755)
utils/po/es.po (+0/-640)
utils/po/et.po (+0/-891)
utils/po/fi.po (+0/-778)
utils/po/fr.po (+468/-291)
utils/po/gl.po (+0/-879)
utils/po/gu.po (+0/-937)
utils/po/he.po (+0/-874)
utils/po/hi.po (+414/-397)
utils/po/hr.po (+0/-946)
utils/po/hu.po (+0/-839)
utils/po/id.po (+0/-889)
utils/po/it.po (+0/-640)
utils/po/ja.po (+0/-640)
utils/po/ka.po (+0/-865)
utils/po/km.po (+0/-774)
utils/po/ko.po (+497/-414)
utils/po/lo.po (+0/-864)
utils/po/lt.po (+0/-896)
utils/po/mk.po (+0/-868)
utils/po/mr.po (+0/-943)
utils/po/nb.po (+0/-771)
utils/po/nl.po (+0/-640)
utils/po/pa.po (+0/-740)
utils/po/pl.po (+0/-765)
utils/po/pt.po (+0/-773)
utils/po/pt_BR.po (+0/-640)
utils/po/pt_PT.po (+0/-206)
utils/po/ro.po (+0/-773)
utils/po/ru.po (+580/-400)
utils/po/si.po (+0/-864)
utils/po/sk.po (+0/-920)
utils/po/sl.po (+0/-934)
utils/po/sr.po (+0/-887)
utils/po/sv.po (+0/-640)
utils/po/ta.po (+0/-941)
utils/po/th.po (+0/-741)
utils/po/tr.po (+0/-910)
utils/po/uk.po (+377/-428)
utils/po/vi.po (+0/-868)
utils/po/wa.po (+0/-904)
utils/po/xh.po (+0/-941)
utils/po/zh_CN.po (+0/-640)
utils/po/zh_TW.po (+0/-640)
utils/po/zu.po (+0/-943)
utils/python-tools-setup.py (+10/-1)
utils/repair_obsolete_profiles (+0/-201)
utils/severity.db (+1/-0)
utils/test/Makefile (+41/-0)
utils/test/aa_test.py (+130/-0)
utils/test/cleanprof_test.in (+19/-0)
utils/test/cleanprof_test.out (+17/-0)
utils/test/common_test.py (+41/-0)
utils/test/config_test.py (+52/-0)
utils/test/logprof.conf (+131/-0)
utils/test/minitools_test.py (+142/-0)
utils/test/regex_tests.ini (+51/-0)
utils/test/runtests-py2.sh (+1/-0)
utils/test/runtests-py3.sh (+1/-0)
utils/test/severity.db (+460/-0)
utils/test/severity_broken.db (+460/-0)
utils/test/severity_test.py (+90/-0)
utils/test/test-aa-decode.py (+203/-0)
utils/test/test-aa-easyprof.py (+1654/-36)
utils/test/test-dbus_parse.py (+30/-0)
utils/test/test-regex_matches.py (+124/-0)
utils/vim/Makefile (+13/-5)
utils/vim/apparmor.vim.in (+10/-50)
utils/vim/apparmor.vim.pod (+58/-0)
utils/vim/create-apparmor.vim.py (+101/-40)
To merge this branch: bzr merge lp://qastaging/~apparmor-dev/apparmor/apparmor-ubuntu-citrain.2.8.95-trusty
Reviewer Review Type Date Requested Status
Jamie Strandboge Approve
Review via email: mp+211974@code.qastaging.launchpad.net

Description of the change

Updating Seth's original MP in https://code.launchpad.net/~apparmor-dev/apparmor/aa-2.8.95/+merge/210901:

This AppArmor merge is based on the "trunk" of AppArmor upstream repository; because downstream consumers include a variety of package management systems where we have had trouble with -rc releases in the past, this is labeled 2.8.95 to be strictly less than 2.9 when that is eventually released. It is more in common with the forth-coming 2.9 than with the older 2.8.

This merge dropped many distro-patches which were upstreamed and adds several patches from upstream that are not yet in the repository, for functionalities highly desired for Ubuntu trusty.

> [TBD] Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

Yes, this pull was current as of 2014-03-11. Some upstream commiters are not Ubuntu members nor Canonical employees, but all commits require sign-off from other upstream commiters.

> Did you build your software in a clean sbuild/pbuilder chroot or ppa?

Yes, sbuild with schroot.

> Did you build your software in a clean sbuild/pbuilder chroot or ppa on armhf? (needed for TestPlan)

A build is currently queued in the security-private PPA.

> Has your component TestPlan been executed successfully on emulator/armhf Touch build (eg, one of N4, N10, N7 (either), Galaxy Nexus) and clean Ubuntu Desktop VM?

Yes. Desktop/Server VM and also on N4. Run on dogfooding N4 and on laptop.

> Has a 5 minute exploratory testing run been executed on an armhf Touch build (eg, one of N4, N10, N7 (either), Galaxy Nexus)?

Yes, N4 and N7.

> If you changed the packaging (debian/), did you subscribe a core-dev to this MP?

Yes, jdstrand reviewed.

> What components might get impacted by your changes?

AppArmor confinement provides the basis for touch application confinement, LXC confinement, libvirt-managed kvm confinement, in addition to confining specific daemons, services, and programs. Nearly everything may be impacted by AppArmor.

> Have you requested review by the teams of these owning components?

No, it is not expected that others should be capable of reviewing these changes; both server team and touch teams are expecting the new features to be provided by this package.

To post a comment you must log in.
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

I did a separate MP based on https://code.launchpad.net/~apparmor-dev/apparmor/aa-2.8.95/+merge/210901 to fix missing autoconf files and debian/changelog. All of Seth's changes look good. It is well tested and ready.

review: Approve
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

MP Review Checklist
* Are any changes against your component pending/needed to land the MP under review in a functional state and are those called out explicitly by the submitter? no
* Did you do exploratory testing related to the component you own with the MP changeset included? yes
* Has the submitter requested review by all the relevant teams/reviewers? yes
* If you are the reviewer owning the component the MP is against, have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut? yes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: