Remove section 4.g. from BitTorrent-1.0 license. #589
Conversation
BitTorrent-1.0 on license-list has a section 4.g. that does not appear in original license. This section did not appear in pre-XML license-list, so possibly is an error introduced during conversion. See link here http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/BitTorrent?r1=1.1&r2=1.1.1.1&diff_format=s and I have also downloaded an old BitTorrent source archive and confirmed included LICENSE.txt does not include this clause (http://web.archive.org/web/20090309024144/http://download.bittorrent.com:80/dl/archive/BitTorrent-4.0.0.tar.gz). Propose to remove clause 4.g.
|
Here's v1.1 from 2007-03-10 with the 4.g. I'm still trying to find the time range for 1.0. |
|
Here is v1.0 from 2005-02-09 with no 4.g. Still no 4.g by 2005-11-24, and by 2005-12-12 they were showing v1.1. So my current impression is that adffdb0 accidentally injected v1.1 text into v1.0, and that we want to remove it here. It would be good to get @jlovejoy's opinion though. If removal is accepted, we need to decide how to recover from including the extra text in our v3. Because nobody is likely to have copied our text into a new project in the last few days and because the extra text looks legally significant, I like removing it as you do, withough a backwards-compat |
Until [1] lands, license-test-files d19d48d will break testing (by comparing our locally-broken XML against fixed test data). While that change is in flight, stick with the previous, broken test data. An alternative approach to getting a particular commit would be to use submodules, but: * I expect most contributors will find this approach easier to manipulate, because you don't have to wrap your head around submodules to use it. * The full clone (needed to ensure we still get the commit we want) is a price paid by GitHub (hosting the clone) and Travis (pulling the clone). As long as they're both willing to pay that price, it doesn't seem like it's worth jumping through too many hoops to be more efficient. [1]: spdx#589
BitTorrent-1.0 on license-list has a section 4.g. that does not appear in original license. This section did not appear in pre-XML license-list, so possibly is an error introduced during conversion. See link here http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/BitTorrent?r1=1.1&r2=1.1.1.1&diff_format=s and I have also downloaded an old BitTorrent source archive and confirmed included LICENSE.txt does not include this clause (http://web.archive.org/web/20090309024144/http://download.bittorrent.com:80/dl/archive/BitTorrent-4.0.0.tar.gz). Propose to remove clause 4.g. Cherry-picked from spdx#589 to show what a test-data bump will look like.
+1 for this as immediate next step (fixing for 3.1) For discoverably documenting errata e.g. for 3.0, I would say we should open a separate issue. |
|
ugh, yes, agreed this was a mistake on my part. In the past, if we ever had something like this, I think we simply fixed it, noted it in the comments of the old spreadsheet and got on with it. No one ever questioned that ;) but I don't really recall a similar example. |
|
On Thu, Jan 11, 2018 at 08:39:28PM +0000, Jilayne Lovejoy wrote:
(or if anyone will actually notice and it's worth worrying about too
much?)
I'm not sure if folks will notice or not, especially since
BitTorrent-1.0 is a fairly peripheral license without a large active
userbase (or any active userbase?). In that respect, I think this a
pretty lucky thing to break, so we have time to setup a plan before we
break something important (like a modern GPL), which will certainly
happen at some point.
I think docs that say “these identifiers are from the 3.0 license
list” (e.g. like Cargo's recent 2.4 claim, rust-lang/cargo#4898, but
for 3.0) will get pretty hairy if we have this sort of issue with a
widely-used license. An machine-readable errata channel would make it
as easy as possible for consumers to hear about these issues and
change their docs (e.g. to a 3.1) as quickly as possible.
|
|
as this PR has to do with the fix and that clearly needs to be fixed, I'm merging. but will open another issue and tag "for discussion" as to how to track errors like this that impact the actual text of the license (we shouldn't have many...) |
Until [1] lands, license-test-files d19d48d will break testing (by comparing our locally-broken XML against fixed test data). While that change is in flight, stick with the previous, broken test data. An alternative approach to getting a particular commit would be to use submodules, but: * I expect most contributors will find this approach easier to manipulate, because you don't have to wrap your head around submodules to use it. * The full clone (needed to ensure we still get the commit we want) is a price paid by GitHub (hosting the clone) and Travis (pulling the clone). As long as they're both willing to pay that price, it doesn't seem like it's worth jumping through too many hoops to be more efficient. [1]: spdx#589
…losing quote) Similar to 36bce3f (test: Add license-test-files with read-tree, 2018-01-03): $ git config remote.test.url https://github.com/wking/license-test-files $ git fetch test $ git merge -s ours --allow-unrelated-histories --no-commit test/apache-1.0-missing-quote $ git rm -r test $ git read-tree --prefix=test/ -u test/apache-1.0-missing-quote $ rm test/README.md test/testfiles-1.0-for-license-list-2.6.tar $ git add test The remote.test.url update is because Gary hasn't landed my just-filed [1]. The 'git rm' call avoids: $ git read-tree --prefix=test/ -u test/apache-1.0-missing-quote error: Entry 'test/simpleTestForGenerator/0BSD.txt' overlaps with 'test/simpleTestForGenerator/0BSD.txt'. Cannot bind. This catches the test data up with 558562e (Add missing close quote to Apache-1.0.xml, 2017-12-30, spdx#588) and b975b3e (Remove section 4.g. from BitTorrent-1.0 license, 2017-12-30, spdx#589). [1]: goneall/license-test-files#2
…losing quote) Similar to 36bce3f (test: Add license-test-files with read-tree, 2018-01-03): $ git config remote.test.url https://github.com/wking/license-test-files $ git fetch test $ git rm -r test $ git read-tree --prefix=test/ -u test/apache-1.0-missing-quote $ rm test/README.md test/testfiles-1.0-for-license-list-2.6.tar $ git add test The remote.test.url update is because Gary hasn't landed my just-filed [1]. The 'git rm' call avoids: $ git read-tree --prefix=test/ -u test/apache-1.0-missing-quote error: Entry 'test/simpleTestForGenerator/0BSD.txt' overlaps with 'test/simpleTestForGenerator/0BSD.txt'. Cannot bind. This catches the test data up with 558562e (Add missing close quote to Apache-1.0.xml, 2017-12-30, spdx#588) and b975b3e (Remove section 4.g. from BitTorrent-1.0 license, 2017-12-30, spdx#589). [1]: goneall/license-test-files#2
BitTorrent-1.0 on license-list has a section 4.g. that does not appear in original license. This section did not appear in pre-XML license-list, so possibly is an error introduced during conversion. See link here http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/BitTorrent?r1=1.1&r2=1.1.1.1&diff_format=s and I have also downloaded an old BitTorrent source archive and confirmed included LICENSE.txt does not include this clause (http://web.archive.org/web/20090309024144/http://download.bittorrent.com:80/dl/archive/BitTorrent-4.0.0.tar.gz). Propose to remove clause 4.g.