Merge lp:~jdstrand/firefox/firefox-3.5-apparmor into lp:firefox/3.5

[Jamie Strandboge]

[Jamie Strandboge (jdstrand)]

Please merge for the following AppArmor profile fixes:
    - allow gnash (LP: #429061)
    - allow access to plugins directory (LP: #428071)
    - allow access to abstractions/ubuntu-console-email,
      abstractions/ubuntu-email and abstractions/ubuntu-gnome-terminal
      for mailto:. Add commented section for using xterm and konsole

[Alexander Sack (asac)]

looks good merging revision 465. please mark the branch merged and use a new one next time.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-09-10 00:48:01 +0000
+++ debian/changelog	2009-09-14 14:04:09 +0000
@@ -36,6 +36,14 @@
       searchplugins location '/usr/lib/firefox-addons/searchplugins/
       - update debian/rules
 
+  [ Jamie Strandboge <[e-mail]> ]
+  * debian/usr.bin.firefox-3.5:
+    - allow gnash (LP: #429061)
+    - allow access to plugins directory (LP: #428071)
+    - allow access to abstractions/ubuntu-console-email,
+      abstractions/ubuntu-email and abstractions/ubuntu-gnome-terminal
+      for mailto:. Add commented section for using xterm and konsole
+
  -- Fabien Tassin <[e-mail]>  Sat, 05 Sep 2009 19:30:29 +0200
 
 firefox-3.5 (3.5.3+build1+nobinonly-0ubuntu2) karmic; urgency=low

=== modified file 'debian/usr.bin.firefox.apparmor.in'
--- debian/usr.bin.firefox.apparmor.in	2009-09-02 14:55:19 +0000
+++ debian/usr.bin.firefox.apparmor.in	2009-09-14 14:04:09 +0000
@@ -90,6 +90,8 @@
   @{HOME}/.mozilla/** rw,
   @{HOME}/.mozilla/**/*.sqlite k,
   @{HOME}/.mozilla/**/.parentlock k,
+  @{HOME}/.mozilla/plugins/** rm,
+  @{HOME}/.mozilla/**/plugins/** rm,
 
   # per-user common plugin configuration
   @{HOME}/.icedteaplugin/ rw,
@@ -142,6 +144,7 @@
   /usr/bin/oodraw Uxr,
   /usr/bin/ooimpress Uxr,
   /usr/bin/oowriter Uxr,
+  /usr/bin/gtk-gnash ixr,
 
   # totem
   /usr/lib/totem/** ixr,
@@ -159,4 +162,17 @@
   /etc/java-*-sun/** r,
   /usr/lib/jvm/java-*-sun-1.*/jre/bin/java Uxr,
 
+  # for mailto:
+  #include <abstractions/ubuntu-email>
+  #include <abstractions/ubuntu-console-email>
+
+  # Terminals for using console applications. These abstractions should ideally
+  # have 'ix' to restrct access to what only firefox is allowed to do
+  #include <abstractions/ubuntu-gnome-terminal>
+
+  # By default, we won't support launching a terminal program in Xterm or
+  # KDE's konsole. It opens up too many unnecessary files for most users.
+  # People who need this functionality can uncomment the following:
+  ##include <abstractions/ubuntu-xterm>
+  ##include <abstractions/ubuntu-konsole>
 }