Merge lp:~jackweirdy/vidalia/680192 into lp:ubuntu/saucy/vidalia

[Jack Wearden]

Fixes bug https://bugs.launchpad.net/ubuntu/+source/vidalia/+bug/680192 by adding
    /usr/sbin/tor Ux,
to the apparmor profile

[Robie Basak (racb)]

Jack,

Thanks for the merge proposal. This looks good, but we don't currently have a delta against Debian on this package, and it looks likely that this bug would affect Debian too. We can apply your patch straight to Ubuntu and introduce a delta, but this means that we'll need to start merging every upstream release in Debian into Ubuntu to stop it falling behind. Could you please determine if this bug is relevant to Debian, and if so file a bug in Debian against the vidalia package there, attaching your patch? If this bug is fixed promptly in Debian, then we can just sync the Debian fix to Ubuntu without having to introduce a delta. If it takes longer to fix in Debian, then we can introduce a delta in Ubuntu to fix the problem for now, until the Debian bug is fixed. Thanks!

[Jack Wearden (jackweirdy)]

Will do that now! Thanks for the help!

[Robie Basak (racb)]

Thanks for submitting the bug to Debian! Based on the feedback on that bug, I'm not sure of the best approach to take here now. I'll comment on the bug itself.

[Robie Basak (racb)]

It isn't clear what the appropriate action for the Ubuntu package for vidalia is here, so removing this from the sponsorship queue for now.

review: Needs Information

Unmerged revisions

22. By Jack Wearden <email address hidden> on 2013-08-05

Fixes bug https://bugs.launchpad.net/ubuntu/+source/vidalia/+bug/680192

=== modified file 'debian/apparmor-profile'
--- debian/apparmor-profile	2012-07-13 20:20:45 +0000
+++ debian/apparmor-profile	2013-08-05 19:08:24 +0000
@@ -13,6 +13,9 @@
   /{var/,}run/tor/control.authcookie r,
 
   /usr/share/icons/*/index.theme k,
+  #Fixes ubuntu bug https://bugs.launchpad.net/ubuntu/+source/vidalia/+bug/680192
+  /usr/sbin/tor Ux,
+
 
   # Site-specific additions and overrides. See local/README for details.
   #include <local/usr.bin.vidalia>