Merge branch 'feature_CPDX-3405'

Change-Id: I78b76278d9cccbd211419b1045e39a2d13b3b744

8 files changed, 14 insertions, 115 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 56cd735..f6ef054 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,3 +10,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "nfv-access-common"
 BBFILE_PATTERN_nfv-access-common = "^${LAYERDIR}/"
 BBFILE_PRIORITY_nfv-access-common = "5"
+
+LAYERSERIES_COMPAT_nfv-access-common = "hardknott"
diff --git a/recipes-core/systemd/systemd/CVE-2017-15908.patch b/recipes-core/systemd/systemd/CVE-2017-15908.patch
deleted file mode 100644
index 6851243..0000000
--- a/recipes-core/systemd/systemd/CVE-2017-15908.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9f939335a07085aa9a9663efd1dca06ef6405d62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 25 Oct 2017 11:19:19 +0200
-Subject: [PATCH] resolved: fix loop on packets with pseudo dns types
-
-Reported by Karim Hossen & Thomas Imbert from Sogeti ESEC R&D.
-
-Upstream-Status: Backport
-CVE: CVE-2017-15908
-
-Upstream patch:
-https://github.com/systemd/systemd/commit/8aeadf3052a2130b88d5bccf5439890e1034f28d
-
-https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/172535
-
-Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
----
- src/resolve/resolved-dns-packet.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
-index e2f227bfc64..35f4d0689b2 100644
---- a/src/resolve/resolved-dns-packet.c
-+++ b/src/resolve/resolved-dns-packet.c
-@@ -1514,7 +1514,7 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta
- 
-                 found = true;
- 
--                while (bitmask) {
-+                for (; bitmask; bit++, bitmask >>= 1)
-                         if (bitmap[i] & bitmask) {
-                                 uint16_t n;
- 
-@@ -1528,10 +1528,6 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta
-                                 if (r < 0)
-                                         return r;
-                         }
--
--                        bit++;
--                        bitmask >>= 1;
--                }
-         }
- 
-         if (!found)
diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend
deleted file mode 100644
index 4fe658a..0000000
--- a/recipes-core/systemd/systemd_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://CVE-2017-15908.patch \
-           "
diff --git a/recipes-enea/bitcalc/bitcalc_1.0.bb b/recipes-enea/bitcalc/bitcalc_1.0.bb
index f5a0aad..a3aed89 100644
--- a/recipes-enea/bitcalc/bitcalc_1.0.bb
+++ b/recipes-enea/bitcalc/bitcalc_1.0.bb
@@ -19,10 +19,14 @@ SRC_URI = "git://github.com/OpenEneaLinux/rt-tools.git;branch=master \
 DEPENDS_remove_aarch64 = "gcc-sanitizers"
 SRC_URI_append_aarch64 = "file://0001-bitcalc-disable-gcc-address-sanitizer.patch"
 
-SRCREV = "9d4d1ce26b58ada516466c30e53c75c2961d6f0a"
+SRCREV = "b46c72324c19cf74730ad562fc3f050d31018034"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE += "'DESTDIR=${D}/usr/bin'"
+EXTRA_OEMAKE += "'DESTDIR=${D}${bindir}'"
 
 inherit pkgconfig cmake
+
+do_install() {
+        install -m 0755 -D ${B}/bitcalc/src/bitcalc ${D}${bindir}/bitcalc
+}
diff --git a/recipes-enea/count-ticks/count-ticks_1.1.bb b/recipes-enea/count-ticks/count-ticks_1.1.bb
index a33a0f9..6f60357 100644
--- a/recipes-enea/count-ticks/count-ticks_1.1.bb
+++ b/recipes-enea/count-ticks/count-ticks_1.1.bb
@@ -12,14 +12,12 @@ SRC_URI = "git://github.com/OpenEneaLinux/rt-tools.git;branch=master \
            file://run-ptest \
            "
 
-SRCREV = "9d4d1ce26b58ada516466c30e53c75c2961d6f0a"
+SRCREV = "b46c72324c19cf74730ad562fc3f050d31018034"
 
 inherit ptest
 
 S = "${WORKDIR}/git"
 
-FILES_${PN} += "/bin/*"
-
 do_install() {
-        install -D ${S}/count_ticks/count_ticks ${D}/usr/bin/count_ticks
+        install -m 0755 -D ${S}/count_ticks/count_ticks ${D}${bindir}/count_ticks
 }
diff --git a/recipes-enea/partrt/partrt_1.1.bb b/recipes-enea/partrt/partrt_1.1.bb
index 5c22e4a..8d0ca6c 100644
--- a/recipes-enea/partrt/partrt_1.1.bb
+++ b/recipes-enea/partrt/partrt_1.1.bb
@@ -4,24 +4,21 @@ SECTION = "utils"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b52bab7a403562f36be803f11489f1a4"
 
-RDEPENDS_${PN} = "bash"
-RDEPENDS_${PN}-ptest += "python"
+RDEPENDS_${PN} = "bash bitcalc"
+RDEPENDS_${PN}-ptest += "python3"
 
 SRC_URI = "git://github.com/OpenEneaLinux/rt-tools.git;branch=master \
            file://run-ptest \
            "
 
-SRCREV = "9d4d1ce26b58ada516466c30e53c75c2961d6f0a"
+SRCREV = "b46c72324c19cf74730ad562fc3f050d31018034"
 
 inherit ptest
 
 S = "${WORKDIR}/git"
 
-FILES_${PN} += "/bin/*"
-
 do_install() {
-        install -d ${D}/usr/bin
-        install ${S}/partrt/partrt ${D}/usr/bin
+        install -m 0755 -D ${S}/partrt/partrt ${D}${bindir}/partrt
 }
 
 do_install_ptest() {
diff --git a/recipes-extended/shadow/shadow/CVE-2016-6252.patch b/recipes-extended/shadow/shadow/CVE-2016-6252.patch
deleted file mode 100644
index 6e05584..0000000
--- a/recipes-extended/shadow/shadow/CVE-2016-6252.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1d5a926cc2d6078d23a96222b1ef3e558724dad1 Mon Sep 17 00:00:00 2001
-From: Sebastian Krahmer <krahmer@suse.com>
-Date: Wed, 3 Aug 2016 11:51:07 -0500
-Subject: [PATCH] Simplify getulong
-
-Use strtoul to read an unsigned long, rather than reading
-a signed long long and casting it.
-
-https://bugzilla.suse.com/show_bug.cgi?id=979282
-
-CVE: CVE-2016-6252
-Upstream-Status: Backport [https://github.com/shadow-maint/shadow/commit/1d5a926cc2d6078d23a96222b1ef3e558724dad1]
-
-Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
----
- lib/getulong.c | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/lib/getulong.c b/lib/getulong.c
-index 61579cae..08d2c1a8 100644
---- a/lib/getulong.c
-+++ b/lib/getulong.c
-@@ -44,22 +44,19 @@
-  */
- int getulong (const char *numstr, /*@out@*/unsigned long int *result)
- {
--       long long int val;
-+       unsigned long int val;
-        char *endptr;
- 
-        errno = 0;
--       val = strtoll (numstr, &endptr, 0);
-+       val = strtoul (numstr, &endptr, 0);
-        if (    ('\0' == *numstr)
-             || ('\0' != *endptr)
-             || (ERANGE == errno)
--            /*@+ignoresigns@*/
--            || (val != (unsigned long int)val)
--            /*@=ignoresigns@*/
-           ) {
-                return 0;
-        }
- 
--       *result = (unsigned long int)val;
-+       *result = val;
-        return 1;
- }
- 
diff --git a/recipes-extended/shadow/shadow_%.bbappend b/recipes-extended/shadow/shadow_%.bbappend
deleted file mode 100644
index 4f04479..0000000
--- a/recipes-extended/shadow/shadow_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://CVE-2016-6252.patch \
-           "