From: Fabrice Fontaine Date: Tue, 30 Jan 2024 20:27:53 +0000 (+0100) Subject: treewide: fix licence typos X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=820fcc5fb979ad9ac630231dcf12ce76342d1c01;p=feed%2Fpackages.git treewide: fix licence typos - PKG_LICENCE -> PKG_LICENSE - PKC_LICENSE_FILES -> PKG_LICENSE_FILES - BSD 3-Clause -> BSD-3-Clause - BSD-3-clause -> BSD-3-Clause - BSD-2-clause -> BSD-2-Clause - Public Domain -> Public-Domain - PublicDomain -> Public-Domain - Drop unneeded ',' in PKG_LICENSE or PKG_LICENSE_FILES Signed-off-by: Fabrice Fontaine --- diff --git a/admin/ipmitool/Makefile b/admin/ipmitool/Makefile index bbe2349495..1fc6dfec54 100644 --- a/admin/ipmitool/Makefile +++ b/admin/ipmitool/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_HASH:=0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01 -PKG_LICENSE:=BSD-3-clause +PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:ipmitool_project:ipmitool diff --git a/lang/python/python-networkx/Makefile b/lang/python/python-networkx/Makefile index 17805b1bc7..2f9ecab04f 100644 --- a/lang/python/python-networkx/Makefile +++ b/lang/python/python-networkx/Makefile @@ -12,7 +12,7 @@ PKG_RELEASE:=1 PYPI_NAME:=networkx PKG_HASH:=9f1bb5cf3409bf324e0a722c20bdb4c20ee39bf1c30ce8ae499c8502b0b5e0c6 -PKG_LICENSE:=BSD-3-clause +PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE.txt PKG_MAINTAINER:=W. Michael Petullo diff --git a/lang/python/python-psutil/Makefile b/lang/python/python-psutil/Makefile index 9e336a3072..d6d79b01d3 100644 --- a/lang/python/python-psutil/Makefile +++ b/lang/python/python-psutil/Makefile @@ -15,7 +15,7 @@ PYPI_NAME:=psutil PKG_HASH:=5410638e4df39c54d957fc51ce03048acd8e6d60abc0f5107af51e5fb566eb3c PKG_MAINTAINER:=Jan Pavlinec -PKG_LICENSE:=BSD 3-Clause +PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE include ../pypi.mk diff --git a/libs/libb64/Makefile b/libs/libb64/Makefile index 8223975917..284ca3afcc 100644 --- a/libs/libb64/Makefile +++ b/libs/libb64/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/libb64/libb64/tar.gz/v$(PKG_VERSION)? PKG_HASH:=28c43c47674409fc50e7145d4c2d26dc1f3d200889c41205e7812c2b67f26382 -PKG_LICENSE:=PublicDomain +PKG_LICENSE:=Public-Domain PKG_LICENSE_FILES:=LICENSE.md PKG_MAINTAINER:=Daniel Golle diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile index 767e4e9605..d3de2fdb2b 100644 --- a/libs/libpng/Makefile +++ b/libs/libpng/Makefile @@ -17,7 +17,7 @@ PKG_HASH:=1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=Libpng GPL-2.0-or-later BSD-3-Clause -PKC_LICENSE_FILES:=LICENSE contrib/gregbook/COPYING contrib/gregbook/LICENSE +PKG_LICENSE_FILES:=LICENSE contrib/gregbook/COPYING contrib/gregbook/LICENSE PKG_CPE_ID:=cpe:/a:libpng:libpng include $(INCLUDE_DIR)/package.mk diff --git a/libs/nacl/Makefile b/libs/nacl/Makefile index 5b5d9a22eb..dcea86b8bb 100644 --- a/libs/nacl/Makefile +++ b/libs/nacl/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://hyperelliptic.org/nacl PKG_HASH:=4f277f89735c8b0b8a6bbd043b3efb3fa1cc68a9a5da6a076507d067fc3b3bf8 -PKG_LICENSE:=PublicDomain +PKG_LICENSE:=Public-Domain PKG_BUILD_FLAGS:=no-mips16 diff --git a/libs/nspr/Makefile b/libs/nspr/Makefile index c61bf527ae..3fa766bc29 100644 --- a/libs/nspr/Makefile +++ b/libs/nspr/Makefile @@ -10,7 +10,7 @@ PKG_NAME:=nspr PKG_VERSION:=4.35 PKG_RELEASE:=2 PKG_MAINTAINER:=Lucian Cristian -PKG_LICENCE:=MPL-2.0 +PKG_LICENSE:=MPL-2.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ diff --git a/libs/nss/Makefile b/libs/nss/Makefile index 5888e22949..c96741fb8e 100644 --- a/libs/nss/Makefile +++ b/libs/nss/Makefile @@ -17,7 +17,7 @@ PKG_SOURCE_URL:= \ PKG_HASH:=15f54bb72048eb105f8c0e936a04b899e74c3db9a19bbc1e00acee2af9476a8a PKG_MAINTAINER:=Lucian Cristian -PKG_LICENCE:=MPL-2.0 +PKG_LICENSE:=MPL-2.0 PKG_LICENSE_FILES:=nss/COPYING PKG_CPE_ID:=cpe:/a:mozilla:network_security_services diff --git a/libs/openblas/Makefile b/libs/openblas/Makefile index 5e498adc62..da16f574fb 100644 --- a/libs/openblas/Makefile +++ b/libs/openblas/Makefile @@ -11,7 +11,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=OpenBLAS-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/xianyi/OpenBLAS/releases/download/v$(PKG_VERSION)/ PKG_HASH:=4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68 -PKG_LICENSE:=BSD 3-Clause +PKG_LICENSE:=BSD-3-Clause PKG_MAINTAINER:=Alexandru Ardelean PKG_BUILD_PARALLEL:=1 diff --git a/libs/rpcsvc-proto/Makefile b/libs/rpcsvc-proto/Makefile index cc665af837..710a9e64c0 100644 --- a/libs/rpcsvc-proto/Makefile +++ b/libs/rpcsvc-proto/Makefile @@ -8,7 +8,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/thkukuk/rpcsvc-proto/releases/download/v$(PKG_VERSION) PKG_HASH:=69315e94430f4e79c74d43422f4a36e6259e97e67e2677b2c7d7060436bd99b1 -PKG_LICENSE:=BSD-3-clause +PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 diff --git a/mail/mblaze/Makefile b/mail/mblaze/Makefile index 621fdbd04d..46626a2822 100644 --- a/mail/mblaze/Makefile +++ b/mail/mblaze/Makefile @@ -12,7 +12,7 @@ PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 PKG_MAINTAINER:=Michal Vasilek -PKG_LICENSE:=Public Domain, MIT +PKG_LICENSE:=Public-Domain MIT PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk diff --git a/net/bcp38/Makefile b/net/bcp38/Makefile index adcf4ca1be..72c50d3cc6 100644 --- a/net/bcp38/Makefile +++ b/net/bcp38/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bcp38 PKG_VERSION:=5 PKG_RELEASE:=11 -PKG_LICENCE:=GPL-3.0-or-later +PKG_LICENSE:=GPL-3.0-or-later include $(INCLUDE_DIR)/package.mk diff --git a/net/pdns/Makefile b/net/pdns/Makefile index 055337ee46..90f83ceb84 100644 --- a/net/pdns/Makefile +++ b/net/pdns/Makefile @@ -9,8 +9,8 @@ PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/ PKG_HASH:=7f40c8cbc4650d06fe49abba79902ebabb384363dabbd5cef271964a07c3645c PKG_MAINTAINER:=Peter van Dijk -PKG_LICENCE:=GPL-2.0-only -PKG_LICENCE_FILES:=COPYING +PKG_LICENSE:=GPL-2.0-only +PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:powerdns:authoritative PKG_FIXUP:=autoreconf diff --git a/utils/banhosts/Makefile b/utils/banhosts/Makefile index 47a0ddbea3..4f822106da 100644 --- a/utils/banhosts/Makefile +++ b/utils/banhosts/Makefile @@ -13,7 +13,7 @@ PKG_RELEASE:=2 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Matteo Croce -PKG_LICENCE:=GPL-2.0 +PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk diff --git a/utils/joe/Makefile b/utils/joe/Makefile index 8def7ab7ef..78814c9a19 100644 --- a/utils/joe/Makefile +++ b/utils/joe/Makefile @@ -27,7 +27,7 @@ PKG_SOURCE_URL:=@SF/joe-editor PKG_HASH:=495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de PKG_MAINTAINER:=Vitaly Protsko -PKG_LICENCE:=GPL-2.0 +PKG_LICENSE:=GPL-2.0 PKG_CPE_ID:=cpe:/a:joseph_allen:joe include $(INCLUDE_DIR)/package.mk diff --git a/utils/micrond/Makefile b/utils/micrond/Makefile index c979025bba..9fb42cae3d 100644 --- a/utils/micrond/Makefile +++ b/utils/micrond/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=micrond PKG_VERSION:=1 PKG_RELEASE:=2 -PKG_LICENSE:=BSD-2-clause +PKG_LICENSE:=BSD-2-Clause include $(INCLUDE_DIR)/package.mk diff --git a/utils/opendoas/Makefile b/utils/opendoas/Makefile index c24299e768..ae461eb659 100644 --- a/utils/opendoas/Makefile +++ b/utils/opendoas/Makefile @@ -9,7 +9,7 @@ PKG_SOURCE_URL:=https://github.com/Duncaen/OpenDoas/releases/download/v$(PKG_VER PKG_HASH:=4e98828056d6266bd8f2c93e6ecf12a63a71dbfd70a5ea99ccd4ab6d0745adf0 PKG_MAINTAINER:=Michal Vasilek -PKG_LICENSE:=ISC, BSD-3-Clause +PKG_LICENSE:=ISC BSD-3-Clause PKG_LICENSE_FILES:=LICENSE PKG_INSTALL:=1 diff --git a/utils/xxhash/Makefile b/utils/xxhash/Makefile index ff29be1de8..c6b9f333c0 100644 --- a/utils/xxhash/Makefile +++ b/utils/xxhash/Makefile @@ -20,8 +20,8 @@ PKG_HASH:=3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c # The source for the library (xxhash.c and xxhash.h) is BSD # The source for the command line tool (xxhsum.c) is GPLv2+ -PKG_LICENSE:=BSD-2-Clause,GPL-2.0-or-later -PKG_LICENSE_FILES:=LICENSE,cli/COPYING +PKG_LICENSE:=BSD-2-Clause GPL-2.0-or-later +PKG_LICENSE_FILES:=LICENSE cli/COPYING PKG_MAINTAINER:=Julien Malik PKG_INSTALL:=1 diff --git a/utils/zoneinfo/Makefile b/utils/zoneinfo/Makefile index b8bdfa9b35..28f54cc0fe 100644 --- a/utils/zoneinfo/Makefile +++ b/utils/zoneinfo/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=1 #As i couldn't find real license used "Public Domain" #as referense to http://www.iana.org/time-zones/repository/tz-link.html -PKG_LICENSE:=Public Domain +PKG_LICENSE:=Public-Domain PKG_SOURCE:=tzdata$(PKG_VERSION).tar.gz PKG_SOURCE_CODE:=tzcode$(PKG_VERSION).tar.gz