[elbe-devel] [PATCH] schema: Add XSD's missing license info

Wed Aug 24 17:31:09 CEST 2022

On 8/22/22 16:08, Bastian Germann wrote:
> The xsd.xml file was added without its applicable license which is not
> referenced in the document itself. Replace the file with the exact version
> provided by W3c (has some whitespace and > -> > changes).
>
> Add an SPDX header for it and the complete license info in debian/copyright.
> The license requires that any modifications are logged with date, so mention
> this modification in the comment itself.
>
> Fixes: 31df3c46ea ("Add support for XML catalog")
> Signed-off-by: Bastian Germann <bage at linutronix.de>
Looks sane to me.

Reviewed-by: Viraj Shah <viraj.shah at linutronix.de>

> ---
>  debian/copyright | 46 ++++++++++++++++++++++++++++++++++++++++++++++
>  schema/xml.xsd   | 18 ++++++++++++------
>  2 files changed, 58 insertions(+), 6 deletions(-)
>
> diff --git a/debian/copyright b/debian/copyright
> index f416de2eb1..5ac9ecd0a1 100644
> --- a/debian/copyright
> +++ b/debian/copyright
> @@ -48,6 +48,52 @@ Files: examples/armhf-ubuntu.xml
>  Copyright: 2020 Kory Maincent <kory.maincent at bootlin.com>
>  License: GPL-3+
>  
> +Files: schema/xml.xsd
> +Copyright: 2001 World Wide Web Consortium, (Massachusetts Institute of Technology,
> + European Research Consortium for Informatics and Mathematics, Keio University).
> + All Rights Reserved.
> +License: W3C
> + W3C SOFTWARE NOTICE AND LICENSE
> + .
> + This work (and included software, documentation such as READMEs, or other related
> + items) is being provided by the copyright holders under the following license.
> + .
> + License
> + .
> + By obtaining, using and/or copying this work, you (the licensee) agree that you
> + have read, understood, and will comply with the following terms and conditions.
> + .
> + Permission to copy, modify, and distribute this software and its documentation,
> + with or without modification, for any purpose and without fee or royalty is hereby
> + granted, provided that you include the following on ALL copies of the software and
> + documentation or portions thereof, including modifications:
> + .
> + The full text of this NOTICE in a location viewable to users of the redistributed
> + or derivative work.
> + .
> + Any pre-existing intellectual property disclaimers, notices, or terms and conditions.
> + If none exist, the W3C Software Short Notice should be included (hypertext is
> + preferred, text is permitted) within the body of any redistributed or derivative code.
> + .
> + Notice of any changes or modifications to the files, including the date changes were
> + made. (We recommend you provide URIs to the location from which the code is derived.)
> + .
> + Disclaimers
> + .
> + THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO
> + REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO,
> + WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
> + THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
> + TRADEMARKS OR OTHER RIGHTS.
> + .
> + COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
> + CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
> + .
> + The name and trademarks of copyright holders may NOT be used in advertising or
> + publicity pertaining to the software without specific, written prior permission.
> + Title to copyright in this software and any associated documentation will at all times
> + remain with copyright holders.
> +
>  License: GPL-3+
>   SPDX-License-Identifier: GPL-3.0-or-later
>   On Debian systems, the full text of the GNU General Public
> diff --git a/schema/xml.xsd b/schema/xml.xsd
> index d662b4236c..86069d73a9 100644
> --- a/schema/xml.xsd
> +++ b/schema/xml.xsd
> @@ -1,5 +1,11 @@
> -<?xml version='1.0'?>
> -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> +SPDX-License-Identifier: W3C
> +SPDX-FileCopyrightText: 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University). All Rights Reserved.
> +
> +This XML comment with the SPDX license information was added to the original file version on August, 22nd 2022.
> +-->
> +<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd">
>  <xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
>  
>   <xs:annotation>
> @@ -53,17 +59,17 @@
>  
>          To enable this, such a schema must import this schema
>          for the XML namespace, e.g. as follows:
> -        <schema . . .>
> +        <schema . . .>
>           . . .
>           <import namespace="http://www.w3.org/XML/1998/namespace"
> -                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
> +                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
>  
>          Subsequently, qualified reference to any of the attributes
>          or the group defined below will have the desired effect, e.g.
>  
> -        <type . . .>
> +        <type . . .>
>           . . .
> -         <attributeGroup ref="xml:specialAttrs"/>
> +         <attributeGroup ref="xml:specialAttrs"/>
>   
>           will define a type which will schema-validate an instance
>           element with any of those attributes</xs:documentation>

-- 
Viraj Shah
Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen
Phone: +49 7556 25 999 16; Fax.: +49 7556 25 999 99

Hinweise zum Datenschutz finden Sie hier (Informations on data privacy 
can be found here): https://linutronix.de/kontakt/Datenschutz.php

Linutronix GmbH | Firmensitz (Registered Office): Uhldingen-Mühlhofen | 
Registergericht (Registration Court): Amtsgericht Freiburg i.Br. HRB700 
806 | Geschäftsführer (Managing Directors): Heinz Egger, Thomas Gleixner