[meta-security] meta-security : Use SPDX style licensing format

Message ID 20220323194156.12208-1-asharma@mvista.com
State Accepted, archived
Delegated to: Armin Kuster
Headers show
Series [meta-security] meta-security : Use SPDX style licensing format | expand

Commit Message

Ashish Sharma March 23, 2022, 7:41 p.m. UTC
WARNING: selinux-sandbox-3.3-r0 do_package_qa: QA Issue: Recipe LICENSE includes obsolete licenses GPLv2+ [obsolete-license] \
WARNING: selinux-gui-3.3-r0 do_package_qa: QA Issue: Recipe LICENSE includes obsolete licenses GPLv2+ [obsolete-license] \
WARNING: semodule-utils-3.3-r0.1 do_package_qa: QA Issue: Recipe LICENSE includes obsolete licenses GPLv2+ [obsolete-license] \
WARNING: selinux-dbus-3.3-r0 do_package_qa: QA Issue: Recipe LICENSE includes obsolete licenses GPLv2+ [obsolete-license] \
WARNING: libwhisker2-perl-2.5-r0 do_package_qa: QA Issue: Recipe LICENSE includes obsolete licenses GPL-1.0+ [obsolete-license] \
WARNING: lib-perl-0.63-r0 do_package_qa: QA Issue: Recipe LICENSE includes obsolete licenses GPL-1.0+ [obsolete-license] \
WARNING: libhtp-0.5.39-r0 do_package_qa: QA Issue: Recipe LICENSE includes obsolete licenses GPLv2 [obsolete-license] \
...

Signed-off-by: Ashish Sharma <asharma@mvista.com>
---
 recipes-ids/samhain/samhain.inc                       | 2 +-
 recipes-ids/suricata/suricata.inc                     | 2 +-
 recipes-perl/perl/libwhisker2-perl_2.5.bb             | 2 +-
 recipes-scanners/clamav/clamav_0.104.0.bb             | 2 +-
 recipes-security/bastille/bastille_3.2.1.bb           | 2 +-
 recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb | 2 +-
 recipes-security/nikto/nikto_2.1.6.bb                 | 2 +-
 recipes-security/sssd/sssd_2.5.2.bb                   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

Comments

Ashish Sharma March 23, 2022, 9:53 p.m. UTC | #1
I picked up a list of warnings in sequence from the build which had a mix
from meta-selinux and meta-security.

You can correct the message.

The changes in this commit are only for meta-security layer recipes.

Thanks
Ashish S


On Thu, Mar 24, 2022, 03:14 akuster808 <akuster808@gmail.com> wrote:

>
>
> On 3/23/22 12:41, Ashish Sharma wrote:
> > WARNING: selinux-sandbox-3.3-r0 do_package_qa: QA Issue: Recipe LICENSE
> includes obsolete licenses GPLv2+ [obsolete-license] \
> > WARNING: selinux-gui-3.3-r0 do_package_qa: QA Issue: Recipe LICENSE
> includes obsolete licenses GPLv2+ [obsolete-license] \
> > WARNING: semodule-utils-3.3-r0.1 do_package_qa: QA Issue: Recipe LICENSE
> includes obsolete licenses GPLv2+ [obsolete-license] \
> > WARNING: selinux-dbus-3.3-r0 do_package_qa: QA Issue: Recipe LICENSE
> includes obsolete licenses GPLv2+ [obsolete-license] \
> > WARNING: libwhisker2-perl-2.5-r0 do_package_qa: QA Issue: Recipe LICENSE
> includes obsolete licenses GPL-1.0+ [obsolete-license] \
> > WARNING: lib-perl-0.63-r0 do_package_qa: QA Issue: Recipe LICENSE
> includes obsolete licenses GPL-1.0+ [obsolete-license] \
> > WARNING: libhtp-0.5.39-r0 do_package_qa: QA Issue: Recipe LICENSE
> includes obsolete licenses GPLv2 [obsolete-license] \
>
> The commit message seems to not match the changes.
>
> The selinux changes don't apply to this layer.  I suspect a cut&paste
> issue.
>
> Did you want to do a v2 or do you want me to correct the message?
>
> I am aware of the Warnings so I can fixup  the things locally.
>
> -armin
> > ...
> >
> > Signed-off-by: Ashish Sharma <asharma@mvista.com>
> > ---
> >   recipes-ids/samhain/samhain.inc                       | 2 +-
> >   recipes-ids/suricata/suricata.inc                     | 2 +-
> >   recipes-perl/perl/libwhisker2-perl_2.5.bb             | 2 +-
> >   recipes-scanners/clamav/clamav_0.104.0.bb             | 2 +-
> >   recipes-security/bastille/bastille_3.2.1.bb           | 2 +-
> >   recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb | 2 +-
> >   recipes-security/nikto/nikto_2.1.6.bb                 | 2 +-
> >   recipes-security/sssd/sssd_2.5.2.bb                   | 2 +-
> >   8 files changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/recipes-ids/samhain/samhain.inc
> b/recipes-ids/samhain/samhain.inc
> > index 077e118..d64cddb 100644
> > --- a/recipes-ids/samhain/samhain.inc
> > +++ b/recipes-ids/samhain/samhain.inc
> > @@ -1,6 +1,6 @@
> >   DESCRIPTION = "Provides file integrity checking and log file
> monitoring/analysis"
> >   HOMEPAGE    = "http://www.la-samhna.de/samhain/"
> > -LICENSE     = "GPLv2"
> > +LICENSE     = "GPL-2.0-or-later"
> >   LIC_FILES_CHKSUM =
> "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b"
> >
> >   PV = "4.4.6"
> > diff --git a/recipes-ids/suricata/suricata.inc
> b/recipes-ids/suricata/suricata.inc
> > index 5754617..906423c 100644
> > --- a/recipes-ids/suricata/suricata.inc
> > +++ b/recipes-ids/suricata/suricata.inc
> > @@ -1,5 +1,5 @@
> >   HOMEPAGE = "http://suricata-ids.org/"
> >   SECTION = "security Monitor/Admin"
> > -LICENSE = "GPLv2"
> > +LICENSE = "GPL-2.0-only"
> >
> >   COMPATIBLE_HOST:powerpc = 'null'
> > diff --git a/recipes-perl/perl/libwhisker2-perl_2.5.bb
> b/recipes-perl/perl/libwhisker2-perl_2.5.bb
> > index 5889a05..42c0b42 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+"
> > +LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
> >
> >   LIC_FILES_CHKSUM =
> "file://LICENSE;md5=254b8e29606fce6d1c1a4c9e32354573"
> >
> > diff --git a/recipes-scanners/clamav/clamav_0.104.0.bb
> b/recipes-scanners/clamav/clamav_0.104.0.bb
> > index f0889de..491a82f 100644
> > --- a/recipes-scanners/clamav/clamav_0.104.0.bb
> > +++ b/recipes-scanners/clamav/clamav_0.104.0.bb
> > @@ -2,7 +2,7 @@ SUMMARY = "ClamAV anti-virus utility for Unix -
> command-line interface"
> >   DESCRIPTION = "ClamAV is an open source antivirus engine for detecting
> trojans, viruses, malware & other malicious threats."
> >   HOMEPAGE = "http://www.clamav.net/index.html"
> >   SECTION = "security"
> > -LICENSE = "LGPL-2.1"
> > +LICENSE = "LGPL-2.1-only"
> >
> >   DEPENDS = "glibc llvm libtool db openssl zlib curl libxml2 bison pcre2
> json-c libcheck"
> >
> > diff --git a/recipes-security/bastille/bastille_3.2.1.bb
> b/recipes-security/bastille/bastille_3.2.1.bb
> > index 2d82983..e7852d9 100644
> > --- a/recipes-security/bastille/bastille_3.2.1.bb
> > +++ b/recipes-security/bastille/bastille_3.2.1.bb
> > @@ -2,7 +2,7 @@
> >   #consult the README file for the meta-security layer for additional
> information.
> >   SUMMARY = "Linux hardening tool"
> >   DESCRIPTION = "Bastille Linux is a Hardening and Reporting/Auditing
> Program which enhances the security of a Linux box, by configuring daemons,
> system settings and firewalling."
> > -LICENSE = "GPLv2"
> > +LICENSE = "GPL-2.0-only"
> >   LIC_FILES_CHKSUM =
> "file://${S}/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
> >   # Bash is needed for set +o privileged (check busybox), might also
> need ncurses
> >   DEPENDS = "virtual/kernel"
> > diff --git a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
> b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
> > index 9aefc32..5f8cf3c 100644
> > --- a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
> > +++ b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
> > @@ -6,7 +6,7 @@ DESCRIPTION = "eCryptfs is a stacked cryptographic
> filesystem \
> >   HOMEPAGE = "https://launchpad.net/ecryptfs"
> >   SECTION = "base"
> >
> > -LICENSE = "GPL-2.0"
> > +LICENSE = "GPL-2.0-only"
> >   LIC_FILES_CHKSUM =
> "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
> >
> >   DEPENDS = "keyutils libgcrypt intltool-native glib-2.0-native"
> > diff --git a/recipes-security/nikto/nikto_2.1.6.bb
> b/recipes-security/nikto/nikto_2.1.6.bb
> > index 8542d69..8c21b30 100644
> > --- a/recipes-security/nikto/nikto_2.1.6.bb
> > +++ b/recipes-security/nikto/nikto_2.1.6.bb
> > @@ -3,7 +3,7 @@ DESCRIPTION = "Nikto is an Open Source web server
> scanner which performs compreh
> >   SECTION = "security"
> >   HOMEPAGE = "https://cirt.net/Nikto2"
> >
> > -LICENSE = "GPLv2"
> > +LICENSE = "GPL-2.0-only"
> >   LIC_FILES_CHKSUM =
> "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
> >
> >   SRCREV = "f1bbd1a8756c076c8fd4f4dd0bc34a8ef215ae79"
> > diff --git a/recipes-security/sssd/sssd_2.5.2.bb
> b/recipes-security/sssd/sssd_2.5.2.bb
> > index 8bc8787..9f1d627 100644
> > --- a/recipes-security/sssd/sssd_2.5.2.bb
> > +++ b/recipes-security/sssd/sssd_2.5.2.bb
> > @@ -2,7 +2,7 @@ SUMMARY = "system security services daemon"
> >   DESCRIPTION = "SSSD is a system security services daemon"
> >   HOMEPAGE = "https://pagure.io/SSSD/sssd/"
> >   SECTION = "base"
> > -LICENSE = "GPLv3+"
> > +LICENSE = "GPL-3.0-or-later"
> >   LIC_FILES_CHKSUM =
> "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> >
> >   DEPENDS = "acl attr openldap cyrus-sasl libtdb ding-libs libpam c-ares
> krb5 autoconf-archive"
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#56537):
> https://lists.yoctoproject.org/g/yocto/message/56537
> > Mute This Topic: https://lists.yoctoproject.org/mt/89983861/3616698
> > Group Owner: yocto+owner@lists.yoctoproject.org
> > Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [
> akuster808@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>

Patch

diff --git a/recipes-ids/samhain/samhain.inc b/recipes-ids/samhain/samhain.inc
index 077e118..d64cddb 100644
--- a/recipes-ids/samhain/samhain.inc
+++ b/recipes-ids/samhain/samhain.inc
@@ -1,6 +1,6 @@ 
 DESCRIPTION = "Provides file integrity checking and log file monitoring/analysis"
 HOMEPAGE    = "http://www.la-samhna.de/samhain/"
-LICENSE     = "GPLv2"
+LICENSE     = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b"
 
 PV = "4.4.6"
diff --git a/recipes-ids/suricata/suricata.inc b/recipes-ids/suricata/suricata.inc
index 5754617..906423c 100644
--- a/recipes-ids/suricata/suricata.inc
+++ b/recipes-ids/suricata/suricata.inc
@@ -1,5 +1,5 @@ 
 HOMEPAGE = "http://suricata-ids.org/"
 SECTION = "security Monitor/Admin"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 COMPATIBLE_HOST:powerpc = 'null'
diff --git a/recipes-perl/perl/libwhisker2-perl_2.5.bb b/recipes-perl/perl/libwhisker2-perl_2.5.bb
index 5889a05..42c0b42 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+"
+LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=254b8e29606fce6d1c1a4c9e32354573"
 
diff --git a/recipes-scanners/clamav/clamav_0.104.0.bb b/recipes-scanners/clamav/clamav_0.104.0.bb
index f0889de..491a82f 100644
--- a/recipes-scanners/clamav/clamav_0.104.0.bb
+++ b/recipes-scanners/clamav/clamav_0.104.0.bb
@@ -2,7 +2,7 @@  SUMMARY = "ClamAV anti-virus utility for Unix - command-line interface"
 DESCRIPTION = "ClamAV is an open source antivirus engine for detecting trojans, viruses, malware & other malicious threats."
 HOMEPAGE = "http://www.clamav.net/index.html"
 SECTION = "security"
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 
 DEPENDS = "glibc llvm libtool db openssl zlib curl libxml2 bison pcre2 json-c libcheck"
  
diff --git a/recipes-security/bastille/bastille_3.2.1.bb b/recipes-security/bastille/bastille_3.2.1.bb
index 2d82983..e7852d9 100644
--- a/recipes-security/bastille/bastille_3.2.1.bb
+++ b/recipes-security/bastille/bastille_3.2.1.bb
@@ -2,7 +2,7 @@ 
 #consult the README file for the meta-security layer for additional information.
 SUMMARY = "Linux hardening tool"
 DESCRIPTION = "Bastille Linux is a Hardening and Reporting/Auditing Program which enhances the security of a Linux box, by configuring daemons, system settings and firewalling."
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
 # Bash is needed for set +o privileged (check busybox), might also need ncurses
 DEPENDS = "virtual/kernel"
diff --git a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
index 9aefc32..5f8cf3c 100644
--- a/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
+++ b/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
@@ -6,7 +6,7 @@  DESCRIPTION = "eCryptfs is a stacked cryptographic filesystem \
 HOMEPAGE = "https://launchpad.net/ecryptfs"
 SECTION = "base"
 
-LICENSE = "GPL-2.0"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
 DEPENDS = "keyutils libgcrypt intltool-native glib-2.0-native"
diff --git a/recipes-security/nikto/nikto_2.1.6.bb b/recipes-security/nikto/nikto_2.1.6.bb
index 8542d69..8c21b30 100644
--- a/recipes-security/nikto/nikto_2.1.6.bb
+++ b/recipes-security/nikto/nikto_2.1.6.bb
@@ -3,7 +3,7 @@  DESCRIPTION = "Nikto is an Open Source web server scanner which performs compreh
 SECTION = "security"
 HOMEPAGE = "https://cirt.net/Nikto2"
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
 SRCREV = "f1bbd1a8756c076c8fd4f4dd0bc34a8ef215ae79"
diff --git a/recipes-security/sssd/sssd_2.5.2.bb b/recipes-security/sssd/sssd_2.5.2.bb
index 8bc8787..9f1d627 100644
--- a/recipes-security/sssd/sssd_2.5.2.bb
+++ b/recipes-security/sssd/sssd_2.5.2.bb
@@ -2,7 +2,7 @@  SUMMARY = "system security services daemon"
 DESCRIPTION = "SSSD is a system security services daemon"
 HOMEPAGE = "https://pagure.io/SSSD/sssd/"
 SECTION = "base"
-LICENSE = "GPLv3+"
+LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS = "acl attr openldap cyrus-sasl libtdb ding-libs libpam c-ares krb5 autoconf-archive"