Import upstream version 2.6~devel+bzr1617

.bzrignore

-parser/po/*.mo
-parser/af_names.h
-parser/cap_names.h
-parser/tst_misc
-parser/tst_regex
-parser/tst_symtab
-parser/tst_variable
-parser/parser_lex.c
-parser/parser_version.h
-parser/parser_yacc.c
-parser/parser_yacc.h
-parser/pod2htm*.tmp
-parser/*.7
-parser/*.5
-parser/*.8
-parser/*.7.html
-parser/*.5.html
-parser/*.8.html
-parser/common
-parser/apparmor_parser
-parser/libapparmor_re/regexp.cc
-parser/techdoc.aux
-parser/techdoc.log
-parser/techdoc.pdf
-parser/techdoc.toc
-libraries/libapparmor/Makefile
-libraries/libapparmor/Makefile.in
-libraries/libapparmor/aclocal.m4
-libraries/libapparmor/audit.log
-libraries/libapparmor/autom4te.cache
-libraries/libapparmor/compile
-libraries/libapparmor/config.guess
-libraries/libapparmor/config.log
-libraries/libapparmor/config.status
-libraries/libapparmor/config.sub
-libraries/libapparmor/configure
-libraries/libapparmor/depcomp
-libraries/libapparmor/install-sh
-libraries/libapparmor/libtool
-libraries/libapparmor/ltmain.sh
-libraries/libapparmor/missing
-libraries/libapparmor/ylwrap
-libraries/libapparmor/doc/Makefile
-libraries/libapparmor/doc/Makefile.in
-libraries/libapparmor/doc/aa_change_hat.2
-libraries/libapparmor/src/.deps
-libraries/libapparmor/src/.libs
-libraries/libapparmor/src/Makefile
-libraries/libapparmor/src/Makefile.in
-libraries/libapparmor/src/af_protos.h
-libraries/libapparmor/src/change_hat.lo
-libraries/libapparmor/src/grammar.lo
-libraries/libapparmor/src/libaalogparse.lo
-libraries/libapparmor/src/libimmunix_warning.lo
-libraries/libapparmor/src/scanner.lo
-libraries/libapparmor/src/libapparmor.la
-libraries/libapparmor/src/libimmunix.la
-libraries/libapparmor/src/grammar.c
-libraries/libapparmor/src/grammar.h
-libraries/libapparmor/src/scanner.c
-libraries/libapparmor/src/scanner.h
-libraries/libapparmor/src/tst_aalogmisc
-libraries/libapparmor/swig/Makefile
-libraries/libapparmor/swig/Makefile.in
-libraries/libapparmor/swig/perl/LibAppArmor.bs
-libraries/libapparmor/swig/perl/LibAppArmor.pm
-libraries/libapparmor/swig/perl/Makefile
-libraries/libapparmor/swig/perl/Makefile.PL
-libraries/libapparmor/swig/perl/Makefile.in
-libraries/libapparmor/swig/perl/Makefile.perl
-libraries/libapparmor/swig/perl/blib
-libraries/libapparmor/swig/perl/libapparmor_wrap.c
-libraries/libapparmor/swig/perl/pm_to_blib
-libraries/libapparmor/swig/python/Makefile
-libraries/libapparmor/swig/python/Makefile.in
-libraries/libapparmor/swig/python/setup.py
-libraries/libapparmor/swig/ruby/Makefile
-libraries/libapparmor/swig/ruby/Makefile.in
-libraries/libapparmor/testsuite/.deps
-libraries/libapparmor/testsuite/.libs
-libraries/libapparmor/testsuite/Makefile
-libraries/libapparmor/testsuite/Makefile.in
-libraries/libapparmor/testsuite/libaalogparse.log
-libraries/libapparmor/testsuite/libaalogparse.sum
-libraries/libapparmor/testsuite/site.exp
-libraries/libapparmor/testsuite/test_multi.multi
-libraries/libapparmor/testsuite/config/Makefile
-libraries/libapparmor/testsuite/config/Makefile.in
-libraries/libapparmor/testsuite/lib/Makefile
-libraries/libapparmor/testsuite/lib/Makefile.in
-libraries/libapparmor/testsuite/libaalogparse.test/Makefile
-libraries/libapparmor/testsuite/libaalogparse.test/Makefile.in
-libraries/libapparmor/testsuite/test_multi/out
-changehat/mod_apparmor/.libs
-changehat/mod_apparmor/common
-changehat/pam_apparmor/common
-changehat/tomcat_apparmor/common
-utils/common
-utils/*.8
-utils/*.8.html
-utils/*.5
-utils/*.5.html
-utils/*.tmp
-utils/po/*.mo
-tests/regression/apparmor/access
-tests/regression/apparmor/changehat
-tests/regression/apparmor/changehat_fail
-tests/regression/apparmor/changehat_fork
-tests/regression/apparmor/changehat_misc
-tests/regression/apparmor/changehat_misc2
-tests/regression/apparmor/changehat_pthread
-tests/regression/apparmor/changehat_twice
-tests/regression/apparmor/changehat_wrapper
-tests/regression/apparmor/changeprofile
-tests/regression/apparmor/chdir
-tests/regression/apparmor/chgrp
-tests/regression/apparmor/chmod
-tests/regression/apparmor/chown
-tests/regression/apparmor/clone
-tests/regression/apparmor/deleted
-tests/regression/apparmor/env_check
-tests/regression/apparmor/environ
-tests/regression/apparmor/exec
-tests/regression/apparmor/exec_qual
-tests/regression/apparmor/exec_qual2
-tests/regression/apparmor/fchdir
-tests/regression/apparmor/fchgrp
-tests/regression/apparmor/fchmod
-tests/regression/apparmor/fchown
-tests/regression/apparmor/fork
-tests/regression/apparmor/link
-tests/regression/apparmor/link_subset
-tests/regression/apparmor/mkdir
-tests/regression/apparmor/mmap
-tests/regression/apparmor/mount
-tests/regression/apparmor/named_pipe
-tests/regression/apparmor/net_raw
-tests/regression/apparmor/open
-tests/regression/apparmor/openat
-tests/regression/apparmor/pipe
-tests/regression/apparmor/ptrace
-tests/regression/apparmor/ptrace_helper
-tests/regression/apparmor/pwrite
-tests/regression/apparmor/readdir
-tests/regression/apparmor/rename
-tests/regression/apparmor/rw
-tests/regression/apparmor/swap
-tests/regression/apparmor/symlink
-tests/regression/apparmor/syscall_chroot
-tests/regression/apparmor/syscall_mknod
-tests/regression/apparmor/syscall_mlockall
-tests/regression/apparmor/syscall_ptrace
-tests/regression/apparmor/syscall_reboot
-tests/regression/apparmor/syscall_setdomainname
-tests/regression/apparmor/syscall_sethostname
-tests/regression/apparmor/syscall_setpriority
-tests/regression/apparmor/syscall_setscheduler
-tests/regression/apparmor/syscall_sysctl
-tests/regression/apparmor/sysctl_proc
-tests/regression/apparmor/tcp
-tests/regression/apparmor/unix_fd_client
-tests/regression/apparmor/unix_fd_server
-tests/regression/apparmor/unlink
-tests/regression/apparmor/xattrs
-tests/regression/apparmor/coredump

libraries/libapparmor/testsuite/Makefile.am

@@ -12,7 +12,7 @@ noinst_PROGRAMS = test_multi.multi
 test_multi_multi_SOURCES	= test_multi.c
 test_multi_multi_CFLAGS		= $(CFLAGS) -Wall
 test_multi_multi_LDFLAGS	= $(LDFLAGS)
-test_multi_multi_LDADD		= ../src/.libs/libapparmor.a
+test_multi_multi_LDADD		= -L../src/.libs -lapparmor
 
 clean-local:
 	rm -rf tmp.err.* tmp.out.* site.exp site.bak test_multi/out

parser/tst/simple_tests/include_tests/ignored_suffix/bad-include~

-THIS WILL NOT PARSE!

profiles/apparmor.d/abstractions/X

@@ -32,7 +32,7 @@
   /usr/X11R6/**.so*               mr,
 
   # DRI
-  /usr/lib/dri/**                 mr,
+  /usr/lib{,32,64}/dri/**         mr,
   /dev/dri/**                     rw,
 
   # mouse themes

profiles/apparmor.d/abstractions/enchant

+# vim:syntax=apparmor
+# ------------------------------------------------------------------
+#
+#    Copyright (C) 2010 Canonical Ltd.
+#
+#    This program is free software; you can redistribute it and/or
+#    modify it under the terms of version 2 of the GNU General Public
+#    License published by the Free Software Foundation.
+#
+# ------------------------------------------------------------------
+
+  # abstraction for Enchant spellchecking frontend
+
+  /usr/share/enchant/                              r,
+  /usr/share/enchant/enchant.ordering              r,
+
+  # aspell
+  #include <abstractions/aspell>
+  /var/lib/dictionaries-common/aspell/             r,
+  /var/lib/dictionaries-common/aspell/*            r,
+
+  # hspell
+  /usr/share/hspell/                               r,
+  /usr/share/hspell/*.wgz.*                        r,
+
+  # hunspell
+  /usr/share/hunspell/                             r,
+  /usr/share/hunspell/*                            r,
+
+  # ispell
+  /usr/lib/ispell/                                 r,
+  /usr/lib/ispell/*.hash                           r,
+  /usr/share/dict/                                 r,
+  /usr/share/dict/*                                r,
+  /var/lib/dictionaries-common/                    r,
+  /var/lib/dictionaries-common/{ispell,wordlist}/  r,
+  /var/lib/dictionaries-common/{ispell,wordlist}/* r,
+
+  # myspell
+  /usr/share/myspell/                              r,
+  /usr/share/myspell/**                            r,
+
+  # voikko
+  /usr/lib/voikko/                                 r,
+  /usr/lib/voikko/2/                               r,
+  /usr/lib/voikko/2/mor-standard/                  r,
+  /usr/lib/voikko/2/mor-standard/voikko*           r,
+
+  # zemberek
+  /usr/share/java/                                 r,
+  /usr/share/java/zemberek-[0-9]*.jar              r,
+  /usr/share/java/zemberek-tr-[0-9]*.jar           r,
+
+  # per-user dictionaries
+  owner @{HOME}/.config/enchant/                   r,
+  owner @{HOME}/.config/enchant/*                  rwk,

profiles/apparmor.d/abstractions/freedesktop.org

@@ -10,6 +10,9 @@
 # ------------------------------------------------------------------
 
   # system configuration
+  /usr/share/applications/               r,
+  /usr/share/applications/mimeinfo.cache r,
+  /usr/share/applications/*.desktop      r,
   /usr/share/icons/               r,
   /usr/share/icons/**             r,
   /usr/share/pixmaps/             r,
@@ -23,10 +26,15 @@
   /usr/share/mime/**              r,
 
   # per-user configurations
-  @{HOME}/.icons/                 r,
-  @{HOME}/.recently-used.xbel*    rw,
-  @{HOME}/.config/user-dirs.dirs  r,
-  @{HOME}/.local/share/icons/     r,
-  @{HOME}/.local/share/icons/**   r,
-  @{HOME}/.local/share/mime/      r,
-  @{HOME}/.local/share/mime/**    r,
+  owner @{HOME}/.icons/                 r,
+  owner @{HOME}/.recently-used.xbel*    rw,
+  owner @{HOME}/.local/share/recently-used.xbel* rw,
+  owner @{HOME}/.config/user-dirs.dirs  r,
+  owner @{HOME}/.local/share/applications/*.desktop      r,
+  owner @{HOME}/.local/share/applications/defaults.list  r,
+  owner @{HOME}/.local/share/applications/mimeapps.list  r,
+  owner @{HOME}/.local/share/applications/mimeinfo.cache r,
+  owner @{HOME}/.local/share/icons/     r,
+  owner @{HOME}/.local/share/icons/**   r,
+  owner @{HOME}/.local/share/mime/      r,
+  owner @{HOME}/.local/share/mime/**    r,

profiles/apparmor.d/abstractions/ibus

+# vim:syntax=apparmor
+# ------------------------------------------------------------------
+#
+#    Copyright (C) 2010 Canonical Ltd.
+#
+#    This program is free software; you can redistribute it and/or
+#    modify it under the terms of version 2 of the GNU General Public
+#    License published by the Free Software Foundation.
+#
+# ------------------------------------------------------------------
+
+  # abstraction for ibus input methods
+  owner @{HOME}/.config/ibus/ r,
+  owner @{HOME}/.config/ibus/bus/ rw,
+  owner @{HOME}/.config/ibus/bus/* rw,

profiles/apparmor.d/abstractions/samba

@@ -12,6 +12,7 @@
   /etc/samba/smb.conf r,
   /usr/share/samba/*.dat r,
   /var/lib/samba/**.tdb rwk,
+  /var/log/samba/cores/ rw,
   /var/log/samba/cores/* w,
   /var/log/samba/log.* w,
   /var/run/samba/*.tdb rw,

profiles/apparmor.d/abstractions/ubuntu-bittorrent-clients

+# vim:syntax=apparmor
 #
 # abstraction for allowing graphical bittorrent clients in Ubuntu
 #

profiles/apparmor.d/abstractions/ubuntu-browsers

+# vim:syntax=apparmor
 #
 # abstraction for allowing access to graphical browsers in Ubuntu
 #

profiles/apparmor.d/abstractions/ubuntu-browsers.d/java

+# vim:syntax=apparmor
+
   # Java plugin
   owner @{HOME}/.java/deployment/deployment.properties k,
   /etc/java-*/ r,

profiles/apparmor.d/abstractions/ubuntu-browsers.d/kde

+# vim:syntax=apparmor
+
   #include <abstractions/kde>
   /usr/bin/kde4-config PUx,

profiles/apparmor.d/abstractions/ubuntu-browsers.d/mailto

+# vim:syntax=apparmor
+
   # for mailto:
   #include <abstractions/ubuntu-email>
   #include <abstractions/ubuntu-console-email>

profiles/apparmor.d/abstractions/ubuntu-browsers.d/multimedia

+# vim:syntax=apparmor
+
   #include <abstractions/X>
 
   # Pulseaudio

profiles/apparmor.d/abstractions/ubuntu-browsers.d/plugins-common

+# vim:syntax=apparmor
+
   #
   # Plugins/helpers
   #

profiles/apparmor.d/abstractions/ubuntu-browsers.d/productivity

+# vim:syntax=apparmor
+
   # Openoffice.org
   /usr/bin/ooffice PUxr,
   /usr/bin/oocalc PUxr,

profiles/apparmor.d/abstractions/ubuntu-browsers.d/text-editors

+# vim:syntax=apparmor
+
   # Text editors (It's All Text [https://addons.mozilla.org/en-US/firefox/addon/4125])
   /usr/bin/emacsclient.emacs-snapshot PUxr,
   /usr/bin/emacsclient.emacs22 PUxr,

profiles/apparmor.d/abstractions/ubuntu-browsers.d/ubuntu-integration

+# vim:syntax=apparmor
+
   # Apport
   /usr/bin/apport-bug PUx,
 

profiles/apparmor.d/abstractions/ubuntu-browsers.d/ubuntu-integration-xul

+# vim:syntax=apparmor
+
   # firefox-notify
   #include <abstractions/python>
   /usr/bin/python2.[4567] ix,

profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files

+# vim:syntax=apparmor
+
   # Allow read to all files user has DAC access to and write access to all
   # files owned by the user in $HOME.
   @{HOME}/ r,