From 160f38ba11eef902e67d050ded8e1b37beda6708 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 27 Nov 2017 17:22:03 -0800 Subject: [PATCH 1/4] ISC title variations The colon in `ISC License:` is probably copied from https://www.isc.org/downloads/software-support-policy/isc-license/ where it is part of a longer string that is more clearly not even supposed to be included in the text ("Text of the ISC License:") so I think it makes sense to support matching the colon but not have it be canonical -- not sure I've seen it in the wild. I have seen `The ISC License plenty`, eg one of the most starred ISC repos on github.com -- https://github.com/isaacs/node-glob/blob/master/LICENSE I have also seen `ISC License (ISC)`, probably because that's what seems to be on https://opensource.org/licenses/isc-license.txt if you take the heading to be part of the license text, which people often do. Note the version at https://choosealicense.com/licenses/isc/ just has `ISC License` and that version is of course popular. --- src/ISC.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ISC.xml b/src/ISC.xml index cd2604154..d0eac03c5 100644 --- a/src/ISC.xml +++ b/src/ISC.xml @@ -6,7 +6,7 @@ http://www.opensource.org/licenses/ISC -

ISC License:

+

ISC License

Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC") @@ -25,4 +25,4 @@ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

- \ No newline at end of file + From f6c2b0bbd2abdff12dbc9e6b7b222e7586793b8d Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 28 Nov 2017 10:22:31 -0800 Subject: [PATCH 2/4] escape parens in regex, support ISCL As pointed out at https://github.com/spdx/license-list-XML/pull/497#issuecomment-347605795 ISCL is used in some communities, and sometimes appears in license files https://github.com/search?utf8=%E2%9C%93&q=ISCL+filename%3ALICENSE&type=Code --- src/ISC.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ISC.xml b/src/ISC.xml index d0eac03c5..7dd3b4c6a 100644 --- a/src/ISC.xml +++ b/src/ISC.xml @@ -6,7 +6,7 @@ http://www.opensource.org/licenses/ISC -

ISC License

+

ISC License

Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC") From e50c6a2d66ee1c9f1749250a3372199afd60c6b7 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 2 Dec 2017 16:16:23 -0800 Subject: [PATCH 3/4] @goneall review + [L]? --- src/ISC.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ISC.xml b/src/ISC.xml index 7dd3b4c6a..3af1f8ba8 100644 --- a/src/ISC.xml +++ b/src/ISC.xml @@ -6,7 +6,7 @@ http://www.opensource.org/licenses/ISC -

ISC License

+

Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC") From df6ab04ba962d52bcee7423ce2df8facb52b95df Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 4 Dec 2017 10:11:18 -0800 Subject: [PATCH 4/4] Title in published text --- src/ISC.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ISC.xml b/src/ISC.xml index 3af1f8ba8..3f23ba4aa 100644 --- a/src/ISC.xml +++ b/src/ISC.xml @@ -6,7 +6,7 @@ http://www.opensource.org/licenses/ISC -

+

ISC License

Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")