From 10babb22c8061ef6822447d999f8ff83a6321c33 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 10 Dec 2023 21:42:37 +0100 Subject: [PATCH 01/11] gpgme: Fix license gpgme license is wrong since the addition of the package in commit https://git.openwrt.org/?p=feed/packages.git;a=commit;h=3e39633b75e7d26f3666bce9c2e97d268f0fd068 Indeed, gpgme has been licensed under LPGL-2.1+ since version 1.0.2 back in 2004 [1]: Noteworthy changes in version 1.0.2 (2004-12-28) ------------------------------------------------ * Changed the license of the library to the GNU Lesser General Public License (LGPL), version 2.1 or later. [1]: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=NEWS;h=2475a877a40817f575accd22a386bfd5f0a66aad;hb=HEAD Signed-off-by: Fabrice Fontaine (cherry picked from commit e8bbeb05b9a8fe67073d2cc5c00fce32e70ce868) --- libs/gpgme/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gpgme/Makefile b/libs/gpgme/Makefile index 7673aee689..b0bb8f0389 100644 --- a/libs/gpgme/Makefile +++ b/libs/gpgme/Makefile @@ -9,7 +9,7 @@ PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME) PKG_HASH:=361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e PKG_MAINTAINER:=Daniel Golle -PKG_LICENSE:=GPL-3.0-or-later +PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:gnu:gpgme From 0d4d322e677ae08f3503d0fbec93e240eb93feae Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 20 Dec 2023 09:18:46 +0100 Subject: [PATCH 02/11] libassuan: Fix license libassuan license is wrong since the addition of the package in commit https://git.openwrt.org/?p=feed/packages.git;a=commit;h=e24e8fa98c813911419271d64433deb2b453fa02 Indeed, libassuan has been licensed under LGPL-2.1+ since version 1.0.3 back in 2007 [1]: Noteworthy changes in version 1.0.3 (2007-08-24) ------------------------------------------------ * Changed the license of the library code back to LGPLv2.1 to support a bunch of GPLv2(only) software which does not allow the use of LGPLv3. Note that this is only a temporary change and authors of GPLv2(only) software are asked to switch to GPLv3 or to add an exception which allow the use of LPGLv3 software. [1]: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libassuan.git;a=blob;f=NEWS;h=3a86eca4175fbcb12bb00722c2047062df67a46d;hb=HEAD Signed-off-by: Fabrice Fontaine (cherry picked from commit cb9b994a53efaeecd6953b5e6d6ef4f440ff2d26) --- libs/libassuan/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libassuan/Makefile b/libs/libassuan/Makefile index 2e1f05b10d..db9f3de596 100644 --- a/libs/libassuan/Makefile +++ b/libs/libassuan/Makefile @@ -9,8 +9,8 @@ PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME) PKG_HASH:=8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 PKG_MAINTAINER:=Daniel Golle -PKG_LICENSE:=GPL-3.0-or-later -PKG_LICENSE_FILES:=COPYING +PKG_LICENSE:=LGPL-2.1-or-later +PKG_LICENSE_FILES:=COPYING COPYING.LIB PKG_FIXUP:=autoreconf PKG_INSTALL:=1 From a4d7058fe8dbe538952b4322d8adfa724b4d4373 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 30 Jan 2024 08:23:18 +0100 Subject: [PATCH 03/11] utils/vim: add license info vim is licensed under its own Vim license: https://spdx.org/licenses/Vim.html Signed-off-by: Fabrice Fontaine (cherry picked from commit 584f4e71980efca2e98923008c85c5524f38a7a6) --- utils/vim/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/vim/Makefile b/utils/vim/Makefile index 8ca874271f..125acbf99b 100644 --- a/utils/vim/Makefile +++ b/utils/vim/Makefile @@ -16,6 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://ftp.vim.org/pub/vim/unix PKG_HASH:=a6456bc154999d83d0c20d968ac7ba6e7df0d02f3cb6427fb248660bacfb336e PKG_MAINTAINER:=Marko Ratkaj +PKG_LICENSE:=Vim +PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:vim:vim PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(VIMVER) From 652cce0edc6ca6a65c01454f6116439a5c864b58 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 30 Jan 2024 21:06:31 +0100 Subject: [PATCH 04/11] devel/automake: fix license automake is licensed under GPL-2.0-or-later, not GPL-3.0-or-later: https://git.savannah.gnu.org/cgit/automake.git/tree/COPYING indeed switch to GPL-3.0-or-later was reverted a long time ago (i.e. before its addition to openwrt) by https://git.savannah.gnu.org/cgit/automake.git/commit/?id=fcf2f56062e384455ec8b1aed943af33f20c27c7 While at it, add the license file Fixes: c6ac1e3f76ecd92d02d82c5729bbd1f2bd64922b Signed-off-by: Fabrice Fontaine (cherry picked from commit f3e54bda3131c97fd07af50c12ae7eade768b58b) --- devel/automake/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devel/automake/Makefile b/devel/automake/Makefile index 948c393525..7aaec506bd 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -16,7 +16,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_HASH:=ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a PKG_MAINTAINER:=Heinrich Schuchardt -PKG_LICENSE:=GPL-3.0-or-later +PKG_LICENSE:=GPL-2.0-or-later +PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:gnu:automake PKG_INSTALL:=1 From e2e46317124228dcd25b82c86c8ce1831b38363b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 30 Jan 2024 22:34:14 +0100 Subject: [PATCH 05/11] net/tor: add license tor is licensed under BSD-3-Clause Signed-off-by: Fabrice Fontaine (cherry picked from commit 63c942cedbb5eb647d0e39690f8d90b4bfd285c0) --- net/tor/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/tor/Makefile b/net/tor/Makefile index 40cf8b25b8..b70605db70 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -17,6 +17,7 @@ PKG_SOURCE_URL:=https://dist.torproject.org/ \ PKG_HASH:=e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86 PKG_MAINTAINER:=Hauke Mehrtens \ Peter Wagner +PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:torproject:tor From 92a4808a219901a05004a9714b3d815f8a13d9d9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 30 Jan 2024 22:05:54 +0100 Subject: [PATCH 06/11] libs/libev: fix license libev is licensed under BSD-2-Clause or GPL-2.0-or-later since its addition to openwrt While at it, assign PKG_LICENSE_FILES Fixes: 67b39f8f9b703e2cf95616b8e591ec76278a5846 Signed-off-by: Fabrice Fontaine (cherry picked from commit 070fc8021c9376b74c7350edba0f551ccf28f8bf) --- libs/libev/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/libev/Makefile b/libs/libev/Makefile index 017c6eb9e7..92c43773bf 100644 --- a/libs/libev/Makefile +++ b/libs/libev/Makefile @@ -14,7 +14,8 @@ PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://dist.schmorp.de/libev/Attic/ PKG_HASH:=507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea -PKG_LICENSE:=BSD-2-Clause +PKG_LICENSE:=BSD-2-Clause or GPL-2.0-or-later +PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Karl Palsson PKG_BUILD_PARALLEL:=1 From f0780bb913b7908c84ebe0e4bbbb3c6be3f1ef16 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Feb 2024 22:30:33 +0100 Subject: [PATCH 07/11] libs/tiff: fix license tiff is licensed under its own "libtiff" license and not BSD-3-Clause Fixes: 364de5bc3f16eba42f93d36e848b998b3579e39e (tiff: add licensing information) Signed-off-by: Fabrice Fontaine (cherry picked from commit ae165deaf5a708fcbcfc8c48e3866ec7e048ba00) --- libs/tiff/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile index 722f262039..0de47f870c 100644 --- a/libs/tiff/Makefile +++ b/libs/tiff/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://download.osgeo.org/libtiff PKG_HASH:=c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464 PKG_MAINTAINER:=Jiri Slachta -PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE:=libtiff PKG_LICENSE_FILES:=COPYRIGHT PKG_CPE_ID:=cpe:/a:libtiff:libtiff From e24386b3ef3ebfd2c37ebc1acd2c14aaae6fdd19 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Feb 2024 21:57:46 +0100 Subject: [PATCH 08/11] libs/libgd: fix license libgd is licensed under its own "GD" license and not MIT Fixes: 60feea09c9d343f648045e5e85e7788e75d4e039 (libgd: import from oldpackages, add myself as maintainer, add license...) Signed-off-by: Fabrice Fontaine (cherry picked from commit 41c998224d20160d7b5ecaf173df42bd5f6dc7a4) --- libs/libgd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/libgd/Makefile b/libs/libgd/Makefile index 750733fecd..f1bc84f8b9 100644 --- a/libs/libgd/Makefile +++ b/libs/libgd/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://github.com/$(PKG_NAME)/$(PKG_NAME)/releases/download/gd- PKG_HASH:=3fe822ece20796060af63b7c60acb151e5844204d289da0ce08f8fdf131e5a61 PKG_MAINTAINER:=Jo-Philipp Wich -PKG_LICENSE:=MIT +PKG_LICENSE:=GD PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:libgd:libgd From e6e5f761b5e1277e5f8351657cc7946b7412d973 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Feb 2024 22:41:03 +0100 Subject: [PATCH 09/11] utils/lsof: fix license MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace "Unique" by the standard SPDX identifier for lsof license: https://spdx.org/licenses/lsof.html Fixes: 59adfc86b9d1e5a8fb9d5c83db6546a6b49a77f5 (lsof: add license information) Signed-off-by: Fabrice Fontaine Signed-off-by: Petr Štetiar [backport] (cherry picked from commit 9111b290d1dd67a1c7bb017c17569b3a35055eef) --- utils/lsof/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/lsof/Makefile b/utils/lsof/Makefile index a49b053c49..a5e7bc3e77 100644 --- a/utils/lsof/Makefile +++ b/utils/lsof/Makefile @@ -18,8 +18,8 @@ PKG_HASH:=c41709c2543ecf9de1e950795790a9786a2f225e51c3cc53d6a9a256f872472b PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION).linux PKG_MAINTAINER:=Maxim Storchak -PKG_LICENSE:=Unique -PKG_LICENSE_FILES:=00README +PKG_LICENSE:=lsof +PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk From 8b613973be90f980a0820e3d4ebb73227b396f5f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Feb 2024 22:46:55 +0100 Subject: [PATCH 10/11] net/ntpd: fix license Replace "Unique" by the standard SPDX identifier for NTP license: https://spdx.org/licenses/NTP.html Fixes: 1aff45c6dd36f2a5875eadaeae2ed93da8ff6d45 (ntpd: add SPDX license information) Signed-off-by: Fabrice Fontaine (cherry picked from commit f7ad88678d00babe5b82e62aa6708a0dea1ef315) --- net/ntpd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile index 674f6f10af..51a78403b8 100644 --- a/net/ntpd/Makefile +++ b/net/ntpd/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ PKG_HASH:=103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866 -PKG_LICENSE:=Unique +PKG_LICENSE:=NTP PKG_LICENSE_FILES:=COPYRIGHT html/copyright.html PKG_CPE_ID:=cpe:/a:ntp:ntp From f24f165765f3b533ba39d7b098f211e318f2a36e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Feb 2024 22:08:51 +0100 Subject: [PATCH 11/11] lang/python/python-paho-mqtt: fix license python-paho-mqtt is licensed under EPL-2.0, not EPL-1.0, since version 1.6.0 and https://github.com/eclipse/paho.mqtt.python/commit/fabe7500fb6fde31fd98c619e0117d1c651fd18d While at it, add LICENSE.txt to PKG_LICENSE_FILES Fixes: 784f2a519bb8cdfaa973070f65ff9a3a481e5cd1 (python-paho-mqtt: bump to version 1.6.1) Signed-off-by: Fabrice Fontaine (cherry picked from commit 3380427f2929f838a7014fd74209c5ed41270176) --- lang/python/python-paho-mqtt/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/python/python-paho-mqtt/Makefile b/lang/python/python-paho-mqtt/Makefile index 20554631bc..4028dc9cf8 100644 --- a/lang/python/python-paho-mqtt/Makefile +++ b/lang/python/python-paho-mqtt/Makefile @@ -9,8 +9,8 @@ PKG_VERSION:=1.6.1 PKG_RELEASE:=2 PKG_MAINTAINER:=Josef Schlehofer , Alexandru Ardelean -PKG_LICENSE:=EPL-1.0 Eclipse Distribution License v1.0 -PKG_LICENSE_FILES:=epl-v10 edl-v10 +PKG_LICENSE:=EPL-2.0 Eclipse Distribution License v1.0 +PKG_LICENSE_FILES:=epl-v20 edl-v10 LICENSE.txt PYPI_NAME:=paho-mqtt PKG_HASH:=2a8291c81623aec00372b5a85558a372c747cbca8e9934dfe218638b8eefc26f