From 3083dd70b3a9fa01fcc3cf00373b05502505996e Mon Sep 17 00:00:00 2001 From: Elizabeth Flanagan Date: Sat, 3 Dec 2011 15:48:29 -0800 Subject: OECore license fixes: meta/* This is a quick audit of only the most obviously wrong licenses found within OECore. These fixes fall into four areas: - LICENSE field had incorrect format so that the parser choked - LICENSE field has a license with no version - LICENSE field was actually incorrect - LICENSE field has an imaginary license that didn't exist This fixes most of the LICENSE warnings thrown, along with my prior commit adding additional licenses to common-licenses and additional SPDXLICENSEMAP entries. HOWEVER..... there is much to be done on the license front. For a list of recipes with licenses that need obvious fixing see: https://wiki.yoctoproject.org/wiki/License_Audit That said, I would suggest another license audit as I've found enough inconsistencies. A good suggestion is when in doubt, look at how openSuse or Gentoo or Debian license the package. Signed-off-by: Elizabeth Flanagan --- meta/recipes-extended/byacc/byacc_20110908.bb | 10 ++++++++-- meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 4 ++-- meta/recipes-extended/less/less_444.bb | 7 +++++-- meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb | 4 ++-- meta/recipes-extended/unzip/unzip_6.0.bb | 4 ++-- meta/recipes-extended/xinetd/xinetd_2.3.14.bb | 5 +++-- meta/recipes-extended/zip/zip.inc | 2 +- meta/recipes-extended/zip/zip_3.0.bb | 2 +- 8 files changed, 24 insertions(+), 14 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/byacc/byacc_20110908.bb b/meta/recipes-extended/byacc/byacc_20110908.bb index 5969d0abef..5e01c25f72 100644 --- a/meta/recipes-extended/byacc/byacc_20110908.bb +++ b/meta/recipes-extended/byacc/byacc_20110908.bb @@ -1,5 +1,11 @@ -PR = "r0" -LICENSE="other-BSD" +PR = "r1" + +# Sigh. This is one of those places where everyone licenses it differently. Someone +# even apply UCB to it (Free/Net/OpenBSD). The maintainer states that: +# "I've found no reliable source which states that byacc must bear a UCB copyright." +# Setting to PD as this is what the upstream has it as. + +LICENSE="PD" LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=4dc4c30f840a7203fb6edf20b3db849e" require byacc.inc diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb index f5b9ac1279..14cd24097d 100644 --- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb +++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb @@ -4,9 +4,9 @@ Huffman coding. Compression is generally considerably better than that achieved LZ77/LZ78-based compressors, and approaches the performance of the PPM family of statistical compressors." HOMEPAGE = "http://www.bzip.org/" SECTION = "console/utils" -LICENSE = "bzip2" +LICENSE = "BSD-4-Clause" LIC_FILES_CHKSUM = "file://LICENSE;beginline=8;endline=37;md5=40d9d1eb05736d1bfc86cfdd9106e6b2" -PR = "r3" +PR = "r4" SRC_URI = "http://www.bzip.org/${PV}/${BPN}-${PV}.tar.gz \ file://configure.ac \ diff --git a/meta/recipes-extended/less/less_444.bb b/meta/recipes-extended/less/less_444.bb index c78dbaa566..f198692724 100644 --- a/meta/recipes-extended/less/less_444.bb +++ b/meta/recipes-extended/less/less_444.bb @@ -7,11 +7,14 @@ SECTION = "console/utils" # (GPLv2+ (<< 418), GPLv3+ (>= 418)) | less # less is a 2-clause BSD-like permissive license -LICENSE = "GPLv3+ | less" +# Reading LICENSE and COPYING indicate that GPL-3+ is suffient. +# openSuse .spec and Debian seem to agree here. setting to GPL-3+ + +LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE;md5=1237c0f825bb36122b0b2b486ffbe6be" DEPENDS = "ncurses" -PR = "r0" +PR = "r1" SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz" diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb index 46d9675cb1..985e8484a1 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb @@ -3,9 +3,9 @@ DESCRIPTION = "Tools for monitoring and filtering incoming requests for tcp \ services." SECTION = "console/network" -LICENSE = "tcp-wrappers" +LICENSE = "BSD" LIC_FILES_CHKSUM = "file://DISCLAIMER;md5=071bd69cb78b18888ea5e3da5c3127fa" -PR ="r7" +PR ="r8" PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev ${PN} ${PN}-doc" diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index b9eff435b1..79e450de1b 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb @@ -1,10 +1,10 @@ DESCRIPTION = "A (de)compression library for the ZIP format" HOMEPAGE = "http://www.info-zip.org" SECTION = "console/utils" -LICENSE = "Info-ZIP" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=94caec5a51ef55ef711ee4e8b1c69e29" PE = "1" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip60.tgz \ file://avoid-strip.patch" diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.14.bb b/meta/recipes-extended/xinetd/xinetd_2.3.14.bb index 159cb2cf26..26ba78f36c 100644 --- a/meta/recipes-extended/xinetd/xinetd_2.3.14.bb +++ b/meta/recipes-extended/xinetd/xinetd_2.3.14.bb @@ -2,11 +2,12 @@ DESCRIPTION = "Highly configurable, modular and secure inetd" HOMEPAGE = "http://www.xinetd.org" # xinetd is a BSD-like license -LICENSE = "xinetd" +# Apple and Gentoo say BSD here. +LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8" DEPENDS = "" -PR ="r0" +PR ="r1" SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ file://xinetd.init \ diff --git a/meta/recipes-extended/zip/zip.inc b/meta/recipes-extended/zip/zip.inc index 8cce146b18..a3bbc934e0 100644 --- a/meta/recipes-extended/zip/zip.inc +++ b/meta/recipes-extended/zip/zip.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Archiver for .zip files" HOMEPAGE = "http://www.info-zip.org" SECTION = "console/utils" -LICENSE = "Info-ZIP" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d" SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/zip${@d.getVar('PV',1).replace('.', '')}.tgz" diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb index b009c24fbc..12380715dc 100644 --- a/meta/recipes-extended/zip/zip_3.0.bb +++ b/meta/recipes-extended/zip/zip_3.0.bb @@ -1,6 +1,6 @@ require zip.inc -PR="r0" +PR="r1" # zip-2.32 still uses directory name of zip-2.30 S = "${WORKDIR}/zip30" -- cgit 1.2.3-korg