[Buildroot] [PATCH 0/2] python-numpy: update package licensing

[Buildroot] [PATCH 0/2] python-numpy: update package licensing

[Giulio Benetti]

Correct actual hash LICENSE.txt base license file
Update license list according to bundle libraries licenses

Giulio Benetti (2):
  python-numpy: correct LICENSE.txt hash value
  python-numpy: fix make legal-info failure

 ...02-Add-sublibraries-missing-licenses.patch | 89 +++++++++++++++++++
 package/python-numpy/python-numpy.hash        |  6 +-
 package/python-numpy/python-numpy.mk          |  7 +-
 3 files changed, 99 insertions(+), 3 deletions(-)
 create mode 100644 package/python-numpy/0002-Add-sublibraries-missing-licenses.patch

-- 
2.17.1

[Buildroot] [PATCH 1/2] python-numpy: correct LICENSE.txt hash value

[Giulio Benetti]

LICENSE.txt sha256 is wrong. After version bumping from 1.13.3 to 1.15.1
LICENSE.txt sha256 has not be re-calculated.

New LICENSE.txt lists licenses for bundled libraries:
- Numpydoc -> 2-clause BSD
- scipy-sphinx-theme -> 3-clause BSD, PSF and Apache 2.0
- lapack-lite -> 3-clause BSD
- tempita -> BSD derived
- dragon4 -> specific to library, need to refer to dragon4.c file

Update sha256 recalculating it locally.

Fixes:
http://autobuild.buildroot.net/results/08e/08e1121af151c65b2333e06839256eb13f4ad800//
http://autobuild.buildroot.net/results/9d0/9d0e557c5946b76aa4c8c87b7616433c16b61e20//

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
 package/python-numpy/python-numpy.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash
index 055eb29f6f..7c7f446118 100644
--- a/package/python-numpy/python-numpy.hash
+++ b/package/python-numpy/python-numpy.hash
@@ -1,4 +1,4 @@
 # Copied from https://github.com/numpy/numpy/releases/tag/v1.15.1
 sha256	3c1ccce5d935ef8df16ae0595b459ef08a5cdb05aee195ebc04b9d89a72be7fa	numpy-1.15.1.tar.gz
 # License files, locally calculated
-sha256	94eebc7c8f86a287c1e9146ed52ebcde88183806d848d8c66e0e52d1aebf3b13	LICENSE.txt
+sha256	9e85ee1c3f11444243c9b7667721592a01f1cd90cb28ad937ac99f6241d6b685	LICENSE.txt
-- 
2.17.1

[Buildroot] [PATCH 2/2] python-numpy: fix make legal-info failure

[Giulio Benetti]

Release 1.15.1 tarball doesn't contain all sublibraries license files
listed in the base LICENSE.txt file.
This makes python-numpy-legal-info incomplete.

Add patch to add missing sublibraries license files:
- numpy/linalg/lapack_lite/LICENSE.txt
- tools/npy_tempita/license.txt
and therefore their sha256 into hash file.
Update also PYTHON_NUMPY_LICENSE adding:
BSD-2-Clause PSF Apache-2.0 MIT Zlib

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
 ...02-Add-sublibraries-missing-licenses.patch | 89 +++++++++++++++++++
 package/python-numpy/python-numpy.hash        |  4 +
 package/python-numpy/python-numpy.mk          |  7 +-
 3 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 package/python-numpy/0002-Add-sublibraries-missing-licenses.patch

diff --git a/package/python-numpy/0002-Add-sublibraries-missing-licenses.patch b/package/python-numpy/0002-Add-sublibraries-missing-licenses.patch
new file mode 100644
index 0000000000..457aaa945f
--- /dev/null
+++ b/package/python-numpy/0002-Add-sublibraries-missing-licenses.patch
@@ -0,0 +1,89 @@
+Add sublibraries license files
+
+On Release 1.15.1 tarball two license files are missing:
+- numpy/linalg/lapack_lite/LICENSE.txt
+- tools/npy_tempita/license.txt
+
+Add them to sources to keep licensing information complete.
+
+Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
+
+diff -urpN numpy-1.15.1.orig/numpy/linalg/lapack_lite/LICENSE.txt numpy-1.15.1/numpy/linalg/lapack_lite/LICENSE.txt
+--- numpy-1.15.1.orig/numpy/linalg/lapack_lite/LICENSE.txt	1970-01-01 01:00:00.000000000 +0100
++++ numpy-1.15.1/numpy/linalg/lapack_lite/LICENSE.txt	2018-09-11 00:00:41.239919567 +0200
+@@ -0,0 +1,48 @@
++Copyright (c) 1992-2013 The University of Tennessee and The University
++                        of Tennessee Research Foundation.  All rights
++                        reserved.
++Copyright (c) 2000-2013 The University of California Berkeley. All
++                        rights reserved.
++Copyright (c) 2006-2013 The University of Colorado Denver.  All rights
++                        reserved.
++
++$COPYRIGHT$
++
++Additional copyrights may follow
++
++$HEADER$
++
++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 listed
++  in this license in the documentation and/or other materials
++  provided with the distribution.
++
++- Neither the name of the copyright holders nor the names of its
++  contributors may be used to endorse or promote products derived from
++  this software without specific prior written permission.
++
++The copyright holders provide no reassurances that the source code
++provided does not infringe any patent, copyright, or any other
++intellectual property rights of third parties.  The copyright holders
++disclaim any liability to any recipient for claims brought against
++recipient by any third party for infringement of that parties
++intellectual property rights.
++
++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++"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 THE COPYRIGHT
++OWNER OR CONTRIBUTORS 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.
+diff -urpN numpy-1.15.1.orig/tools/npy_tempita/license.txt numpy-1.15.1/tools/npy_tempita/license.txt
+--- numpy-1.15.1.orig/tools/npy_tempita/license.txt	1970-01-01 01:00:00.000000000 +0100
++++ numpy-1.15.1/tools/npy_tempita/license.txt	2018-09-11 00:00:41.271919819 +0200
+@@ -0,0 +1,23 @@
++License
++-------
++
++Copyright (c) 2008 Ian Bicking and Contributors
++
++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, 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 AUTHORS OR 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.
diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash
index 7c7f446118..9df9f63f06 100644
--- a/package/python-numpy/python-numpy.hash
+++ b/package/python-numpy/python-numpy.hash
@@ -2,3 +2,7 @@
 sha256	3c1ccce5d935ef8df16ae0595b459ef08a5cdb05aee195ebc04b9d89a72be7fa	numpy-1.15.1.tar.gz
 # License files, locally calculated
 sha256	9e85ee1c3f11444243c9b7667721592a01f1cd90cb28ad937ac99f6241d6b685	LICENSE.txt
+sha256	426a5a484480f57a295db48c2c04f47bb3274752dd82a7fd6541dfa2cb90f641	doc/sphinxext/LICENSE.txt
+sha256	a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55	numpy/linalg/lapack_lite/LICENSE.txt
+sha256	badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e	tools/npy_tempita/license.txt
+sha256	d37526b4a34c0aa859afe6f9b7e64ca7c306b7430df8113dd5ac6fcb246bd2d4	numpy/core/src/multiarray/dragon4.c
diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk
index bd5fe7e6a9..c7c3ef1738 100644
--- a/package/python-numpy/python-numpy.mk
+++ b/package/python-numpy/python-numpy.mk
@@ -7,8 +7,11 @@
 PYTHON_NUMPY_VERSION = 1.15.1
 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz
 PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION)
-PYTHON_NUMPY_LICENSE = BSD-3-Clause
-PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt
+PYTHON_NUMPY_LICENSE = BSD-3-Clause BSD-2-Clause PSF Apache-2.0 MIT Zlib
+PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt doc/sphinxext/LICENSE.txt \
+                       numpy/linalg/lapack_lite/LICENSE.txt \
+                       tools/npy_tempita/license.txt \
+                       numpy/core/src/multiarray/dragon4.c
 PYTHON_NUMPY_SETUP_TYPE = setuptools
 
 ifeq ($(BR2_PACKAGE_CLAPACK),y)
-- 
2.17.1

[Buildroot] [PATCH 2/2] python-numpy: fix make legal-info failure

[Thomas Petazzoni]

Hello,

On Tue, 11 Sep 2018 00:27:44 +0200, Giulio Benetti wrote:
> Release 1.15.1 tarball doesn't contain all sublibraries license files
> listed in the base LICENSE.txt file.
> This makes python-numpy-legal-info incomplete.
> 
> Add patch to add missing sublibraries license files:
> - numpy/linalg/lapack_lite/LICENSE.txt
> - tools/npy_tempita/license.txt
> and therefore their sha256 into hash file.
> Update also PYTHON_NUMPY_LICENSE adding:
> BSD-2-Clause PSF Apache-2.0 MIT Zlib
> 
> Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>

Why is this change titled "fix make legal-info failure" ? PATCH 1/2
does fix a legal-info failure, this one adds more detailed legal
information.


> diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash
> index 7c7f446118..9df9f63f06 100644
> --- a/package/python-numpy/python-numpy.hash
> +++ b/package/python-numpy/python-numpy.hash
> @@ -2,3 +2,7 @@
>  sha256	3c1ccce5d935ef8df16ae0595b459ef08a5cdb05aee195ebc04b9d89a72be7fa	numpy-1.15.1.tar.gz
>  # License files, locally calculated
>  sha256	9e85ee1c3f11444243c9b7667721592a01f1cd90cb28ad937ac99f6241d6b685	LICENSE.txt
> +sha256	426a5a484480f57a295db48c2c04f47bb3274752dd82a7fd6541dfa2cb90f641	doc/sphinxext/LICENSE.txt

What about:

  doc/scipy-sphinx-theme/LICENSE.txt

In fact, the main LICENSE.txt itself, has a bug. Look:

"""
Name: Numpydoc
Files: doc/sphinxext/numpydoc/*
License: 2-clause BSD
  For details, see doc/sphinxext/LICENSE.txt

Name: scipy-sphinx-theme
Files: doc/scipy-sphinx-theme/*
License: 3-clause BSD, PSF and Apache 2.0
  For details, see doc/sphinxext/LICENSE.txt
"""

See how the path for the "scipy-spinx-theme" license file is wrong ?

> +PYTHON_NUMPY_LICENSE = BSD-3-Clause BSD-2-Clause PSF Apache-2.0 MIT Zlib

It should be comma-separated.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 2/2] python-numpy: fix make legal-info failure

[Giulio Benetti]

Hello,

Il 11/09/2018 08:44, Thomas Petazzoni ha scritto:
> Hello,
> 
> On Tue, 11 Sep 2018 00:27:44 +0200, Giulio Benetti wrote:
>> Release 1.15.1 tarball doesn't contain all sublibraries license files
>> listed in the base LICENSE.txt file.
>> This makes python-numpy-legal-info incomplete.
>>
>> Add patch to add missing sublibraries license files:
>> - numpy/linalg/lapack_lite/LICENSE.txt
>> - tools/npy_tempita/license.txt
>> and therefore their sha256 into hash file.
>> Update also PYTHON_NUMPY_LICENSE adding:
>> BSD-2-Clause PSF Apache-2.0 MIT Zlib
>>
>> Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
> 
> Why is this change titled "fix make legal-info failure" ? PATCH 1/2
> does fix a legal-info failure, this one adds more detailed legal
> information.

My mistake, sorry.

> 
> 
>> diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash
>> index 7c7f446118..9df9f63f06 100644
>> --- a/package/python-numpy/python-numpy.hash
>> +++ b/package/python-numpy/python-numpy.hash
>> @@ -2,3 +2,7 @@
>>   sha256	3c1ccce5d935ef8df16ae0595b459ef08a5cdb05aee195ebc04b9d89a72be7fa	numpy-1.15.1.tar.gz
>>   # License files, locally calculated
>>   sha256	9e85ee1c3f11444243c9b7667721592a01f1cd90cb28ad937ac99f6241d6b685	LICENSE.txt
>> +sha256	426a5a484480f57a295db48c2c04f47bb3274752dd82a7fd6541dfa2cb90f641	doc/sphinxext/LICENSE.txt
> 
> What about:
> 
>    doc/scipy-sphinx-theme/LICENSE.txt
> 
> In fact, the main LICENSE.txt itself, has a bug. Look:
> 
> """
> Name: Numpydoc
> Files: doc/sphinxext/numpydoc/*
> License: 2-clause BSD
>    For details, see doc/sphinxext/LICENSE.txt
> 
> Name: scipy-sphinx-theme
> Files: doc/scipy-sphinx-theme/*
> License: 3-clause BSD, PSF and Apache 2.0
>    For details, see doc/sphinxext/LICENSE.txt
> """
> 
> See how the path for the "scipy-spinx-theme" license file is wrong ?

I'm going to create patch for upstream about this.
Would it be useful to buildroot too?

> 
>> +PYTHON_NUMPY_LICENSE = BSD-3-Clause BSD-2-Clause PSF Apache-2.0 MIT Zlib
> 
> It should be comma-separated.

Ok

Going to submit v2.

Thanks
Giulio Benetti