Merge pull request #1410 from swinslow/x11-update

Updating X11 and adding variant (replacement PR)

Author: swinslow

src/X11-distribute-modifications-variant.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
+   <license isOsiApproved="false" licenseId="X11-distribute-modifications-variant" name="X11 License Distribution Modification Variant" listVersionAdded="3.16">
+      <crossRefs>
+         <crossRef>https://github.com/mirror/ncurses/blob/master/COPYING</crossRef>
+      </crossRefs>
+      <notes>This is same as X11, but with an additional "distribute with modifications" grant and does not have the trademark at the end.</notes>
+    <text>
+      <copyrightText>
+         <p>Copyright (c) &lt;year&gt; &lt;copyright holders&gt;</p>
+      </copyrightText>
+
+      <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+         associated documentation files (the "Software"), to deal in the Software without restriction,
+         including without limitation the rights to use, copy, modify, merge, publish, distribute, distribute with modifications, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+         subject to the following conditions:</p>
+      <p>The above copyright notice and this permission notice shall be included in all copies or substantial
+         portions of the Software.</p>
+      <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+         LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+         NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+         ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+         USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
+      <p>Except as contained in this notice, the name(s) of the above copyright holders shall not be used in advertising or
+         otherwise to promote the sale, use or other dealings in this Software without prior written
+         authorization.</p>
+    </text>
+  </license>
+</SPDXLicenseCollection>

src/X11.xml

@@ -22,13 +22,13 @@
          portions of the Software.</p>
       <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
          LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-         NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+         NO EVENT SHALL <alt match=".+" name="nameDisclaimer">THE X CONSORTIUM</alt> BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
          ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
          USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
-      <p>Except as contained in this notice, the name of the X Consortium shall not be used in advertising or
+      <p>Except as contained in this notice, the name of <alt match=".+" name="name2Disclaimer">the X Consortium</alt> shall not be used in advertising or
          otherwise to promote the sale, use or other dealings in this Software without prior written
-         authorization from the X Consortium.</p>
-      <p>X Window System is a trademark of X Consortium, Inc.</p>
+	      authorization from <alt match=".+" name="name3Disclaimer">the X Consortium.</alt></p>
+      <optional><p>X Window System is a trademark of X Consortium, Inc.</p></optional>
     </text>
   </license>
 </SPDXLicenseCollection>

test/simpleTestForGenerator/X11-distribute-modifications-variant.txt

@@ -0,0 +1,25 @@
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, distribute with modifications, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization.