Merge branch 'feature_CPDX-3405'

Change-Id: I78b76278d9cccbd211419b1045e39a2d13b3b744

2 files changed, 0 insertions, 49 deletions

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 \
-           "