431713 - update EULA to v3.0

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[Mike Beltzner [:beltzner, not reading bugmail]]

Updated EULA text attached.

Also, for places where we control formatting:

>> Harvey; what's the requirement for emphasis, here? Do we need ALL CAPS? Can I
>> perhaps small caps? :) Am I pushing it?
>> 
>
>Emphasis could be: 1) italics; 2) small caps; 3) bold; 4) underline (very ugly
>and not recommended. There should be some. your choice from the above.
>recommend 1 or 2.

Comment 1

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: EULA v3.0 (txt, UTF-8)

Comment 2

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: update EULA, EULA.rtf and EULA.xhtml to v3.0

First pass at a patch:
 - updates browser/EULA
 - updates browser/EULA.rtf (and switches ALL CAPS to bold)
 - updates browser/base/content/EULA.xhtml (and switches ALL CAPS to bold)

Note that the previous text version of the EULA v3.0 is obsolete, as Harvey and I found some errors. This diff should be taken as canonical.

Still do to:
 - update browser/branding/unofficial/license.r
 - update browser/app/profile/firefox.js#646 (to rev the version for updates)

Comment 3

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: update EULA, EULA.rtf and EULA.xhtml to v3.0

Comment 4

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: update EULA, EULA.rtf and EULA.xhtml to v3.0

Oops, forgot to bold a section in the xhtml!

Comment 5

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: update EULA, EULA.rtf and EULA.xhtml to v3.0

And now with less curly apostrophes in the rtf, and only one clause 5!

Comment 6

[Mike Connor [:mconnor]]

Attachment: bump version to 3, show EULA on first run for Linux

This is needed so this works right on Linux, we need to take this change at the same time.

Comment 7

[:Gavin Sharp [email: [e-mail]]]

Comment on attachment 319029 [details] [diff] [review]
bump version to 3, show EULA on first run for Linux

Please make sure to test that the elifdef works correctly, or just change to using simple #ifdefs.

Comment 8

[Mike Connor [:mconnor]]

Comment on attachment 319029 [details] [diff] [review]
bump version to 3, show EULA on first run for Linux

yes, it works.  its documented, so it better work! (also, used in /mail)

Comment 9

[Mike Beltzner [:beltzner, not reading bugmail]]

Just need to patch license.r now - I've had a look at how mento did this last time, and think I know what I'm doing. Will probably ask him for review, though.

Anyone know what file format to save that in? Mac UTF-8?

Comment 10

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: update EULA to v3.0 in all places (EULA, EULA.rtf, EULA.xhtml, license.r)

Connor, please review with attention to file format and apostrophes and such. I'm pretty sure I got it right.

Comment 11

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: update EULA to v3.0 in all places (EULA, EULA.rtf, EULA.xhtml, license.r)

Bah, messed up the hex offset in the browser/base/app/macbuild/license.r file; fixed here.

Comment 12

[Mike Connor [:mconnor]]

Comment on attachment 319276 [details] [diff] [review]
update EULA to v3.0 in all places (EULA, EULA.rtf, EULA.xhtml, license.r)

looks good to me, ship it.

Comment 13

[:Gavin Sharp [email: [e-mail]]]

mozilla/browser/EULA 	1.6
mozilla/browser/EULA.rtf 	1.4
mozilla/browser/base/content/EULA.xhtml 	1.2
mozilla/browser/app/macbuild/license.r 	1.4
mozilla/other-licenses/branding/firefox/license.r 	1.4 

Comment 14

[:Gavin Sharp [email: [e-mail]]]

Landed mconnor's patch as well:
mozilla/browser/app/profile/firefox.js 	1.331 

Comment 15

[:Gavin Sharp [email: [e-mail]]]

Had to undo the Linux default change temporarily because the EULA dialog causes havoc on the unit test/Talos machines.

http://bonsai.mozilla.org/cvsview2.cgi?diff_mode=context&whitespace_mode=show&subdir=mozilla/browser/app/profile&command=DIFF_FRAMESET&file=firefox.js&rev1=1.331&rev2=1.332

Will need to update the testing/talos profiles to avoid this problem.

Comment 16

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

Do you need to update browser/branding/unofficial/license.r, too, or are you projecting further changes to the EULA before the next time you alpha?  

I forget which combination of build flags gets you using that license.r, but I know it's the one that was used for official alpha releases since I found bugs in it in Alpha 1 ;)

Comment 17

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: update to EULA v3.0 in browser/branding/unofficial/license.r

Curses!

Comment 18

[:Gavin Sharp [email: [e-mail]]]

Attachment: patch (also updates testing profiles)

I think this is probably sufficient, but I'm not entirely sure whether Talos uses automation.py for its profile creation (or whether a change in CVS will automatically be pushed to production machines).

Comment 19

[:Gavin Sharp [email: [e-mail]]]

mozilla/browser/branding/unofficial/license.r 	1.4 

Comment 20

[:Gavin Sharp [email: [e-mail]]]

Attachment: patch

This one includes testing/tools/profiles/createTestingProfile.py

Comment 21

[:Gavin Sharp [email: [e-mail]]]

Attachment: tweaked patch

addressed some comments from mconnor on IRC.

Comment 22

[Mike Connor [:mconnor]]

Comment on attachment 319327 [details] [diff] [review]
tweaked patch

r+a=mconnor

Comment 23

[:Gavin Sharp [email: [e-mail]]]

mozilla/browser/components/nsBrowserGlue.js 	1.92
mozilla/browser/app/profile/firefox.js 	1.333
mozilla/build/pgo/automation.py.in 	1.10
mozilla/testing/mochitest/runtests.pl.in 	1.53
mozilla/testing/tools/profiles/createTestingProfile.py 	1.5 

Comment 24

[:Gavin Sharp [email: [e-mail]]]

I had to back out the change of default for Linux again, because apparently Talos doesn't use createTestingProfile.py. Will need to investigate further.

Comment 25

[:Gavin Sharp [email: [e-mail]]]

After talking with Alice and robcee, filed bug 432321 to get the changes made to the talos profiles in production.

Comment 26

[:Gavin Sharp [email: [e-mail]]]

I think we need to update build-seamonkey-util.pl to add the override pref as well, since the bloat test timed out on the linux machine when this patch was in.

Comment 27

[:Gavin Sharp [email: [e-mail]]]

Attachment: build-seamonkey-util.pl patch

This should fix the bloat test timeouts. Not sure who's best to review this.

Comment 28

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 319478 [details] [diff] [review]
build-seamonkey-util.pl patch

Looks fine to me, r+

Comment 29

[:Gavin Sharp [email: [e-mail]]]

(In reply to comment #27)
> Created an attachment (id=319478) [details]
> build-seamonkey-util.pl patch

Landed this patch in advance of re-fixing this:
mozilla/tools/tinderbox/build-seamonkey-util.pl 	1.388

Comment 30

[:Gavin Sharp [email: [e-mail]]]

Attachment: re-enable

Now that bug 432321 is fixed we should be good to go.

Comment 31

[:Gavin Sharp [email: [e-mail]]]

mozilla/browser/app/profile/firefox.js 	1.335 

Comment 32

[Tony Chung [:tchung]]

Verified on Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9pre) Gecko/2008050707 Minefield/3.0pre.

still need to check on mac and windows

Comment 33

[Bob Uliss]

Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10.5; en-US; rv:1.9) Gecko/2008051202 Firefox/3.0

Found a new bug making sure this one was FIXED on MAC