[yocto-patches] [meta-security] [PATCH] fix LICENSE variable syntax to suppress QA warning
Wang Mingyu < [email protected]>
| Newsgroups | org.yoctoproject.lists.yocto-patches |
|---|---|
| Message-ID | <[email protected]> |
From: Wang Mingyu <[email protected]> Signed-off-by: Wang Mingyu <[email protected]> --- recipes-ids/crowdsec/crowdsec-licenses.inc | 2 +- recipes-ids/crowdsec/crowdsec_1.7.7.bb | 2 +- recipes-mac/AppArmor/apparmor_4.0.3.bb | 2 +- recipes-perl/perl/lib-perl_0.63.bb | 2 +- recipes-perl/perl/libwhisker2-perl_2.5.bb | 2 +- recipes-scanners/clamav/clamav_1.4.4.bb | 4 ++-- recipes-security/libgssglue/libgssglue_0.9.bb | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes-ids/crowdsec/crowdsec-licenses.inc b/recipes-ids/crowdsec/crowdsec-licenses.inc index cb45b10..92f5dc6 100644 --- a/recipes-ids/crowdsec/crowdsec-licenses.inc +++ b/recipes-ids/crowdsec/crowdsec-licenses.inc @@ -4,7 +4,7 @@ # Do not modify it by hand, as the contents will be replaced when # running the update-modules task. -LICENSE += "& Apache-2.0 & BSD-2-Clause & BSD-3-Clause & ISC & MIT & MPL-2.0 & WTFPL" +LICENSE += "AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND WTFPL" LIC_FILES_CHKSUM += "\ file://pkg/mod/ariga.io/[email protected]/LICENSE;md5=175792518e4ac015ab6696d16c4f607e;spdx=Apache-2.0 \ diff --git a/recipes-ids/crowdsec/crowdsec_1.7.7.bb b/recipes-ids/crowdsec/crowdsec_1.7.7.bb index 0697022..356c227 100644 --- a/recipes-ids/crowdsec/crowdsec_1.7.7.bb +++ b/recipes-ids/crowdsec/crowdsec_1.7.7.bb @@ -1,7 +1,7 @@ SUMMARY = "CrowdSec is a free, modern & collaborative behavior detection engine, coupled with a global IP reputation network." DESCRIPTION = "Open-source and participative security solution offering crowdsourced protection against malicious IPs and access to the most advanced real-world CTI." HOMEPAGE = "https://www.crowdsec.net" -LICENSE = "MIT & CC0-1.0" +LICENSE = "MIT AND CC0-1.0" LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=1e58fe4126ce0b50677f3aa6ba8e13c2 \ file://src/${GO_IMPORT}/build/windows/Chocolatey/crowdsec/tools/LICENSE.txt;md5=4d249f04094c9fb4d2b6fd2b1127e219 \ file://src/${GO_IMPORT}/test/lib/bats-assert/LICENSE;md5=7bae63a234e80ee7c6427dce9fdba6cc \ diff --git a/recipes-mac/AppArmor/apparmor_4.0.3.bb b/recipes-mac/AppArmor/apparmor_4.0.3.bb index 9983157..76025bd 100644 --- a/recipes-mac/AppArmor/apparmor_4.0.3.bb +++ b/recipes-mac/AppArmor/apparmor_4.0.3.bb @@ -8,7 +8,7 @@ DESCRIPTION = "user-space parser utility for AppArmor \ HOMEPAGE = "http://apparmor.net/" SECTION = "admin" -LICENSE = "GPL-2.0-only & GPL-2.0-or-later & BSD-3-Clause & LGPL-2.1-or-later" +LICENSE = "GPL-2.0-only AND GPL-2.0-or-later AND BSD-3-Clause AND LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fd57a4b0bc782d7b80fd431f10bbf9d0" DEPENDS = "bison-native apr autoconf-archive-native gettext-native coreutils-native swig-native" diff --git a/recipes-perl/perl/lib-perl_0.63.bb b/recipes-perl/perl/lib-perl_0.63.bb index f0d6832..c0fb43a 100644 --- a/recipes-perl/perl/lib-perl_0.63.bb +++ b/recipes-perl/perl/lib-perl_0.63.bb @@ -5,7 +5,7 @@ will find modules which are not located in the default search path." SECTION = "libs" HOMEPAGE = "https://metacpan.org/dist/lib" -LICENSE = "Artistic-1.0 | GPL-1.0-or-later" +LICENSE = "Artistic-1.0 OR GPL-1.0-or-later" PR = "r0" LIC_FILES_CHKSUM = "file://README;beginline=26;endline=30;md5=94b119f1a7b8d611efc89b5d562a1a50" diff --git a/recipes-perl/perl/libwhisker2-perl_2.5.bb b/recipes-perl/perl/libwhisker2-perl_2.5.bb index e16e5f2..94b2384 100644 --- a/recipes-perl/perl/libwhisker2-perl_2.5.bb +++ b/recipes-perl/perl/libwhisker2-perl_2.5.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Libwhisker is a Perl module geared specificly for HTTP testing." SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0-or-later" +LICENSE = "Artistic-1.0 OR GPL-1.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=254b8e29606fce6d1c1a4c9e32354573" diff --git a/recipes-scanners/clamav/clamav_1.4.4.bb b/recipes-scanners/clamav/clamav_1.4.4.bb index e9c2aca..b3f14cd 100644 --- a/recipes-scanners/clamav/clamav_1.4.4.bb +++ b/recipes-scanners/clamav/clamav_1.4.4.bb @@ -1,8 +1,8 @@ SUMMARY = "ClamAV anti-virus utilities and scanner tools" -DESCRIPTION = "ClamAV is an open source antivirus engine for detecting trojans, viruses, malware & other malicious threats." +DESCRIPTION = "ClamAV is an open source antivirus engine for detecting trojans, viruses, malware AND other malicious threats." HOMEPAGE = "http://www.clamav.net/index.html" SECTION = "security" -LICENSE = "GPL-2.0-only & LGPL-2.1-only & BSD-2-Clause & Zlib & Apache-2.0-with-LLVM-exception" +LICENSE = "GPL-2.0-only AND LGPL-2.1-only AND BSD-2-Clause AND Zlib AND Apache-2.0-with-LLVM-exception" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=2c0b5770a62017a3121c69bb9f680b0c \ file://COPYING/COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://COPYING/COPYING.bzip2;md5=ae8d555c34b656ff864ea9437a10d3a0 \ diff --git a/recipes-security/libgssglue/libgssglue_0.9.bb b/recipes-security/libgssglue/libgssglue_0.9.bb index 0952ed1..9b33ce9 100644 --- a/recipes-security/libgssglue/libgssglue_0.9.bb +++ b/recipes-security/libgssglue/libgssglue_0.9.bb @@ -8,7 +8,7 @@ depending on the mechanism. \ HOMEPAGE = "https://gitlab.com/gsasl/libgssglue" SECTION = "libs" -LICENSE = "BSD-3-Clause | HPND" +LICENSE = "BSD-3-Clause OR HPND" #Copyright (c) 1996, by Sun Microsystems, Inc. HPND #Copyright (c) 2007 The Regents of the University of Michigan. BSD-3-Clause -- 2.43.0