Closed Bug 797240 Opened 8 years ago Closed 6 years ago

Update suite/common/app-license.html to reference MPL2 and fix inclusion into about:license

Categories

(SeaMonkey :: Build Config, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED
seamonkey2.29

People

(Reporter: tonymec, Assigned: philip.chee)

References

Details

Attachments

(1 file, 2 obsolete files)

At the current comm-central changeset 17c2cee4815c, the file suite/common/app-license.html includes an MPL2 comment at its top, but the body of the file links to http://www.mozilla.org/legal/eula/ which (in turn) consists only of a set of links to the text of the MPL 1.1.

I found this app-license.html serendipitously by searching MXR, I don't know if it is "user-visible". In particular it is not used by the SeaMonkey about:license, which AFAICT is identical with the one used by Firefox (a Toolkit file, maybe?)

The whole file is very short, as follows:

<!-- This Source Code Form is subject to the terms of the Mozilla Public
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

    <p>Official <b>binaries</b> of this product released by the 
    <a href="http://www.mozilla.org/">Mozilla Foundation</a>
    are made available under 
    <a href="http://www.mozilla.org/legal/eula/">the corresponding 
    EULA</a>.</p>
Oops: the initial paragraph in the Firefox about:license seems to correspond to this file, but it is missing (not replaced by this text) in the SeaMonkey about:license.
A little digging shows that the top comment was added by bug 757018 at comm-central changeset 84ac3c711098 ; otherwise the file hadn't changed since the initial import from CVS into comm-central. My guess (just a guess) is that this file has become dead code since the switchover of SeaMonkey to MPL2.
A fact being better than a guess, I did the following search: http://mxr.mozilla.org/comm-central/search?string=app-license.html

…but I'm not sure how to interpret the results.
I find the following block suggestive, at the end of suite/common/Makefile.in :

# DEFINES for preprocessing
# Use suite/common/app-license.html as input when generating 
# chrome://content/communicator/license.html to override 
# chrome://global/content/license.html (about:license)
DEFINES += -DAPP_EULA_BLOCK=$(abs_srcdir)/app-license.html \
           -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
           -DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME) \
           $(NULL)



The string APP_EULA_BLOCK is found nowhere else in the whole source.
The MPL header at the top of the file is a red herring. The actual problem here is that SeaMonkey is not under a "Mozilla Foundation EULA"; binaries of Mozilla software released by Mozilla are themselves released under the MPL (now MPL 2), as of a couple of years ago.

So the contents of this file need updating to say that. The equivalent fragment in Firefox, as seen in about:license, says:

"Binaries of this product have been made available to you by the Mozilla Project under the Mozilla Public License 2.0 (MPL). Know your rights."

(with various links). SeaMonkey should say that also.

Gerv
In reply to comment #5: Maybe replace APP_EULA_BLOCK by APP_LICENSE_BLOCK in the SeaMonkey Makefile as it has been done in Firefox & Thunderbird, and at the same time replace this file by a copy of the Firefox app-license.txt as it is today?

Gerv, Neil, Callek, what do you think?
Component: General → Build Config
P.S. …perhaps a "suitably adjusted" copy of the Firefox app-license.txt, including e.g. a link to

<a href="http://www.seamonkey-project.org/">the SeaMonkey Project</a>

?
P.P.S. …and (before my 1st cup of tea after my afternoon siesta) I meant the firefox app-license.html of course.
Attached patch Patch v1.0 Proposed fix. (obsolete) — Splinter Review
Ports the following bugs:

Bug 464994 - about:license and about:rights potentially contradict each other
Bug 730814 - update about:license to MPL 2. Also add a link to the FAQ,
correct a few inaccuracies about what license applies to what, and make the
document validate as HTML5
Assignee: nobody → philip.chee
Status: NEW → ASSIGNED
Attachment #8380358 - Flags: review?(neil)
Attachment #8380358 - Flags: review?(jh)
Attachment #8380358 - Flags: review?(iann_bugzilla)
Attachment #8380358 - Flags: review?(bugspam.Callek)
Comment on attachment 8380358 [details] [diff] [review]
Patch v1.0 Proposed fix.

r=me based on code inspection only.
Attachment #8380358 - Flags: review?(neil) → review+
Comment on attachment 8380358 [details] [diff] [review]
Patch v1.0 Proposed fix.

Cancelling review requests. We are missing a bit of code that references this file (like Firefox and Thunderbird do).
Attachment #8380358 - Flags: review?(jh)
Attachment #8380358 - Flags: review?(iann_bugzilla)
Attachment #8380358 - Flags: review?(bugspam.Callek)
Summary: MPL1 or MPL2? suite/common/app-license.html has MPL2 heading but MPL1 link → Update suite/common/app-license.html to reference MPL2 and fix inclusion into about:license
Attached patch Patch v1.1 better fix (obsolete) — Splinter Review
> -CHROME_DEPS += $(abs_srcdir)/app-license.html
Bug 934361 - Remove CHROME_DEPS

> -DEFINES += -DAPP_EULA_BLOCK=$(abs_srcdir)/app-license.html \
> +DEFINES += -DAPP_LICENSE_BLOCK=$(abs_srcdir)/app-license.html \
Bug 464994 fixed this for Firefox and Thunderbird. I guess they forgot SeaMonkey - again.

> +    <p><b>Binaries</b> of this product have been made available to you by the
> +    <a href="http://www.seamonkey-project.org/">The SeaMonkey Project</a>
> +    under the Mozilla Public License 2.0 (MPL).
> +    <a href="about:rights">Know your rights</a>.</p>
I changed:
<a href="http://www.mozilla.org/">Mozilla Project</a>
to:
<a href="http://www.seamonkey-project.org/">The SeaMonkey Project</a>

> Bug 730814 ... and make the document validate as HTML5
Despite the commit message, license.html never was and certainly is not HTML5 compliant.
Attachment #8380358 - Attachment is obsolete: true
Attachment #8380649 - Flags: review?(neil)
Attachment #8380649 - Flags: review?(jh)
Attachment #8380649 - Flags: review?(iann_bugzilla)
Attachment #8380649 - Flags: review?(bugspam.Callek)
> Bug 464994 fixed this for Firefox and Thunderbird. I guess they forgot SeaMonkey
> - again.
To test this patch go to about:license
Check that the app-license.html snippet is included properly in about:license
Callek suggested that I do a dep build after touching app-license.html so I changed "Mozilla Public License 2.0" to "SeaMonkey Public License 2.0" and rebuilt. The change worked.
Comment on attachment 8380649 [details] [diff] [review]
Patch v1.1 better fix

Review of attachment 8380649 [details] [diff] [review]:
-----------------------------------------------------------------

logistical r+

r? to gerv, karsten or mcsmurf for legal implications
Attachment #8380649 - Flags: review?(neil)
Attachment #8380649 - Flags: review?(mnyromyr)
Attachment #8380649 - Flags: review?(jh)
Attachment #8380649 - Flags: review?(iann_bugzilla)
Attachment #8380649 - Flags: review?(gerv)
Attachment #8380649 - Flags: review?(bugzilla)
Attachment #8380649 - Flags: review?(bugspam.Callek)
Attachment #8380649 - Flags: review+
Comment on attachment 8380649 [details] [diff] [review]
Patch v1.1 better fix

about:license says with this patch:
"made available to you by the The SeaMonkey Project "

double "the"? I think one is enough. Just linkify the "SeaMonkey Project" and leave out the "The".
Attachment #8380649 - Flags: review?(mnyromyr)
Attachment #8380649 - Flags: review?(gerv)
Attachment #8380649 - Flags: review?(bugzilla)
Attachment #8380649 - Flags: review-
> double "the"? I think one is enough. Just linkify the "SeaMonkey Project" and 
> leave out the "The".
Fixed.
Attachment #8380649 - Attachment is obsolete: true
Attachment #8392984 - Flags: review?(bugzilla)
Comment on attachment 8392984 [details] [diff] [review]
Patch v1.2 with no the The.

(In reply to Justin Wood (:Callek) from comment #16)
> r? to gerv, karsten or mcsmurf for legal implications
Re-adding Karsten and Gerv. Not sure what Justin means about legal implications. app-license.html had been broken for ages. This patch just un-breaks it and brings us up to par with Thunderbird and Firefox.
Attachment #8392984 - Flags: review?(mnyromyr)
Attachment #8392984 - Flags: review?(gerv)
Comment on attachment 8392984 [details] [diff] [review]
Patch v1.2 with no the The.

Assuming this has the obvious effect, LGTM. r=gerv.

Gerv
Attachment #8392984 - Flags: review?(gerv) → review+
Comment on attachment 8392984 [details] [diff] [review]
Patch v1.2 with no the The.

Poke mcsmurf and Mnyromyr
Flags: needinfo?(mnyromyr)
Flags: needinfo?(bugzilla)
Comment on attachment 8392984 [details] [diff] [review]
Patch v1.2 with no the The.

Looks and works fine
Attachment #8392984 - Flags: review?(mnyromyr)
Attachment #8392984 - Flags: review?(bugzilla)
Attachment #8392984 - Flags: review+
Flags: needinfo?(mnyromyr)
Flags: needinfo?(bugzilla)
Pushed to comm-central:
http://hg.mozilla.org/comm-central/rev/d853681a4c05
Status: ASSIGNED → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Target Milestone: --- → seamonkey2.29
Blocks: 1595761
You need to log in before you can comment on or make changes to this bug.