[Sorry for breaking the threading, but my inbox was full so I didn't
receive the mail I'm replying to and I couldn't dig up its message-id.]
intigeri wrote:
> So, I got every bit ready, tested independently and uploaded,
> but I had no time to test the whole thing in a Tails ISO.
>
> The Tails branch that should be tested / reviewed / merged is
> feature/torbrowser. No ticket. Candidate for 0.18.
>
> What this branch does is:
>
> 1. update iceweasel with the latest Torbrowser patches
> => see our iceweasel Git repo if you're interested in the details
> 2. update iceweasel prefs accordingly
> => see 7e46ab0a..ac54761 in feature/torbrowser
> 3. update Torbutton to 1.5.2
> => see our torbutton Git repo if you're interested in the details
>
> Anonym volunteered to review & merge that stuff, but given the pretty
> short deadline before the freeze (tomorrow, 10AM CEST), I guess he
> would not mind some help.
I built an image from feature/torbrowser and made the following
observations:
Good:
* In our "normal" (i.e. non-unsafe) Iceweasel profile, all seems to work
mostly as it has before when visiting some common websites.
* Dragging tabs works again, as sajolida already reported.
* Similarly, dragging text selections => copy works again.
Bad:
* Commit 6629701 breaks the Unsafe Browser. See attached patch for a fix.
Weird:
* In the automated test suite unsafe-browser.feature obviously should
fail due to the above, but it fails even earlier then expected; the "(as
clearnet)" text in the window title isn't there any more, so sikuli
can't even detect the window. This is nothing specific to the Unsafe
Browser or even Iceweasel: try `gksu gedit`, or whatever. I couldn't
find anything in our git log about us changing this explicitly, but
maybe I didn't look deeply enough(?). This was not the case in Tails
0.17.2. Any way, we can easily fix this by just cropping away that part
of the picture, and that can IMHO even be done after the merge.
intigeri wrote:
> I had a quick look, and it seems that some (36) of the prefs we set in
> /etc/iceweasel/pref/iceweasel.js are not applied. I haven't checked if
> this is a regression against current devel or stable branches.
>
> I think we should just move all of our iceweasel.js prefs to
> user_pref() set in /etc/iceweasel/profile/user.js, and be done with
> it. It should work. Only drawback is that it makes it harder for users
> to change their config, but IMHO this is rather a feature than a bug.
>
> If nobody objects, I'll do that, quickly test it, and merge for RC1
> early tomorrow.
I don't object. I guess this means I'm not gonna do the merge then.
Well, I'll be around here pretty early tomorrow as well and help out
with tests and review.
Cheers!
diff --git a/config/chroot_local-includes/usr/local/sbin/unsafe-browser b/config/chroot_local-includes/usr/local/sbin/unsafe-browser
index dc3e082..379aaa2 100755
--- a/config/chroot_local-includes/usr/local/sbin/unsafe-browser
+++ b/config/chroot_local-includes/usr/local/sbin/unsafe-browser
@@ -156,10 +156,10 @@ configure_chroot () {
chroot ${CHROOT} apt-get remove --yes xul-ext-*
# Disable proxying in the chroot
- sed -i '/^pref("network.proxy.type",/d' \
- ${CHROOT}/etc/iceweasel/pref/iceweasel.js
- echo 'pref("network.proxy.type", 0);' >> \
- ${CHROOT}/etc/iceweasel/pref/iceweasel.js
+ sed -i '/^user_pref("network.proxy.type",/d' \
+ ${CHROOT}/etc/iceweasel/profile/user.js
+ echo 'user_pref("network.proxy.type", 0);' >> \
+ ${CHROOT}/etc/iceweasel/profile/user.js
rm -rf ${CHROOT}/etc/iceweasel/profile/extensions
# Set a scary theme (except if we're using Windows camouflage)
