410290 - Update to Flashblock 1.5.5

Status: RESOLVED FIXED

(Camino Graveyard :: Annoyance Blocking, defect)

Description

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

There's a new version of Flashblock out there, 1.5.5.  We should investigate updating to it (and sooner rather than later to get baking if we want to take it in Camino 1.5.5).

Philip, I also noticed that 1.5.unstable has a couple of regression fixes for accidental blocking of Silverlight and alternate content; are there plans to do a new point release for those any time soon, or are we safe taking unstable (assuming no other, unstable, changes have landed in "unstable")?

Comment 1

[Philip Chee]

Currently the only changes in -unstable are the two listed:

1. Silverlight - They've changed the mimetype which I didn't know. Low risk fix.
2. sIFR - breakage problem only exists on trunk (Firefox 3.0b2). Apparently they've tightened up the CSS parser. Again a low risk fix.

I don't plan to do a point release since issue #2 exists only on trunk and generally I don't do a point release unless there is a bad regression or severe impact on our users.

I would say you are safe in taking the current -unstable (no other changes have been made).

Comment 2

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Attachment: Upgrade to Flashblock 1.5.5+ (-w)

This gets us to the current Flashblock unstable (which is 1.5.5 plus fixes for two regressions detailed above).

The diff is -w since there's some line-ending weirdness (we're in cvs with Windows line-endings, and I think it makes sense for us to move over to Unix line-endings).

Comment 3

[Philip Chee]

Comment on attachment 295056 [details] [diff] [review]
Upgrade to Flashblock 1.5.5+ (-w)

> +		if (!isGecko17)

I'm sorry but I forgot to inform you that if you are checking out flashblock.xml from our CVS you will need to use the "FLASHBLOCK_1_5_CLEANUP_BRANCH" tag (for historical purposes) otherwise you'll get the version for Flashblock 1.3.8+ which has bits to support older browsers such as Firefox 1.0. This probably explains your line ending problems.

Comment 4

[Philip Chee]

See:
http://www.mozdev.org/source/browse/flashblock/source/content/flashblock/flashblock.xml?only_with_tag=FLASHBLOCK_1_5_CLEANUP_BRANCH

The diff should look something like:
http://www.mozdev.org/source/browse/flashblock/source/content/flashblock/flashblock.xml.diff?r1=1.8.2.24;r2=1.8.2.25;only_with_tag=FLASHBLOCK_1_5_CLEANUP_BRANCH

I apologize for any confusion caused by our somewhat eccentric use of CVS.

Comment 5

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Attachment: Upgrade to Flashblock 1.5.5+ (-w), v2

OK, right diff this time; thanks for catching that, Philip.

This matches Philip's diff once I modified those parameters to start from the revision we currently have in the tree, except the diff shows a "fix" for an additional funky line-ending section we seem to have had in our copy (see the one really long line).

Again -w to cut out (most of) the funny business with CRLF -> LF conversion.

Comment 6

[Mark Mentovai]

Comment on attachment 295194 [details] [diff] [review]
Upgrade to Flashblock 1.5.5+ (-w), v2

Looks good.  Do whatever it takes to get the text files in CVS to have only LF line endings.

Comment 7

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Checked in on the trunk and MOZILLA_1_8_BRANCH; we'll check on this again for the 1_5 branch after we've heard good things about it.

Comment 8

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Attachment: The actual patch checked-in

Since for whatever reason I never posted the non -w patch, and I'm posting all the 1_5 branch patches as I check on those bugs, I'm posting the non -w patch (i.e., as checked in) here, too.

Comment 9

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Checked in on the CAMINO_1_5_BRANCH.  Flashblock 1.5.5 for Camino 1.5.5; isn't that fun!