Merge lp://staging/~apparmor-dev/apparmor/aa-2.8.95 into lp://staging/apparmor/2.12
Proposed by
Seth Arnold
| Status: | Rejected |
|---|---|
| Rejected by: | Jamie Strandboge |
| Proposed branch: | lp://staging/~apparmor-dev/apparmor/aa-2.8.95 |
| Merge into: | lp://staging/apparmor/2.12 |
| Diff against target: |
119742 lines (+72832/-42978) (has conflicts) 681 files modified
.bzrignore (+167/-0) common/.stamp_rev (+1/-0) debian/aa-update-browser (+148/-0) debian/aa-update-browser.8 (+42/-0) debian/apparmor-docs.doc-base (+8/-0) debian/apparmor-docs.docs (+1/-0) debian/apparmor-easyprof.install (+3/-0) debian/apparmor-easyprof.manpages (+1/-0) debian/apparmor-notify.install (+3/-0) debian/apparmor-notify.manpages (+1/-0) debian/apparmor-profiles.dirs (+1/-0) debian/apparmor-profiles.install (+121/-0) debian/apparmor-profiles.postinst (+73/-0) debian/apparmor-profiles.postrm (+36/-0) debian/apparmor-utils.dirs (+4/-0) debian/apparmor-utils.install (+17/-0) debian/apparmor-utils.manpages (+13/-0) debian/apparmor.config (+9/-0) debian/apparmor.dirs (+10/-0) debian/apparmor.init (+166/-0) debian/apparmor.install (+21/-0) debian/apparmor.maintscript (+3/-0) debian/apparmor.manpages (+8/-0) debian/apparmor.postinst (+121/-0) debian/apparmor.postrm (+47/-0) debian/apparmor.preinst (+23/-0) debian/apparmor.prerm (+23/-0) debian/apport/source_apparmor.py (+72/-0) debian/changelog (+2677/-0) debian/clean (+34/-0) debian/compat (+1/-0) debian/control (+173/-0) debian/copyright (+133/-0) debian/debhelper/dh_apparmor (+131/-0) debian/debhelper/postinst-apparmor (+23/-0) debian/debhelper/postrm-apparmor (+6/-0) debian/dh-apparmor.install (+3/-0) debian/dh-apparmor.manpages (+1/-0) debian/etc/apache2/mods-available/apparmor.load (+1/-0) debian/lib/apparmor/functions (+117/-0) debian/libapache2-mod-apparmor.apache2 (+2/-0) debian/libapache2-mod-apparmor.dirs (+1/-0) debian/libapache2-mod-apparmor.install (+2/-0) debian/libapache2-mod-apparmor.maintscript (+2/-0) debian/libapache2-mod-apparmor.manpages (+1/-0) debian/libapache2-mod-apparmor.postinst (+49/-0) debian/libapache2-mod-apparmor.postrm (+10/-0) debian/libapache2-mod-apparmor.preinst (+24/-0) debian/libapparmor-dev.install (+5/-0) debian/libapparmor-dev.manpages (+4/-0) debian/libapparmor-perl.install (+1/-0) debian/libapparmor1.install (+1/-0) debian/libapparmor1.symbols (+24/-0) debian/libpam-apparmor.docs (+1/-0) debian/libpam-apparmor.install (+1/-0) debian/non-linux/apparmor_parser (+3/-0) debian/notify/90apparmor-notify (+15/-0) debian/notify/notify.conf (+15/-0) debian/patches/0001-add-chromium-browser.patch (+230/-0) debian/patches/0002-add-debian-integration-to-lighttpd.patch (+25/-0) debian/patches/0003-ubuntu-manpage-updates.patch (+92/-0) debian/patches/0004-libapparmor-layout-deb.patch (+36/-0) debian/patches/0005-libapparmor-mention-dbus-method-in-getcon-man.patch (+43/-0) debian/patches/0006-etc-writable.patch (+68/-0) debian/patches/0007-aa-utils_are_bilingual.patch (+129/-0) debian/patches/0007-sanitized_helper_dbus_access.patch (+21/-0) debian/patches/0008-libapparmor-adjust_symbol_map-more_invasive_version.patch (+55/-0) debian/patches/0008-remove-ptrace.patch (+167/-0) debian/patches/0009-convert-to-rules.patch (+2411/-0) debian/patches/0009-libapparmor2.patch (+26/-0) debian/patches/0009-uservars-inc-use-system-support.patch (+95/-0) debian/patches/0010-list-fns.patch (+109/-0) debian/patches/0011-parse-mode.patch (+194/-0) debian/patches/0012-add-decimal-interp.patch (+198/-0) debian/patches/0013-policy_mediates.patch (+67/-0) debian/patches/0014-fix-failpath.patch (+35/-0) debian/patches/0015-feature_file.patch (+574/-0) debian/patches/0016-fix-network.patch (+41/-0) debian/patches/0017-aare-to-class.patch (+624/-0) debian/patches/0018-add-mediation-unix.patch (+118/-0) debian/patches/0019-parser_version.patch (+295/-0) debian/patches/0020-caching.patch (+62/-0) debian/patches/0021-label-class.patch (+32/-0) debian/patches/0022-signal.patch (+731/-0) debian/patches/0023-fix-lexer-debug.patch (+86/-0) debian/patches/0024-ptrace.patch (+527/-0) debian/patches/0025-use-diff-encode.patch (+63/-0) debian/patches/0026-fix-serialize.patch (+765/-0) debian/patches/0027-fix-af.patch (+17/-0) debian/patches/0028-opt_arg.patch (+467/-0) debian/patches/0029-tests-cond-dbus.patch (+64/-0) debian/patches/0030-tests.diff (+704/-0) debian/patches/series (+30/-0) debian/po/POTFILES.in (+1/-0) debian/po/cs.po (+44/-0) debian/po/da.po (+44/-0) debian/po/de.po (+45/-0) debian/po/es.po (+56/-0) debian/po/fr.po (+46/-0) debian/po/it.po (+44/-0) debian/po/ja.po (+45/-0) debian/po/nl.po (+45/-0) debian/po/pt.po (+45/-0) debian/po/ru.po (+49/-0) debian/po/sv.po (+46/-0) debian/po/templates.pot (+40/-0) debian/po/zh_CN.po (+43/-0) debian/profiles/chromium-browser (+15/-0) debian/put-all-profiles-in-complain-mode.sh (+18/-0) debian/python-apparmor.install (+1/-0) debian/python-libapparmor.install (+1/-0) debian/python3-apparmor.install (+1/-0) debian/python3-libapparmor.install (+1/-0) debian/rules (+169/-0) debian/source/format (+1/-0) debian/templates (+9/-0) debian/vim-apparmor.yaml (+5/-0) debian/watch (+2/-0) deprecated/management/apparmor-dbus/AUTHORS (+0/-1) deprecated/management/apparmor-dbus/COPYING (+0/-340) deprecated/management/apparmor-dbus/INSTALL (+0/-167) deprecated/management/apparmor-dbus/Makefile.am (+0/-5) deprecated/management/apparmor-dbus/README (+0/-8) deprecated/management/apparmor-dbus/apparmor-dbus.spec (+0/-43) deprecated/management/apparmor-dbus/autogen.sh (+0/-31) deprecated/management/apparmor-dbus/configure.in (+0/-16) deprecated/management/apparmor-dbus/src/Makefile.am (+0/-2) deprecated/management/apparmor-dbus/src/aadbus.c (+0/-322) deprecated/management/profile-editor/AUTHORS (+0/-1) deprecated/management/profile-editor/COPYING (+0/-340) deprecated/management/profile-editor/INSTALL (+0/-167) deprecated/management/profile-editor/Makefile.am (+0/-2) deprecated/management/profile-editor/Makefile.cvs (+0/-5) deprecated/management/profile-editor/README (+0/-6) deprecated/management/profile-editor/configure.in (+0/-55) deprecated/management/profile-editor/doc/Makefile.am (+0/-4) deprecated/management/profile-editor/doc/Makefile.in (+0/-342) deprecated/management/profile-editor/doc/en/Makefile.am (+0/-2) deprecated/management/profile-editor/macros/autogen.sh (+0/-6) deprecated/management/profile-editor/profileeditor.spec (+0/-44) deprecated/management/profile-editor/src/AboutDialog.cpp (+0/-114) deprecated/management/profile-editor/src/AboutDialog.h (+0/-56) deprecated/management/profile-editor/src/Configuration.cpp (+0/-185) deprecated/management/profile-editor/src/Configuration.h (+0/-84) deprecated/management/profile-editor/src/Makefile.am (+0/-24) deprecated/management/profile-editor/src/Preferences.cpp (+0/-322) deprecated/management/profile-editor/src/Preferences.h (+0/-102) deprecated/management/profile-editor/src/ProfileDirectoryTraverser.h (+0/-43) deprecated/management/profile-editor/src/ProfileTextCtrl.cpp (+0/-115) deprecated/management/profile-editor/src/ProfileTextCtrl.h (+0/-44) deprecated/management/profile-editor/src/SearchAllProfiles.cpp (+0/-179) deprecated/management/profile-editor/src/SearchAllProfiles.h (+0/-95) deprecated/management/profile-editor/src/opensuse_logo.xpm (+0/-173) deprecated/management/profile-editor/src/profileeditor.cpp (+0/-1156) deprecated/management/profile-editor/src/profileeditor.h (+0/-136) deprecated/management/profile-editor/src/wxStyledTextCtrl/Accessor.h (+0/-78) deprecated/management/profile-editor/src/wxStyledTextCtrl/AutoComplete.cxx (+0/-174) deprecated/management/profile-editor/src/wxStyledTextCtrl/AutoComplete.h (+0/-70) deprecated/management/profile-editor/src/wxStyledTextCtrl/CallTip.cxx (+0/-270) deprecated/management/profile-editor/src/wxStyledTextCtrl/CallTip.h (+0/-65) deprecated/management/profile-editor/src/wxStyledTextCtrl/CellBuffer.cxx (+0/-1120) deprecated/management/profile-editor/src/wxStyledTextCtrl/CellBuffer.h (+0/-250) deprecated/management/profile-editor/src/wxStyledTextCtrl/ContractionState.cxx (+0/-283) deprecated/management/profile-editor/src/wxStyledTextCtrl/ContractionState.h (+0/-65) deprecated/management/profile-editor/src/wxStyledTextCtrl/Document.cxx (+0/-1593) deprecated/management/profile-editor/src/wxStyledTextCtrl/Document.h (+0/-305) deprecated/management/profile-editor/src/wxStyledTextCtrl/DocumentAccessor.cxx (+0/-186) deprecated/management/profile-editor/src/wxStyledTextCtrl/DocumentAccessor.h (+0/-67) deprecated/management/profile-editor/src/wxStyledTextCtrl/Editor.cxx (+0/-7230) deprecated/management/profile-editor/src/wxStyledTextCtrl/Editor.h (+0/-581) deprecated/management/profile-editor/src/wxStyledTextCtrl/ExternalLexer.cxx (+0/-257) deprecated/management/profile-editor/src/wxStyledTextCtrl/ExternalLexer.h (+0/-91) deprecated/management/profile-editor/src/wxStyledTextCtrl/Indicator.cxx (+0/-71) deprecated/management/profile-editor/src/wxStyledTextCtrl/Indicator.h (+0/-22) deprecated/management/profile-editor/src/wxStyledTextCtrl/KeyMap.cxx (+0/-148) deprecated/management/profile-editor/src/wxStyledTextCtrl/KeyMap.h (+0/-43) deprecated/management/profile-editor/src/wxStyledTextCtrl/KeyWords.cxx (+0/-142) deprecated/management/profile-editor/src/wxStyledTextCtrl/KeyWords.h (+0/-82) deprecated/management/profile-editor/src/wxStyledTextCtrl/LexAppArmor.cxx (+0/-189) deprecated/management/profile-editor/src/wxStyledTextCtrl/LineMarker.cxx (+0/-301) deprecated/management/profile-editor/src/wxStyledTextCtrl/LineMarker.h (+0/-50) deprecated/management/profile-editor/src/wxStyledTextCtrl/Makefile.am (+0/-19) deprecated/management/profile-editor/src/wxStyledTextCtrl/PlatWX.cpp (+0/-1396) deprecated/management/profile-editor/src/wxStyledTextCtrl/PlatWX.h (+0/-8) deprecated/management/profile-editor/src/wxStyledTextCtrl/Platform.h (+0/-506) deprecated/management/profile-editor/src/wxStyledTextCtrl/PropSet.cxx (+0/-1170) deprecated/management/profile-editor/src/wxStyledTextCtrl/PropSet.h (+0/-114) deprecated/management/profile-editor/src/wxStyledTextCtrl/RESearch.cxx (+0/-835) deprecated/management/profile-editor/src/wxStyledTextCtrl/RESearch.h (+0/-62) deprecated/management/profile-editor/src/wxStyledTextCtrl/SString.h (+0/-280) deprecated/management/profile-editor/src/wxStyledTextCtrl/SVector.h (+0/-127) deprecated/management/profile-editor/src/wxStyledTextCtrl/SciLexer.h (+0/-1023) deprecated/management/profile-editor/src/wxStyledTextCtrl/Scintilla.h (+0/-768) deprecated/management/profile-editor/src/wxStyledTextCtrl/Scintilla.iface (+0/-2938) deprecated/management/profile-editor/src/wxStyledTextCtrl/ScintillaBase.cxx (+0/-728) deprecated/management/profile-editor/src/wxStyledTextCtrl/ScintillaBase.h (+0/-95) deprecated/management/profile-editor/src/wxStyledTextCtrl/ScintillaWX.cpp (+0/-1093) deprecated/management/profile-editor/src/wxStyledTextCtrl/ScintillaWX.h (+0/-195) deprecated/management/profile-editor/src/wxStyledTextCtrl/ScintillaWidget.h (+0/-55) deprecated/management/profile-editor/src/wxStyledTextCtrl/Style.cxx (+0/-154) deprecated/management/profile-editor/src/wxStyledTextCtrl/Style.h (+0/-56) deprecated/management/profile-editor/src/wxStyledTextCtrl/StyleContext.cxx (+0/-51) deprecated/management/profile-editor/src/wxStyledTextCtrl/StyleContext.h (+0/-169) deprecated/management/profile-editor/src/wxStyledTextCtrl/UniConversion.cxx (+0/-76) deprecated/management/profile-editor/src/wxStyledTextCtrl/UniConversion.h (+0/-12) deprecated/management/profile-editor/src/wxStyledTextCtrl/ViewStyle.cxx (+0/-289) deprecated/management/profile-editor/src/wxStyledTextCtrl/ViewStyle.h (+0/-106) deprecated/management/profile-editor/src/wxStyledTextCtrl/WindowAccessor.cxx (+0/-178) deprecated/management/profile-editor/src/wxStyledTextCtrl/WindowAccessor.h (+0/-57) deprecated/management/profile-editor/src/wxStyledTextCtrl/XPM.cxx (+0/-322) deprecated/management/profile-editor/src/wxStyledTextCtrl/XPM.h (+0/-72) deprecated/management/profile-editor/src/wxStyledTextCtrl/stc.cpp (+0/-3398) deprecated/management/profile-editor/src/wxStyledTextCtrl/stc.h (+0/-2410) deprecated/management/profile-editor/src/wxStyledTextCtrl/stc_cw.h (+0/-4) deprecated/management/profile-editor/src/wxStyledTextCtrl/stc_cw_d.h (+0/-4) deprecated/management/profile-editor/src/wxStyledTextCtrl/stc_cwc.h (+0/-4) deprecated/management/profile-editor/src/wxStyledTextCtrl/stc_cwc_d.h (+0/-4) deprecated/utils/Immunix/Config.pm (+0/-124) deprecated/utils/Immunix/Reports.pm (+0/-2024) deprecated/utils/Immunix/Repository.pm (+0/-354) deprecated/utils/Immunix/Severity.pm (+0/-221) deprecated/utils/aa-audit (+29/-120) deprecated/utils/aa-autodep (+19/-110) deprecated/utils/aa-complain (+18/-119) deprecated/utils/aa-disable (+18/-139) deprecated/utils/aa-enforce (+18/-130) deprecated/utils/aa-eventd (+0/-940) deprecated/utils/aa-genprof (+156/-7) deprecated/utils/aa-logprof (+40/-59) deprecated/utils/aa-repo.pl (+0/-821) deprecated/utils/aa-status (+0/-218) deprecated/utils/aa-unconfined (+85/-7) deprecated/utils/convert-profile.pl (+0/-135) deprecated/utils/repair_obsolete_profiles (+0/-201) kernel-patches/3.0/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch (+553/-0) kernel-patches/3.0/0002-AppArmor-compatibility-patch-for-v5-interface.patch (+391/-0) kernel-patches/3.0/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch (+69/-0) kernel-patches/3.1/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch (+553/-0) kernel-patches/3.1/0002-AppArmor-compatibility-patch-for-v5-interface.patch (+391/-0) kernel-patches/3.1/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch (+69/-0) 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.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch (+553/-0) kernel-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch (+391/-0) kernel-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch (+69/-0) kernel-patches/3.3/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch (+553/-0) kernel-patches/3.3/0002-AppArmor-compatibility-patch-for-v5-interface.patch (+391/-0) kernel-patches/3.3/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch (+69/-0) kernel-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch (+264/-0) kernel-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch (+603/-0) kernel-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch (+957/-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/configure.ac (+87/-0) 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/src/libapparmor.pc.in (+10/-0) 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/test-driver (+127/-0) 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/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.in (+1/-0) libraries/libapparmor/testsuite/test_multi/testcase_encoded_comm.out (+16/-0) libraries/libapparmor/testsuite/test_multi/testcase_encoded_profile.in (+1/-0) libraries/libapparmor/testsuite/test_multi/testcase_encoded_profile.out (+16/-0) libraries/libapparmor/testsuite/test_multi/testcase_network_01.in (+1/-0) libraries/libapparmor/testsuite/test_multi/testcase_network_01.out (+18/-0) libraries/libapparmor/testsuite/test_multi/testcase_network_02.in (+1/-0) libraries/libapparmor/testsuite/test_multi/testcase_network_02.out (+16/-0) libraries/libapparmor/testsuite/test_multi/testcase_network_03.in (+1/-0) libraries/libapparmor/testsuite/test_multi/testcase_network_03.out (+15/-0) libraries/libapparmor/testsuite/test_multi/testcase_network_04.in (+1/-0) libraries/libapparmor/testsuite/test_multi/testcase_network_04.out (+18/-0) libraries/libapparmor/testsuite/test_multi/testcase_network_05.in (+1/-0) libraries/libapparmor/testsuite/test_multi/testcase_network_05.out (+18/-0) parser/README.devel (+96/-0) parser/dbus.c (+219/-0) parser/dbus.h (+49/-0) parser/lib.c (+137/-0) parser/lib.h (+7/-0) parser/libapparmor_re/chfa.cc (+428/-0) parser/libapparmor_re/chfa.h (+61/-0) parser/mount.c (+534/-0) parser/mount.h (+136/-0) parser/parser.conf (+58/-0) parser/po/en_AU.po (+653/-0) parser/po/en_CA.po (+653/-0) parser/po/en_GB.po (+653/-0) parser/po/ms.po (+653/-0) parser/po/oc.po (+653/-0) parser/po/sq.po (+653/-0) parser/po/ug.po (+653/-0) parser/policydb.h (+39/-0) parser/profile.cc (+95/-0) parser/profile.h (+242/-0) parser/tst/caching.py (+438/-0) parser/tst/equality.sh (+235/-0) parser/tst/gen-dbus.pl (+167/-0) parser/tst/minimize.sh (+202/-0) parser/tst/simple_tests/capability/bad_3.sd (+9/-0) parser/tst/simple_tests/capability/bad_4.sd (+9/-0) 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/ok3.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/bad_1.sd (+7/-0) parser/tst/simple_tests/file/file/bad_append_1.sd (+8/-0) parser/tst/simple_tests/file/file/bad_comma_1.sd (+7/-0) parser/tst/simple_tests/file/file/bad_embedded_spaces_1.sd (+6/-0) parser/tst/simple_tests/file/file/bad_lock_1.sd (+8/-0) parser/tst/simple_tests/file/file/dos_line_endings.sd (+41/-0) parser/tst/simple_tests/file/file/front_perms_ok_1.sd (+24/-0) parser/tst/simple_tests/file/file/ok_1.sd (+7/-0) parser/tst/simple_tests/file/file/ok_2.sd (+7/-0) parser/tst/simple_tests/file/file/ok_3.sd (+9/-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/file/ok_append_1.sd (+13/-0) parser/tst/simple_tests/file/file/ok_carat_1.sd (+7/-0) parser/tst/simple_tests/file/file/ok_carat_2.sd (+7/-0) parser/tst/simple_tests/file/file/ok_comma_1.sd (+7/-0) parser/tst/simple_tests/file/file/ok_comma_2.sd (+7/-0) parser/tst/simple_tests/file/file/ok_embedded_spaces_1.sd (+6/-0) parser/tst/simple_tests/file/file/ok_embedded_spaces_2.sd (+6/-0) parser/tst/simple_tests/file/file/ok_embedded_spaces_3.sd (+6/-0) parser/tst/simple_tests/file/file/ok_inv_char_class.sd (+7/-0) parser/tst/simple_tests/file/file/ok_lock_1.sd (+17/-0) parser/tst/simple_tests/file/file/ok_mmap_1.sd (+12/-0) parser/tst/simple_tests/file/file/ok_mmap_2.sd (+14/-0) parser/tst/simple_tests/file/file/owner/bad_3.sd (+8/-0) parser/tst/simple_tests/file/file/owner/bad_4.sd (+8/-0) parser/tst/simple_tests/file/file/owner/bad_5.sd (+8/-0) parser/tst/simple_tests/file/file/owner/bad_6.sd (+8/-0) parser/tst/simple_tests/file/file/owner/bad_7.sd (+8/-0) parser/tst/simple_tests/file/file/owner/bad_8.sd (+9/-0) parser/tst/simple_tests/file/file/owner/ok_1.sd (+25/-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/include_tests/ignored_suffix/bad-include~ (+0/-1) parser/tst/simple_tests/mount/in_1.sd (+7/-0) parser/tst/simple_tests/mount/in_2.sd (+7/-0) parser/tst/simple_tests/mount/in_3.sd (+7/-0) parser/tst/simple_tests/mount/in_4.sd (+7/-0) parser/tst/simple_tests/mount/ok_1.sd (+7/-0) parser/tst/simple_tests/mount/ok_10.sd (+7/-0) parser/tst/simple_tests/mount/ok_11.sd (+7/-0) parser/tst/simple_tests/mount/ok_12.sd (+7/-0) parser/tst/simple_tests/mount/ok_14.sd (+7/-0) parser/tst/simple_tests/mount/ok_15.sd (+7/-0) parser/tst/simple_tests/mount/ok_16.sd (+7/-0) parser/tst/simple_tests/mount/ok_17.sd (+7/-0) parser/tst/simple_tests/mount/ok_18.sd (+7/-0) parser/tst/simple_tests/mount/ok_19.sd (+7/-0) parser/tst/simple_tests/mount/ok_2.sd (+7/-0) parser/tst/simple_tests/mount/ok_20.sd (+7/-0) parser/tst/simple_tests/mount/ok_21.sd (+7/-0) parser/tst/simple_tests/mount/ok_22.sd (+7/-0) parser/tst/simple_tests/mount/ok_23.sd (+7/-0) parser/tst/simple_tests/mount/ok_3.sd (+7/-0) parser/tst/simple_tests/mount/ok_4.sd (+7/-0) parser/tst/simple_tests/mount/ok_5.sd (+10/-0) parser/tst/simple_tests/mount/ok_8.sd (+9/-0) parser/tst/simple_tests/mount/ok_9.sd (+7/-0) parser/tst/simple_tests/mount/okay_13.sd (+7/-0) parser/tst/simple_tests/mount/okay_6.sd (+7/-0) parser/tst/simple_tests/mount/okay_7.sd (+7/-0) 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-conflict.sd (+11/-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/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/dbus-accessibility (+16/-0) profiles/apparmor.d/abstractions/dbus-accessibility-strict (+17/-0) 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/ldapclient (+21/-0) profiles/apparmor.d/abstractions/p11-kit (+27/-0) profiles/apparmor.d/abstractions/ubuntu-helpers (+77/-0) 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/xdg-desktop (+24/-0) profiles/apparmor.d/tunables/apparmorfs (+11/-0) profiles/apparmor.d/tunables/dovecot (+20/-0) 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.dict (+30/-0) profiles/apparmor.d/usr.lib.dovecot.dovecot-lda (+33/-0) 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.ssl-params (+27/-0) profiles/apparmor.d/usr.sbin.apache2 (+83/-0) profiles/apparmor.d/usr.sbin.smbldap-useradd (+37/-0) profiles/apparmor.d/usr.sbin.winbindd (+34/-0) 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 (+94/-0) tests/regression/apparmor/introspect.sh (+67/-0) tests/regression/apparmor/onexec.c (+58/-0) tests/regression/apparmor/onexec.sh (+184/-0) tests/regression/apparmor/query_label.c (+180/-0) tests/regression/apparmor/query_label.sh (+207/-0) 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.source (+14/-0) tests/regression/apparmor/uservars.inc.system (+14/-0) utils/README.md (+3/-0) utils/aa-cleanprof (+31/-0) utils/aa-cleanprof.pod (+39/-0) utils/aa-easyprof (+98/-0) utils/aa-easyprof.pod (+311/-0) utils/aa-exec (+122/-0) utils/aa-exec.pod (+97/-0) utils/aa-mergeprof (+678/-0) utils/aa-mergeprof.pod (+33/-0) utils/aa-sandbox (+36/-0) utils/aa-sandbox.pod (+214/-0) utils/apparmor/__init__.py (+10/-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 (+1124/-0) 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/easyprof/README (+44/-0) utils/easyprof/easyprof.conf (+5/-0) utils/easyprof/policygroups/opt-application (+3/-0) utils/easyprof/policygroups/user-application (+8/-0) utils/easyprof/templates/default (+26/-0) utils/easyprof/templates/sandbox (+29/-0) utils/easyprof/templates/sandbox-x (+46/-0) utils/easyprof/templates/user-application (+29/-0) utils/po/README (+10/-0) utils/po/apparmor-utils.pot (+349/-0) utils/po/bs.po (+723/-0) utils/po/hi.po (+796/-0) utils/po/ko.po (+723/-0) utils/po/ru.po (+820/-0) utils/po/uk.po (+723/-0) utils/python-tools-setup.py (+88/-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/easyprof.conf (+5/-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 (+2500/-0) utils/test/test-dbus_parse.py (+30/-0) utils/test/test-regex_matches.py (+124/-0) utils/vim/apparmor.vim.pod (+58/-0) utils/vim/create-apparmor.vim.py (+179/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. Conflict: can't delete deprecated because it is not empty. Not deleting. Conflict because deprecated is not versioned, but has versioned children. Versioned directory. Conflict: can't delete deprecated/utils because it is not empty. Not deleting. Conflict because deprecated/utils is not versioned, but has versioned children. Versioned directory. Conflict: can't delete deprecated/utils/Immunix because it is not empty. Not deleting. Path conflict: deprecated/utils/Immunix / <deleted> Conflict because deprecated/utils/Immunix is not versioned, but has versioned children. Versioned directory. Contents conflict in deprecated/utils/Immunix/AppArmor.pm Path conflict: deprecated/utils/aa-eventd / <deleted> Text conflict in deprecated/utils/aa-genprof Path conflict: deprecated/utils/aa-repo.pl / <deleted> Text conflict in deprecated/utils/aa-unconfined Path conflict: deprecated/utils/convert-profile.pl / <deleted> Path conflict: deprecated/utils/repair_obsolete_profiles / <deleted> Conflict adding file documentation/AppArmor Developer 1 - Kernel Notes.odt. Moved existing file to documentation/AppArmor Developer 1 - Kernel Notes.odt.moved. Conflict adding file documentation/AppArmor Developer 2 - policy layout and encoding.odt. Moved existing file to documentation/AppArmor Developer 2 - policy layout and encoding.odt.moved. Conflict adding file documentation/AppArmor Developer 3 - HFA.odt. Moved existing file to documentation/AppArmor Developer 3 - HFA.odt.moved. Conflict adding file documentation/AppArmor Developer 4 - Policy compilation.odt. Moved existing file to documentation/AppArmor Developer 4 - Policy compilation.odt.moved. Conflict adding file documentation/AppArmor Developer 5 - extending apparmor to userspace.odt. Moved existing file to documentation/AppArmor Developer 5 - extending apparmor to userspace.odt.moved. Conflict adding file documentation/AppArmor Policy.odt. Moved existing file to documentation/AppArmor Policy.odt.moved. Path conflict: documentation/AppArmor Techdoc - HFA variables.odt / <deleted> Conflict adding file documentation/AppArmor Techdoc - HFA variables.odt. Moved existing file to documentation/AppArmor Techdoc - HFA variables.odt.moved. Conflict adding file kernel-patches/3.0. Moved existing file to kernel-patches/3.0.moved. Conflict adding file kernel-patches/3.1. Moved existing file to kernel-patches/3.1.moved. Conflict adding file kernel-patches/3.10. Moved existing file to kernel-patches/3.10.moved. Conflict adding file kernel-patches/3.11. Moved existing file to kernel-patches/3.11.moved. Conflict adding file kernel-patches/3.12. Moved existing file to kernel-patches/3.12.moved. Conflict adding file kernel-patches/3.2. Moved existing file to kernel-patches/3.2.moved. Conflict adding file kernel-patches/3.3. Moved existing file to kernel-patches/3.3.moved. Conflict adding file kernel-patches/3.4. Moved existing file to kernel-patches/3.4.moved. Conflict adding file kernel-patches/3.5. Moved existing file to kernel-patches/3.5.moved. Conflict adding file kernel-patches/3.6. Moved existing file to kernel-patches/3.6.moved. Conflict adding file kernel-patches/3.7. Moved existing file to kernel-patches/3.7.moved. Conflict adding file kernel-patches/3.8. Moved existing file to kernel-patches/3.8.moved. Conflict adding file kernel-patches/3.9. Moved existing file to kernel-patches/3.9.moved. Path conflict: libraries/libapparmor/configure.ac / <deleted> Conflict adding file libraries/libapparmor/configure.ac. Moved existing file to libraries/libapparmor/configure.ac.moved. Conflict adding file libraries/libapparmor/include. Moved existing file to libraries/libapparmor/include.moved. Path conflict: libraries/libapparmor/include.moved/aalogparse.h / <deleted> Path conflict: libraries/libapparmor/include.moved/sys/apparmor.h / <deleted> Conflict adding file libraries/libapparmor/src/libapparmor.pc.in. Moved existing file to libraries/libapparmor/src/libapparmor.pc.in.moved. Conflict adding file libraries/libapparmor/swig/python/test. Moved existing file to libraries/libapparmor/swig/python/test.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_01.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_01.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_01.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_01.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_01.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_01.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_02.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_02.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_02.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_02.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_02.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_02.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_03.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_03.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_03.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_03.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_03.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_03.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_04.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_04.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_04.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_04.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_04.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_04.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_05.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_05.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_05.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_05.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_05.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_05.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_06.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_06.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_06.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_06.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_06.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_06.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_07.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_07.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_07.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_07.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_07.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_07.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_08.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_08.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_08.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_08.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_08.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_08.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_09.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_09.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_09.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_09.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_09.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_09.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_10.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_10.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_10.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_10.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_10.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_10.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_11.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_11.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_11.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_11.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_11.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_11.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_12.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_12.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_12.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_12.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_12.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_12.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_13.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_13.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_13.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_13.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_13.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_13.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_14.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_14.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_14.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_14.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_14.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_14.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_15.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_15.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_15.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_15.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_15.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_15.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_16.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_16.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_16.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_16.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_16.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_16.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_17.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_17.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_17.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_17.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_17.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_17.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_18.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_18.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_18.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_18.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/syslog_datetime_18.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/syslog_datetime_18.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_01.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_01.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_01.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_01.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_01.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_01.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_02.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_02.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_02.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_02.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_02.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_02.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_03.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_03.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_03.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_03.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_03.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_03.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_04.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_04.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_04.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_04.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_04.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_04.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_05.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_05.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_05.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_05.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_05.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_05.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_06.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_06.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_06.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_06.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_dbus_06.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_dbus_06.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_encoded_comm.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_encoded_comm.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_encoded_comm.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_encoded_comm.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_encoded_comm.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_encoded_comm.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_encoded_profile.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_encoded_profile.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_encoded_profile.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_encoded_profile.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_encoded_profile.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_encoded_profile.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_01.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_01.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_01.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_01.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_01.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_01.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_02.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_02.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_02.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_02.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_02.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_02.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_03.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_03.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_03.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_03.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_03.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_03.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_04.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_04.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_04.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_04.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_04.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_04.out.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_05.err. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_05.err.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_05.in. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_05.in.moved. Conflict adding file libraries/libapparmor/testsuite/test_multi/testcase_network_05.out. Moved existing file to libraries/libapparmor/testsuite/test_multi/testcase_network_05.out.moved. Conflict adding file parser/README.devel. Moved existing file to parser/README.devel.moved. Conflict adding file parser/dbus.c. Moved existing file to parser/dbus.c.moved. Conflict adding file parser/dbus.h. Moved existing file to parser/dbus.h.moved. Conflict adding file parser/lib.c. Moved existing file to parser/lib.c.moved. Conflict adding file parser/lib.h. Moved existing file to parser/lib.h.moved. Path conflict: parser/libapparmor_re/chfa.cc / <deleted> Conflict adding file parser/libapparmor_re/chfa.cc. Moved existing file to parser/libapparmor_re/chfa.cc.moved. Path conflict: parser/libapparmor_re/chfa.h / <deleted> Conflict adding file parser/libapparmor_re/chfa.h. Moved existing file to parser/libapparmor_re/chfa.h.moved. Conflict adding file parser/mount.c. Moved existing file to parser/mount.c.moved. Conflict adding file parser/mount.h. Moved existing file to parser/mount.h.moved. Conflict adding file parser/parser.conf. Moved existing file to parser/parser.conf.moved. Conflict adding file parser/po/en_AU.po. Moved existing file to parser/po/en_AU.po.moved. Conflict adding file parser/po/en_CA.po. Moved existing file to parser/po/en_CA.po.moved. Conflict adding file parser/po/en_GB.po. Moved existing file to parser/po/en_GB.po.moved. Conflict adding file parser/po/ms.po. Moved existing file to parser/po/ms.po.moved. Conflict adding file parser/po/oc.po. Moved existing file to parser/po/oc.po.moved. Conflict adding file parser/po/sq.po. Moved existing file to parser/po/sq.po.moved. Conflict adding file parser/po/ug.po. Moved existing file to parser/po/ug.po.moved. Conflict adding file parser/policydb.h. Moved existing file to parser/policydb.h.moved. Conflict adding file parser/profile.cc. Moved existing file to parser/profile.cc.moved. Conflict adding file parser/profile.h. Moved existing file to parser/profile.h.moved. Conflict adding file parser/tst/caching.py. Moved existing file to parser/tst/caching.py.moved. Conflict adding file parser/tst/equality.sh. Moved existing file to parser/tst/equality.sh.moved. Conflict adding file parser/tst/gen-dbus.pl. Moved existing file to parser/tst/gen-dbus.pl.moved. Conflict adding file parser/tst/minimize.sh. Moved existing file to parser/tst/minimize.sh.moved. Conflict adding file parser/tst/simple_tests/capability/bad_3.sd. Moved existing file to parser/tst/simple_tests/capability/bad_3.sd.moved. Conflict adding file parser/tst/simple_tests/capability/bad_4.sd. Moved existing file to parser/tst/simple_tests/capability/bad_4.sd.moved. Conflict adding file parser/tst/simple_tests/capability/bad_5.sd. Moved existing file to parser/tst/simple_tests/capability/bad_5.sd.moved. Conflict adding file parser/tst/simple_tests/capability/bad_6.sd. Moved existing file to parser/tst/simple_tests/capability/bad_6.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok3.sd. Moved existing file to parser/tst/simple_tests/capability/ok3.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_allow1.sd. Moved existing file to parser/tst/simple_tests/capability/ok_allow1.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_allow10.sd. Moved existing file to parser/tst/simple_tests/capability/ok_allow10.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_allow2.sd. Moved existing file to parser/tst/simple_tests/capability/ok_allow2.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_allow3.sd. Moved existing file to parser/tst/simple_tests/capability/ok_allow3.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_allow4.sd. Moved existing file to parser/tst/simple_tests/capability/ok_allow4.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_allow5.sd. Moved existing file to parser/tst/simple_tests/capability/ok_allow5.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_allow6.sd. Moved existing file to parser/tst/simple_tests/capability/ok_allow6.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_allow7.sd. Moved existing file to parser/tst/simple_tests/capability/ok_allow7.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_allow8.sd. Moved existing file to parser/tst/simple_tests/capability/ok_allow8.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_allow9.sd. Moved existing file to parser/tst/simple_tests/capability/ok_allow9.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_dup_allow1.sd. Moved existing file to parser/tst/simple_tests/capability/ok_dup_allow1.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_dup_allow2.sd. Moved existing file to parser/tst/simple_tests/capability/ok_dup_allow2.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_dup_allow3.sd. Moved existing file to parser/tst/simple_tests/capability/ok_dup_allow3.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_dup_allow4.sd. Moved existing file to parser/tst/simple_tests/capability/ok_dup_allow4.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_dup_allow5.sd. Moved existing file to parser/tst/simple_tests/capability/ok_dup_allow5.sd.moved. Conflict adding file parser/tst/simple_tests/capability/ok_dup_allow6.sd. Moved existing file to parser/tst/simple_tests/capability/ok_dup_allow6.sd.moved. Conflict adding file parser/tst/simple_tests/dbus. Moved existing file to parser/tst/simple_tests/dbus.moved. Conflict adding file parser/tst/simple_tests/file/allow. Moved existing file to parser/tst/simple_tests/file/allow.moved. Conflict adding file parser/tst/simple_tests/file/bad_append_2.sd. Moved existing file to parser/tst/simple_tests/file/bad_append_2.sd.moved. Conflict adding file parser/tst/simple_tests/file/bad_re_brace_1.sd. Moved existing file to parser/tst/simple_tests/file/bad_re_brace_1.sd.moved. Conflict adding file parser/tst/simple_tests/file/bad_re_brace_2.sd. Moved existing file to parser/tst/simple_tests/file/bad_re_brace_2.sd.moved. Conflict adding file parser/tst/simple_tests/file/bad_re_brace_3.sd. Moved existing file to parser/tst/simple_tests/file/bad_re_brace_3.sd.moved. Conflict adding file parser/tst/simple_tests/file/file. Moved existing file to parser/tst/simple_tests/file/file.moved. Conflict adding file parser/tst/simple_tests/file/ok_2.sd. Moved existing file to parser/tst/simple_tests/file/ok_2.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_4.sd. Moved existing file to parser/tst/simple_tests/file/ok_4.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_5.sd. Moved existing file to parser/tst/simple_tests/file/ok_5.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_alternations_1.sd. Moved existing file to parser/tst/simple_tests/file/ok_alternations_1.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_alternations_2.sd. Moved existing file to parser/tst/simple_tests/file/ok_alternations_2.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_alternations_3.sd. Moved existing file to parser/tst/simple_tests/file/ok_alternations_3.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_deny_1.sd. Moved existing file to parser/tst/simple_tests/file/ok_deny_1.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_deny_2.sd. Moved existing file to parser/tst/simple_tests/file/ok_deny_2.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_deny_3.sd. Moved existing file to parser/tst/simple_tests/file/ok_deny_3.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_deny_4.sd. Moved existing file to parser/tst/simple_tests/file/ok_deny_4.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_link_1.sd. Moved existing file to parser/tst/simple_tests/file/ok_link_1.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_link_2.sd. Moved existing file to parser/tst/simple_tests/file/ok_link_2.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_link_3.sd. Moved existing file to parser/tst/simple_tests/file/ok_link_3.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_octal_1.sd. Moved existing file to parser/tst/simple_tests/file/ok_octal_1.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_octal_2.sd. Moved existing file to parser/tst/simple_tests/file/ok_octal_2.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_other_1.sd. Moved existing file to parser/tst/simple_tests/file/ok_other_1.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_other_2.sd. Moved existing file to parser/tst/simple_tests/file/ok_other_2.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_other_3.sd. Moved existing file to parser/tst/simple_tests/file/ok_other_3.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_quoted_1.sd. Moved existing file to parser/tst/simple_tests/file/ok_quoted_1.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_quoted_2.sd. Moved existing file to parser/tst/simple_tests/file/ok_quoted_2.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_quoted_3.sd. Moved existing file to parser/tst/simple_tests/file/ok_quoted_3.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_quoted_4.sd. Moved existing file to parser/tst/simple_tests/file/ok_quoted_4.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_quoted_5.sd. Moved existing file to parser/tst/simple_tests/file/ok_quoted_5.sd.moved. Conflict adding file parser/tst/simple_tests/file/ok_slashquote_1.sd. Moved existing file to parser/tst/simple_tests/file/ok_slashquote_1.sd.moved. Conflict adding file parser/tst/simple_tests/file/owner/ok_alternations_1.sd. Moved existing file to parser/tst/simple_tests/file/owner/ok_alternations_1.sd.moved. Conflict adding file parser/tst/simple_tests/file/owner/ok_alternations_2.sd. Moved existing file to parser/tst/simple_tests/file/owner/ok_alternations_2.sd.moved. Conflict adding file parser/tst/simple_tests/mount. Moved existing file to parser/tst/simple_tests/mount.moved. Conflict adding file parser/tst/simple_tests/network/network_ok_5.sd. Moved existing file to parser/tst/simple_tests/network/network_ok_5.sd.moved. Conflict adding file parser/tst/simple_tests/network/network_ok_6.sd. Moved existing file to parser/tst/simple_tests/network/network_ok_6.sd.moved. Conflict adding file parser/tst/simple_tests/profile/flags/flags_bad14.sd. Moved existing file to parser/tst/simple_tests/profile/flags/flags_bad14.sd.moved. Conflict adding file parser/tst/simple_tests/profile/flags/flags_bad15.sd. Moved existing file to parser/tst/simple_tests/profile/flags/flags_bad15.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_01.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_01.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_02.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_02.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_03.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_03.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_04.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_04.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_05.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_05.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_06.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_06.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_07.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_07.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_08.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_08.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_09.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_09.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_10.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_10.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_11.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_11.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_12.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_12.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_13.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_13.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_14.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_14.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_15.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_15.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_16.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_16.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_17.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_17.sd.moved. Conflict adding file parser/tst/simple_tests/rlimits/ok_rlimit_18.sd. Moved existing file to parser/tst/simple_tests/rlimits/ok_rlimit_18.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_alternation_3.sd. Moved existing file to parser/tst/simple_tests/vars/vars_alternation_3.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_alternation_4.sd. Moved existing file to parser/tst/simple_tests/vars/vars_alternation_4.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_alternation_5.sd. Moved existing file to parser/tst/simple_tests/vars/vars_alternation_5.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_bad_6.sd. Moved existing file to parser/tst/simple_tests/vars/vars_bad_6.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_bad_7.sd. Moved existing file to parser/tst/simple_tests/vars/vars_bad_7.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_bad_8.sd. Moved existing file to parser/tst/simple_tests/vars/vars_bad_8.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_bad_add_assignment_1.sd. Moved existing file to parser/tst/simple_tests/vars/vars_bad_add_assignment_1.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_dbus_1.sd. Moved existing file to parser/tst/simple_tests/vars/vars_dbus_1.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_dbus_10.sd. Moved existing file to parser/tst/simple_tests/vars/vars_dbus_10.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_dbus_11.sd. Moved existing file to parser/tst/simple_tests/vars/vars_dbus_11.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_dbus_2.sd. Moved existing file to parser/tst/simple_tests/vars/vars_dbus_2.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_dbus_3.sd. Moved existing file to parser/tst/simple_tests/vars/vars_dbus_3.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_dbus_4.sd. Moved existing file to parser/tst/simple_tests/vars/vars_dbus_4.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_dbus_5.sd. Moved existing file to parser/tst/simple_tests/vars/vars_dbus_5.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_dbus_6.sd. Moved existing file to parser/tst/simple_tests/vars/vars_dbus_6.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_dbus_7.sd. Moved existing file to parser/tst/simple_tests/vars/vars_dbus_7.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_dbus_8.sd. Moved existing file to parser/tst/simple_tests/vars/vars_dbus_8.sd.moved. Conflict adding file parser/tst/simple_tests/vars/vars_dbus_9.sd. Moved existing file to parser/tst/simple_tests/vars/vars_dbus_9.sd.moved. Conflict adding file parser/tst/simple_tests/xtrans/x-conflict.sd. Moved existing file to parser/tst/simple_tests/xtrans/x-conflict.sd.moved. Conflict adding file parser/tst/simple_tests/xtrans/x-conflict2.sd. Moved existing file to parser/tst/simple_tests/xtrans/x-conflict2.sd.moved. Conflict adding file parser/tst/testlib.py. Moved existing file to parser/tst/testlib.py.moved. Conflict adding file parser/tst/valgrind_simple.py. Moved existing file to parser/tst/valgrind_simple.py.moved. Conflict adding file parser/unit_test.h. Moved existing file to parser/unit_test.h.moved. Conflict adding file profiles/apparmor.d/abstractions/apparmor_api. Moved existing file to profiles/apparmor.d/abstractions/apparmor_api.moved. Conflict adding file profiles/apparmor.d/abstractions/dbus-accessibility-strict. Moved existing file to profiles/apparmor.d/abstractions/dbus-accessibility-strict.moved. Conflict adding file profiles/apparmor.d/abstractions/dbus-accessibility. Moved existing file to profiles/apparmor.d/abstractions/dbus-accessibility.moved. Conflict adding file profiles/apparmor.d/abstractions/dbus-session-strict. Moved existing file to profiles/apparmor.d/abstractions/dbus-session-strict.moved. Conflict adding file profiles/apparmor.d/abstractions/dbus-strict. Moved existing file to profiles/apparmor.d/abstractions/dbus-strict.moved. Conflict adding file profiles/apparmor.d/abstractions/dconf. Moved existing file to profiles/apparmor.d/abstractions/dconf.moved. Conflict adding file profiles/apparmor.d/abstractions/ldapclient. Moved existing file to profiles/apparmor.d/abstractions/ldapclient.moved. Conflict adding file profiles/apparmor.d/abstractions/p11-kit. Moved existing file to profiles/apparmor.d/abstractions/p11-kit.moved. Conflict adding file profiles/apparmor.d/abstractions/ubuntu-helpers. Moved existing file to profiles/apparmor.d/abstractions/ubuntu-helpers.moved. Conflict adding file profiles/apparmor.d/abstractions/ubuntu-unity7-base. Moved existing file to profiles/apparmor.d/abstractions/ubuntu-unity7-base.moved. Conflict adding file profiles/apparmor.d/abstractions/ubuntu-unity7-launcher. Moved existing file to profiles/apparmor.d/abstractions/ubuntu-unity7-launcher.moved. Conflict adding file profiles/apparmor.d/abstractions/ubuntu-unity7-messaging. Moved existing file to profiles/apparmor.d/abstractions/ubuntu-unity7-messaging.moved. Conflict adding file profiles/apparmor.d/abstractions/xdg-desktop. Moved existing file to profiles/apparmor.d/abstractions/xdg-desktop.moved. Conflict adding file profiles/apparmor.d/tunables/apparmorfs. Moved existing file to profiles/apparmor.d/tunables/apparmorfs.moved. Conflict adding file profiles/apparmor.d/tunables/dovecot. Moved existing file to profiles/apparmor.d/tunables/dovecot.moved. Conflict adding file profiles/apparmor.d/tunables/kernelvars. Moved existing file to profiles/apparmor.d/tunables/kernelvars.moved. Conflict adding file profiles/apparmor.d/tunables/securityfs. Moved existing file to profiles/apparmor.d/tunables/securityfs.moved. Conflict adding file profiles/apparmor.d/tunables/sys. Moved existing file to profiles/apparmor.d/tunables/sys.moved. Conflict adding file profiles/apparmor.d/tunables/xdg-user-dirs.d. Moved existing file to profiles/apparmor.d/tunables/xdg-user-dirs.d.moved. Conflict adding file profiles/apparmor.d/tunables/xdg-user-dirs. Moved existing file to profiles/apparmor.d/tunables/xdg-user-dirs.moved. Conflict adding file profiles/apparmor.d/usr.lib.dovecot.anvil. Moved existing file to profiles/apparmor.d/usr.lib.dovecot.anvil.moved. Conflict adding file profiles/apparmor.d/usr.lib.dovecot.auth. Moved existing file to profiles/apparmor.d/usr.lib.dovecot.auth.moved. Conflict adding file profiles/apparmor.d/usr.lib.dovecot.config. Moved existing file to profiles/apparmor.d/usr.lib.dovecot.config.moved. Conflict adding file profiles/apparmor.d/usr.lib.dovecot.dict. Moved existing file to profiles/apparmor.d/usr.lib.dovecot.dict.moved. Conflict adding file profiles/apparmor.d/usr.lib.dovecot.dovecot-lda. Moved existing file to profiles/apparmor.d/usr.lib.dovecot.dovecot-lda.moved. Conflict adding file profiles/apparmor.d/usr.lib.dovecot.lmtp. Moved existing file to profiles/apparmor.d/usr.lib.dovecot.lmtp.moved. Conflict adding file profiles/apparmor.d/usr.lib.dovecot.log. Moved existing file to profiles/apparmor.d/usr.lib.dovecot.log.moved. Conflict adding file profiles/apparmor.d/usr.lib.dovecot.managesieve. Moved existing file to profiles/apparmor.d/usr.lib.dovecot.managesieve.moved. Conflict adding file profiles/apparmor.d/usr.lib.dovecot.ssl-params. Moved existing file to profiles/apparmor.d/usr.lib.dovecot.ssl-params.moved. Conflict adding file profiles/apparmor.d/usr.sbin.apache2. Moved existing file to profiles/apparmor.d/usr.sbin.apache2.moved. Conflict adding file profiles/apparmor.d/usr.sbin.smbldap-useradd. Moved existing file to profiles/apparmor.d/usr.sbin.smbldap-useradd.moved. Conflict adding file profiles/apparmor.d/usr.sbin.winbindd. Moved existing file to profiles/apparmor.d/usr.sbin.winbindd.moved. Conflict adding file tests/regression/apparmor/dbus.conf. Moved existing file to tests/regression/apparmor/dbus.conf.moved. Conflict adding file tests/regression/apparmor/dbus.inc. Moved existing file to tests/regression/apparmor/dbus.inc.moved. Conflict adding file tests/regression/apparmor/dbus_common.c. Moved existing file to tests/regression/apparmor/dbus_common.c.moved. Conflict adding file tests/regression/apparmor/dbus_common.h. Moved existing file to tests/regression/apparmor/dbus_common.h.moved. Conflict adding file tests/regression/apparmor/dbus_eavesdrop.c. Moved existing file to tests/regression/apparmor/dbus_eavesdrop.c.moved. Conflict adding file tests/regression/apparmor/dbus_eavesdrop.sh. Moved existing file to tests/regression/apparmor/dbus_eavesdrop.sh.moved. Conflict adding file tests/regression/apparmor/dbus_message.c. Moved existing file to tests/regression/apparmor/dbus_message.c.moved. Conflict adding file tests/regression/apparmor/dbus_message.sh. Moved existing file to tests/regression/apparmor/dbus_message.sh.moved. Conflict adding file tests/regression/apparmor/dbus_service.c. Moved existing file to tests/regression/apparmor/dbus_service.c.moved. Conflict adding file tests/regression/apparmor/dbus_service.sh. Moved existing file to tests/regression/apparmor/dbus_service.sh.moved. Conflict adding file tests/regression/apparmor/fd_inheritance.c. Moved existing file to tests/regression/apparmor/fd_inheritance.c.moved. Conflict adding file tests/regression/apparmor/fd_inheritance.sh. Moved existing file to tests/regression/apparmor/fd_inheritance.sh.moved. Conflict adding file tests/regression/apparmor/fd_inheritor.c. Moved existing file to tests/regression/apparmor/fd_inheritor.c.moved. Conflict adding file tests/regression/apparmor/introspect.c. Moved existing file to tests/regression/apparmor/introspect.c.moved. Conflict adding file tests/regression/apparmor/introspect.sh. Moved existing file to tests/regression/apparmor/introspect.sh.moved. Conflict adding file tests/regression/apparmor/onexec.c. Moved existing file to tests/regression/apparmor/onexec.c.moved. Conflict adding file tests/regression/apparmor/onexec.sh. Moved existing file to tests/regression/apparmor/onexec.sh.moved. Conflict adding file tests/regression/apparmor/query_label.c. Moved existing file to tests/regression/apparmor/query_label.c.moved. Conflict adding file tests/regression/apparmor/query_label.sh. Moved existing file to tests/regression/apparmor/query_label.sh.moved. Conflict adding file tests/regression/apparmor/unix_socket_file.c. Moved existing file to tests/regression/apparmor/unix_socket_file.c.moved. Conflict adding file tests/regression/apparmor/unix_socket_file.sh. Moved existing file to tests/regression/apparmor/unix_socket_file.sh.moved. Conflict adding file tests/regression/apparmor/unix_socket_file_client.c. Moved existing file to tests/regression/apparmor/unix_socket_file_client.c.moved. Conflict adding file tests/regression/apparmor/uservars.inc.source. Moved existing file to tests/regression/apparmor/uservars.inc.source.moved. Conflict adding file tests/regression/apparmor/uservars.inc.system. Moved existing file to tests/regression/apparmor/uservars.inc.system.moved. Conflict adding file utils/README.md. Moved existing file to utils/README.md.moved. Conflict adding file utils/aa-cleanprof. Moved existing file to utils/aa-cleanprof.moved. Conflict adding file utils/aa-cleanprof.pod. Moved existing file to utils/aa-cleanprof.pod.moved. Conflict adding file utils/aa-easyprof. Moved existing file to utils/aa-easyprof.moved. Conflict adding file utils/aa-easyprof.pod. Moved existing file to utils/aa-easyprof.pod.moved. Conflict adding file utils/aa-exec. Moved existing file to utils/aa-exec.moved. Conflict adding file utils/aa-exec.pod. Moved existing file to utils/aa-exec.pod.moved. Conflict adding file utils/aa-mergeprof. Moved existing file to utils/aa-mergeprof.moved. Conflict adding file utils/aa-mergeprof.pod. Moved existing file to utils/aa-mergeprof.pod.moved. Conflict adding file utils/aa-sandbox. Moved existing file to utils/aa-sandbox.moved. Conflict adding file utils/aa-sandbox.pod. Moved existing file to utils/aa-sandbox.pod.moved. Conflict adding file utils/apparmor. Moved existing file to utils/apparmor.moved. Conflict adding file utils/easyprof. Moved existing file to utils/easyprof.moved. Conflict adding file utils/po/README. Moved existing file to utils/po/README.moved. Conflict adding file utils/po/apparmor-utils.pot. Moved existing file to utils/po/apparmor-utils.pot.moved. Conflict adding file utils/po/bs.po. Moved existing file to utils/po/bs.po.moved. Conflict adding file utils/po/hi.po. Moved existing file to utils/po/hi.po.moved. Conflict adding file utils/po/ko.po. Moved existing file to utils/po/ko.po.moved. Conflict adding file utils/po/ru.po. Moved existing file to utils/po/ru.po.moved. Conflict adding file utils/po/uk.po. Moved existing file to utils/po/uk.po.moved. Conflict adding file utils/python-tools-setup.py. Moved existing file to utils/python-tools-setup.py.moved. Conflict adding file utils/test. Moved existing file to utils/test.moved. Path conflict: utils/vim/apparmor.vim.pod / <deleted> Conflict adding file utils/vim/apparmor.vim.pod. Moved existing file to utils/vim/apparmor.vim.pod.moved. Conflict adding file utils/vim/create-apparmor.vim.py. Moved existing file to utils/vim/create-apparmor.vim.py.moved. |
| To merge this branch: | bzr merge lp://staging/~apparmor-dev/apparmor/aa-2.8.95 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jamie Strandboge | Pending | ||
|
Review via email:
|
|||
Description of the change
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.
> 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?
No.
> Has a 5 minute exploratory testing run been executed on an armhf Touch build (eg, one of N4, N10, N7 (either), Galaxy Nexus)?
No.
> If you changed the packaging (debian/), did you subscribe a core-dev to this MP?
jdstrand will handle the merge.
> 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 | # |
Revision history for this message
| Jamie Strandboge (jdstrand) wrote | # |
Unmerged revisions
- 1498. By Seth Arnold
-
Modified patches to remove numbers, they complicated quilt handling too
much.- add-chromium-
browser. patch
- add-debian-integration- to-lighttpd. patch
- ubuntu-manpage- updates. patch
- libapparmor-layout- deb.patch
- libapparmor-mention- dbus-method- in-getcon- man.patch
- etc-writable.patch
- aa-utils_are_bilingual. patch
- convert-to-rules. patch
- list-fns.patch
- parse-mode.patch
- add-decimal-interp. patch
- policy_mediates. patch
- fix-failpath.patch
- feature_file.patch
- fix-network.patch
- aare-to-class.patch
- add-mediation-unix.patch
- parser_version. patch
- caching.patch
- label-class.patch
- fix-lexer-debug.patch
- use-diff-encode. patch
- fix-serialize.patch
- fix-ppc-endian- ftbfs.patch
- opt_arg.patch
- tests-cond-dbus.patch - 1497. By Seth Arnold
-
Add dep-3 tags to patches, fix other issues Jamie found:
- debian/
apparmor- utils.install: remove usr/share/ perl5/Immunix/ *.pm and
add usr/sbin/aa-autodep, usr/sbin/ aa-cleanprof and usr/sbin/ aa-mergeprof
* debian/rules: delete upstream-provided xdg-user-dirs.d/ site.local
* debian/apparmor. postinst: create xdg-user- dirs.d/ site.local - 1496. By Seth Arnold
-
[ Jamie Strandboge ]
* debian/debhelper/ dh_apparmor: exit with error if aa-easyprof does not
exist
* debian/control: drop Depends on apparmor-easyprof to Suggests for
dh-apparmor
[ Seth Arnold, Jamie Strandboge, Steve Beattie, John Johansen, Tyler Hicks ]
* New upstream snapshot (LP: #1278702, #1061693, #1285653) dropping very
large Ubuntu delta and fixing the following bugs:
- Adjust fonts abstraction for libthai (LP: #1278702)
- Support translated XDG user directories (LP: #1061693)
- Adjust abstractions/web-data to include /var/www/html (LP: #1285653)
Refresh 0002-add-debian- integration- to-lighttpd. patch to include
/etc/lighttpd/ conf-available/ *.conf
- Adjust debian/libapparmor1. symbols to reflect new upstream versioning
for the aa_query_label() function
- Raise exceptions in Python bindings when something fails
* ship new Python replacements for previous Perl-based tools
- debian/apparmor- utils.install: remove usr/share/ perl5/Immunix/ *.pm and add
usr/sbin/aa- autodep, usr/sbin/ aa-cleanprof and usr/sbin/ aa-mergeprof
- debian/control:
+ remove various Perl dependencies
+ add python-apparmor and python3-apparmor
+ python3-apparmor Breaks: apparmor-easyprof to move the file since it
ships dist-packages/apparmor/ __init_ _.py now
- debian/apparmor- utils.manpages: ship new manpages for aa-cleanprof and
aa-mergeprof
- debian/rules: build and install Python tools
* debian/apparmor. install:
- install apparmorfs, dovecot, kernelvars, securityfs, sys,
and xdg-user-dirs tunables and xdg-user-dirs.d directory
* debian/apparmor. dirs:
- install /etc/apparmor.d/tunables/ xdg-user- dirs.d
* debian/apparmor. postinst: create xdg-user-dirs.d
* debian/apparmor. postrm: remove xdg-user-dirs.d
* Remaining patches:
- 0001-add-chromium- browser. patch
- 0002-add-debian- integration- to-lighttpd. patch
- 0003-ubuntu-manpage- updates. patch
- 0004-libapparmor-layout- deb.patch (renamed from 0008)
- 0005-libapparmor-mention- dbus-method- in-getcon- man.patch (renamed from
0068)
- 0006-etc-writable. patch (renamed from 0070)
- 0007-aa-utils_are_ bilingual. patch (renamed from 0077)
- 0008-remove-ptrace. patch
- 0009-convert-to-rules. patch
- 0010-list-fns.patch
- 0011-parse-mode.patch
- 0012-add-decimal- interp. patch
- 0013-policy_mediates. patch
- 0014-fix-failpath. patch
- 0015-feature_file.patch
- 0016-fix-network. patch
- 0017-aare-to-class. patch
- 0018-add-mediation- unix.patch
- 0019-parser_version. patch
- 0020-caching.patch
- 0021-label-class.patch
- 0022-signal.patch
- 0023-fix-lexer-debug. patch
- 0024-ptrace.patch
- 0025-use-diff-encode. patch
- 0026-fix-serialize. patch
- 0027-fix-af.patch
- 0028-opt_arg.patch
- 0029-tests-cond-dbus. patch
- 0030-tests.diff
* Move manpages from libapparmor1 to libapparmor-dev
- debian/libapparmor- dev.manpages: install aa_change_hat.2,
aa_change_ profile. 2, aa_find_ mountpoint. 2, aa_getcon.2
- debian/control: libapparmor-dev Replaces: and Breaks: libapparmor1
* Move /usr/lib/python3/ dist-packages/ apparmor/ __init_ _.py from
apparmor-easyprof to python3-apparmor
- debian/control: python3-apparmor Breaks: apparmor-easyprof
- debian/apparmor- easyprof. install: remove
usr/lib/python* .*/site- packages/ apparmor*
* New profiles and abstractions:
- debian/apparmor. install: tunables/dovecot, tunables/ kernelvars,
tunables/xdg-user- dirs, tunables/ xdg-user- dirs.d
* Test merge from upstream new pyutils branch (rev 2385) - 1495. By jdstrand <Jamie Strandboge <email address hidden>>
-
[ Tyler Hicks ]
* 0084-parser-add-dbus- eavesdrop- perm.patch: Add an eavesdrop permission to
the dbus rule type, allowing confined applications to eavesdrop. The only
valid conditional for eavesdrop rules is 'bus'. See the apparmor.d(5) man
page for more information. (LP: #1262440)
[ Steve Beattie ]
* 0085-push-normalize- tree-ops- into-expr- tree-classes. patch: Improve
parser performance in some cases
[ John Johansen ]
* 0086-add-diff-state- compression- to-dfa. patch: Implement differential
state compression in the parser
* 0087-fix-dfa-minimizatio n.patch: Fix a parser bug that caused some DFAs to
not be fully minimized (LP: #1262938)
* 0088-fix-pol-generation- for-small- dfas.patch: Fixes bugs in the parser
when generating policy for some small DFAs - 1494. By Jamie Strandboge
-
[ Jan Rękorajski ]
* 0082-parser-fix-FTBFS- with-bison- 3.patch: Fix parser FTBFS with bison 3
[ Steve Beattie ]
* 0083-libapparmor-require- libtoolize. patch: Fix FTBFS by switching
the autogen.sh script to use libtoolize instead of libtool - 1493. By Jamie Strandboge
-
Rebuild for python3.4 as a supported python version.
- 1492. By Stéphane Graber
-
releasing version 2.8.0-0ubuntu35
- 1491. By Stéphane Graber
-
releasing version 2.8.0-0ubuntu34
- 1490. By Steve Langasek
-
releasing package apparmor version 2.8.0-0ubuntu33
- 1489. By Steve Langasek
-
Drop --parallel from dh invocation, due to issues in the upstream build system
which tyhicks will fix later
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Rejecting this merge-- it was proposed against lp:apparmor. It should be against lp:~apparmor-dev/apparmor/apparmor-ubuntu-citrain. I rejected instead of deleted so that the MP description text would not be lost.
You said 'No' to the TestPlan and 5 minute exploratory testing-- is this planned or will someone else do it?