From 1f550adf05387f6ead0d148547a110273c2c867c Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Sun, 28 Aug 2022 10:29:24 +0800
Subject: checkpolicy: upgrade 3.3 -> 3.4

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
---
 recipes-security/selinux/checkpolicy_3.3.bb | 26 --------------------------
 recipes-security/selinux/checkpolicy_3.4.bb | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 26 deletions(-)
 delete mode 100644 recipes-security/selinux/checkpolicy_3.3.bb
 create mode 100644 recipes-security/selinux/checkpolicy_3.4.bb

diff --git a/recipes-security/selinux/checkpolicy_3.3.bb b/recipes-security/selinux/checkpolicy_3.3.bb
deleted file mode 100644
index ad90cc2..0000000
--- a/recipes-security/selinux/checkpolicy_3.3.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "SELinux policy compiler"
-DESCRIPTION = "\
-This package contains checkpolicy, the SELinux policy compiler. Only \
-required for building policies. It uses libsepol to generate the \
-binary policy. checkpolicy uses the static libsepol since it deals \
-with low level details of the policy that have not been \
-encapsulated/abstracted by a proper shared library interface."
-SECTION = "base"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-require selinux_common.inc
-
-DEPENDS += "libsepol bison-native flex-native"
-
-EXTRA_OEMAKE += "LEX='flex'"
-EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a"
-
-S = "${WORKDIR}/git/checkpolicy"
-
-do_install:append() {
-    install test/dismod ${D}/${bindir}/sedismod
-    install test/dispol ${D}/${bindir}/sedispol
-}
-
-BBCLASSEXTEND = "native"
diff --git a/recipes-security/selinux/checkpolicy_3.4.bb b/recipes-security/selinux/checkpolicy_3.4.bb
new file mode 100644
index 0000000..3df1bbb
--- /dev/null
+++ b/recipes-security/selinux/checkpolicy_3.4.bb
@@ -0,0 +1,23 @@
+SUMMARY = "SELinux policy compiler"
+DESCRIPTION = "\
+This package contains checkpolicy, the SELinux policy compiler. Only \
+required for building policies. It uses libsepol to generate the \
+binary policy. checkpolicy uses the static libsepol since it deals \
+with low level details of the policy that have not been \
+encapsulated/abstracted by a proper shared library interface."
+SECTION = "base"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+require selinux_common.inc
+
+DEPENDS = "libsepol bison-native"
+
+S = "${WORKDIR}/git/checkpolicy"
+
+do_install:append() {
+    install test/dismod ${D}/${bindir}/sedismod
+    install test/dispol ${D}/${bindir}/sedispol
+}
+
+BBCLASSEXTEND = "native"
-- 
cgit v1.2.3-54-g00ecf