511322 - Clean-up about:license block for netwerk/wifi/ code

Status: RESOLVED FIXED

(Core :: General, defect, P2)

Description

[Reed Loden [:reed]]

Not sure why the patch in bug 479898 modified toolkit/content/license.html without gerv's review, but it wasn't done correctly at all. The license block for the wifi code was added at the end of the file, outside of alphabetical order, not added to the list at the top, and generally just not done correctly.

Also, this doesn't make sense:

This license applies to files in the following directories with the specified copyright year ranges:

    * netwerk/wifi/, 2009

Copyright 2008, Google Inc.

Also, what about the extra zero here?

Copyright (c) 02006, Alf Watt ([e-mail]). All
rights reserved.

Comment 1

[Reed Loden [:reed]]

and, really, isn't the license that was added only for netwerk/wifi/src/osx_wifi.h? Why is all of network/wifi/ mentioned?

Also, there's a separate license for netwerk/wifi/src/wlanapi.h that's not in about:license yet.

Comment 2

[Gervase Markham [:gerv]]

Attachment: Patch v.1

As well as fixing this bug, this also fixes bug 479726, updates the list of Initial Developers (bug 380017; reminder: this is not a credits list, it's an MPL technical requirement, people come and go, don't be offended if you are no longer on it) and tidies up a couple of other things.

Gerv

Comment 3

[Gervase Markham [:gerv]]

Pushed changeset 32529:41c213281d2d to mozilla-central. Assuming no problems with nightly builds, I'll push to 1.9.2 in a day or two.

Gerv

Comment 4

[Reed Loden [:reed]]

Fixed on trunk --> RESOLVED FIXED

Comment 5

[Reed Loden [:reed]]

Also need this on 1.9.1, too...

Comment 6

[Daniel Veditz [:dveditz]]

Not blocking a release.

Comment 7

[Reed Loden [:reed]]

(In reply to comment #6)
> Not blocking a release.

Actually, we're under legal obligation to have the license viewable in our software, so yes, it should block a release. However, if it goes through normal approvals quickly, it'll end up ok. :)

Comment 8

[Daniel Veditz [:dveditz]]

Comment on attachment 401008 [details] [diff] [review]
Patch v.1

-    <p class="correctme">This license applies to certain files in the directory
+    <p class="correctme">These licenses applies to certain files in the directory

"apply"

but, Approved for 1.9.1.4, a=dveditz

Comment 9

[Reed Loden [:reed]]

(In reply to comment #8)
> (From update of attachment 401008 [details] [diff] [review])
> -    <p class="correctme">This license applies to certain files in the
> directory
> +    <p class="correctme">These licenses applies to certain files in the
> directory
> 
> "apply"

Fixed on trunk in http://hg.mozilla.org/mozilla-central/rev/4730f6f1fe6b.

Comment 10

[Reed Loden [:reed]]

Since freeze is 24 hours away, went ahead and landed this on the branches...

http://hg.mozilla.org/releases/mozilla-1.9.2/rev/6a6bec41d9f8
http://hg.mozilla.org/releases/mozilla-1.9.1/rev/ed163c72727e

I included the s/applies/apply/ fix. I typo'd the changelog for 1.9.2 and used a=dveditz instead of a=blocking1.9.2+, but oh well.

Comment 11

[Reed Loden [:reed]]

Actually, now that I think about it, the initial developers list is different per branch, so won't that need to be done for each individual branch?

Comment 12

[Gervase Markham [:gerv]]

I've just run a check and, as it turns out, rather usefully, the set of IDs in mozilla-1.9.2 is a strict subset of those in mozilla-central, which is the list I used. So the same patch will do for both (again, relying on the "maybe" disclaimer in the language introducing the IDs). No need for a special one.

Gerv

Comment 13

[Phil Ringnalda (:philor)]

I don't suppose you're running against comm-central as well as mozilla-central for your ID updates? If so, we're probably set, but if not, we'll be shipping Tb3 fairly soon, and we'll need an update to the 1.9.1 ID list.

Comment 14

[Gervase Markham [:gerv]]

Yes, comm-central was included.

Gerv

Comment 15

[Al Billings [:abillings - ex-MoCo]]

Verified for 1.9.1 with Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.4pre) Gecko/20090930 Shiretoko/3.5.4pre in about:license.