Patchwork [U-Boot] Improve license declaration for cmd_ini.h

login
register
mail settings
Submitter Joe Hershberger
Date Oct. 4, 2012, 7:54 p.m.
Message ID <1349380447-27961-1-git-send-email-joe.hershberger@ni.com>
Download mbox | patch
Permalink /patch/189281/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Joe Hershberger - Oct. 4, 2012, 7:54 p.m.
Instead of referenceing the source webpage (which can change) include
the license in the source file.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reported-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
---
 common/cmd_ini.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)
Albert ARIBAUD - Oct. 5, 2012, 5:26 p.m.
Hi Joe,

On Thu, 4 Oct 2012 14:54:07 -0500, Joe Hershberger
<joe.hershberger@ni.com> wrote:

> Instead of referenceing the source webpage (which can change) include
> the license in the source file.
> 
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> Reported-by: Igor Grinberg <grinberg@compulab.co.il>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Cc: Tom Rini <trini@ti.com>
> Cc: Wolfgang Denk <wd@denx.de>
> ---
>  common/cmd_ini.c | 32 ++++++++++++++++++++++++++++++--
>  1 file changed, 30 insertions(+), 2 deletions(-)
> 
> diff --git a/common/cmd_ini.c b/common/cmd_ini.c
> index 652e4f6..74481cb 100644
> --- a/common/cmd_ini.c
> +++ b/common/cmd_ini.c
> @@ -1,9 +1,37 @@
>  /*
>   * inih -- simple .INI file parser
>   *
> - * inih is released under the New BSD license (see LICENSE.txt). Go to the
> - * project home page for more info:
> + * Copyright (c) 2009, Brush Technology
> + * Copyright (c) 2012:
> + *              Joe Hershberger, National Instruments, joe.hershberger@ni.com
> + * All rights reserved.
>   *
> + * The "inih" library is distributed under the following license, which is
> + * derived from and very similar to the 3-clause BSD license:
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions are met:
> + *     * Redistributions of source code must retain the above copyright
> + *       notice, this list of conditions and the following disclaimer.
> + *     * Redistributions in binary form must reproduce the above copyright
> + *       notice, this list of conditions and the following disclaimer in the
> + *       documentation and/or other materials provided with the distribution.
> + *     * Neither the name of Brush Technology nor the names of its contributors
> + *       may be used to endorse or promote products derived from this software
> + *       without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY BRUSH TECHNOLOGY ''AS IS'' AND ANY
> + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
> + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
> + * DISCLAIMED. IN NO EVENT SHALL BRUSH TECHNOLOGY BE LIABLE FOR ANY
> + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
> + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
> + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
> + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
> + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + *
> + * Go to the project home page for more info:
>   * http://code.google.com/p/inih/
>   */

Open question: does this solve worries about the licence compatibility?

Amicalement,
Wolfgang Denk - Oct. 5, 2012, 5:51 p.m.
Dear Albert ARIBAUD,

In message <20121005192613.1420e39b@lilith> you wrote:
> 
> Open question: does this solve worries about the licence compatibility?

Not really; assuming that the previous version meant the 3-clause BSD
license (which it most probably did) there have never been any real
problems; at least http://directory.fsf.org/wiki/License:BSD_3Clause
says this is a GPL compatible license.

This patch tries to fix some ambiguities (to the extend we poor
engineers are able to deal with legal texts).

Best regards,

Wolfgang Denk
Wolfgang Denk - Oct. 5, 2012, 5:53 p.m.
Dear Joe Hershberger,

In message <1349380447-27961-1-git-send-email-joe.hershberger@ni.com> you wrote:
> Instead of referenceing the source webpage (which can change) include
> the license in the source file.

Thanks.

> --- a/common/cmd_ini.c
> +++ b/common/cmd_ini.c
> @@ -1,9 +1,37 @@
>  /*
>   * inih -- simple .INI file parser
>   *
> - * inih is released under the New BSD license (see LICENSE.txt). Go to the
> - * project home page for more info:
> + * Copyright (c) 2009, Brush Technology
> + * Copyright (c) 2012:
> + *              Joe Hershberger, National Instruments, joe.hershberger@ni.com
> + * All rights reserved.

I'd prefer if you left out this "All rights reserved."   But then,
there seems to be agreement amongt those to interpret such legal texts
that this is a void staement anyway, so here is my

Acked-by: Wolfgang Denk <wd@denx.de>

even if you leave it in.

Best regards,

Wolfgang Denk
Tom Rini - Oct. 5, 2012, 10:27 p.m.
On Thu, Oct 04, 2012 at 02:54:07PM -0500, Joe Hershberger wrote:

> Instead of referenceing the source webpage (which can change) include
> the license in the source file.
> 
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> Reported-by: Igor Grinberg <grinberg@compulab.co.il>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Cc: Tom Rini <trini@ti.com>
> Cc: Wolfgang Denk <wd@denx.de>

Applied to u-boot/master, thanks!

Patch

diff --git a/common/cmd_ini.c b/common/cmd_ini.c
index 652e4f6..74481cb 100644
--- a/common/cmd_ini.c
+++ b/common/cmd_ini.c
@@ -1,9 +1,37 @@ 
 /*
  * inih -- simple .INI file parser
  *
- * inih is released under the New BSD license (see LICENSE.txt). Go to the
- * project home page for more info:
+ * Copyright (c) 2009, Brush Technology
+ * Copyright (c) 2012:
+ *              Joe Hershberger, National Instruments, joe.hershberger@ni.com
+ * All rights reserved.
  *
+ * The "inih" library is distributed under the following license, which is
+ * derived from and very similar to the 3-clause BSD license:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Brush Technology nor the names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BRUSH TECHNOLOGY ''AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL BRUSH TECHNOLOGY BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Go to the project home page for more info:
  * http://code.google.com/p/inih/
  */