From 49e29a10ccf9979817e7c40b903e7c7925ab2e5c Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Sun, 1 Sep 2019 15:21:06 -0400
Subject: meta-security: subtree update:6d399b34ab..30ea7a89dc

Adrian Bunk (2):
      xmlsec1: Remove, moved to meta-oe
      libenv-perl: Remove, moved to meta-perl

Armin Kuster (3):
      apparmor: fix RDPENDS
      apparmor: update to 2.13.3
      integrity-image: IMA_EVM_KEY_DIR has no affect, remove

Qi.Chen@windriver.com (2):
      ecryptfs-utils: remove openssl PACKAGECONFIG
      ecryptfs-utils: fix race condition in do_install

Yuan Chao (2):
      python-scapy: upgrade 2.4.2 -> 2.4.3
      checksec: upgrade 1.11.1 -> 2.1.0

Change-Id: I888703dc3a3df6fa0da471e1d112f9d88dcdc44b
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 meta-security/recipes-security/scapy/python-scapy.inc       |  4 ++--
 meta-security/recipes-security/scapy/python-scapy_2.4.2.bb  | 11 -----------
 meta-security/recipes-security/scapy/python-scapy_2.4.3.bb  | 11 +++++++++++
 meta-security/recipes-security/scapy/python3-scapy_2.4.2.bb |  9 ---------
 meta-security/recipes-security/scapy/python3-scapy_2.4.3.bb |  9 +++++++++
 5 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 meta-security/recipes-security/scapy/python-scapy_2.4.2.bb
 create mode 100644 meta-security/recipes-security/scapy/python-scapy_2.4.3.bb
 delete mode 100644 meta-security/recipes-security/scapy/python3-scapy_2.4.2.bb
 create mode 100644 meta-security/recipes-security/scapy/python3-scapy_2.4.3.bb

(limited to 'meta-security/recipes-security/scapy')

diff --git a/meta-security/recipes-security/scapy/python-scapy.inc b/meta-security/recipes-security/scapy/python-scapy.inc
index baa69b244..28e13f288 100644
--- a/meta-security/recipes-security/scapy/python-scapy.inc
+++ b/meta-security/recipes-security/scapy/python-scapy.inc
@@ -3,11 +3,11 @@ DESCRIPTION = "Scapy is a powerful interactive packet manipulation program. It i
 SECTION = "security"
 LICENSE = "GPLv2"
 
-LIC_FILES_CHKSUM = "file://bin/scapy;beginline=9;endline=13;md5=1d5249872cc54cd4ca3d3879262d0c69"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 S = "${WORKDIR}/git"
 
-SRCREV = "bad14cb1a5aee29f8107fbe8ad008d4645f14da7"
+SRCREV = "3047580162a9407ef05fe981983cacfa698f1159"
 SRC_URI = "git://github.com/secdev/scapy.git"
 
 inherit ptest
diff --git a/meta-security/recipes-security/scapy/python-scapy_2.4.2.bb b/meta-security/recipes-security/scapy/python-scapy_2.4.2.bb
deleted file mode 100644
index 982620e0b..000000000
--- a/meta-security/recipes-security/scapy/python-scapy_2.4.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-inherit setuptools
-require python-scapy.inc
-
-SRC_URI += "file://run-ptest"
-
-RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"
-
-do_install_append() {
-        mv ${D}${bindir}/scapy ${D}${bindir}/scapy2
-        mv ${D}${bindir}/UTscapy ${D}${bindir}/UTscapy2
-}
diff --git a/meta-security/recipes-security/scapy/python-scapy_2.4.3.bb b/meta-security/recipes-security/scapy/python-scapy_2.4.3.bb
new file mode 100644
index 000000000..982620e0b
--- /dev/null
+++ b/meta-security/recipes-security/scapy/python-scapy_2.4.3.bb
@@ -0,0 +1,11 @@
+inherit setuptools
+require python-scapy.inc
+
+SRC_URI += "file://run-ptest"
+
+RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"
+
+do_install_append() {
+        mv ${D}${bindir}/scapy ${D}${bindir}/scapy2
+        mv ${D}${bindir}/UTscapy ${D}${bindir}/UTscapy2
+}
diff --git a/meta-security/recipes-security/scapy/python3-scapy_2.4.2.bb b/meta-security/recipes-security/scapy/python3-scapy_2.4.2.bb
deleted file mode 100644
index abcaeeb0b..000000000
--- a/meta-security/recipes-security/scapy/python3-scapy_2.4.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-inherit setuptools3
-require python-scapy.inc
-
-SRC_URI += "file://run-ptest"
-
-do_install_append() {
-        mv ${D}${bindir}/scapy ${D}${bindir}/scapy3
-        mv ${D}${bindir}/UTscapy ${D}${bindir}/UTscapy3
-}
diff --git a/meta-security/recipes-security/scapy/python3-scapy_2.4.3.bb b/meta-security/recipes-security/scapy/python3-scapy_2.4.3.bb
new file mode 100644
index 000000000..abcaeeb0b
--- /dev/null
+++ b/meta-security/recipes-security/scapy/python3-scapy_2.4.3.bb
@@ -0,0 +1,9 @@
+inherit setuptools3
+require python-scapy.inc
+
+SRC_URI += "file://run-ptest"
+
+do_install_append() {
+        mv ${D}${bindir}/scapy ${D}${bindir}/scapy3
+        mv ${D}${bindir}/UTscapy ${D}${bindir}/UTscapy3
+}
-- 
cgit v1.2.3