Drop backported patch: 0001-checkpolicy-remove-unused-te_assertions.patch
Signed-off-by: Yi Zhao <[email protected]> --- ...ckpolicy-remove-unused-te_assertions.patch | 45 ------------------- recipes-security/selinux/checkpolicy_3.0.bb | 11 ----- recipes-security/selinux/checkpolicy_3.1.bb | 7 +++ 3 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 recipes-security/selinux/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch delete mode 100644 recipes-security/selinux/checkpolicy_3.0.bb create mode 100644 recipes-security/selinux/checkpolicy_3.1.bb diff --git a/recipes-security/selinux/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch b/recipes-security/selinux/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch deleted file mode 100644 index 61c301e..0000000 --- a/recipes-security/selinux/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 95d8f16ece96829109eb75a605b1459a25b5a6be Mon Sep 17 00:00:00 2001 -From: Ondrej Mosnacek <[email protected]> -Date: Thu, 23 Jan 2020 13:57:15 +0100 -Subject: [PATCH] checkpolicy: remove unused te_assertions - -This variable is declared in a header file, but never defined or used. -The te_assert structure definition is only used in this declaration, so -remove both. - -Upstream-Status: Backport [https://github.com/SELinuxProject/selinux/commit/4d330d0d3155211f119b3082f728ae42dcc01e96] - -Signed-off-by: Ondrej Mosnacek <[email protected]> -Signed-off-by: Mingli Yu <[email protected]> ---- - checkpolicy/checkpolicy.h | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/checkpolicy.h b/checkpolicy.h -index 3868f1fa023b..f127687e72a6 100644 ---- a/checkpolicy.h -+++ b/checkpolicy.h -@@ -1,20 +1,6 @@ - #ifndef _CHECKPOLICY_H_ - #define _CHECKPOLICY_H_ - --#include <sepol/policydb/ebitmap.h> -- --typedef struct te_assert { -- ebitmap_t stypes; -- ebitmap_t ttypes; -- ebitmap_t tclasses; -- int self; -- sepol_access_vector_t *avp; -- unsigned long line; -- struct te_assert *next; --} te_assert_t; -- --te_assert_t *te_assertions; -- - extern unsigned int policyvers; - - #endif --- -2.24.1 - diff --git a/recipes-security/selinux/checkpolicy_3.0.bb b/recipes-security/selinux/checkpolicy_3.0.bb deleted file mode 100644 index 50d6217..0000000 --- a/recipes-security/selinux/checkpolicy_3.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require selinux_20191204.inc -require ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "b7c5547b95ce855bcdc10cb8adba8223" -SRC_URI[sha256sum] = "c88c719a141dd5c1202d49c378c7f063349d630522d5e04dc6e0c53da81aa4f8" - -SRC_URI += "\ - file://0001-checkpolicy-remove-unused-te_assertions.patch \ -" diff --git a/recipes-security/selinux/checkpolicy_3.1.bb b/recipes-security/selinux/checkpolicy_3.1.bb new file mode 100644 index 0000000..71045b8 --- /dev/null +++ b/recipes-security/selinux/checkpolicy_3.1.bb @@ -0,0 +1,7 @@ +require selinux_20200710.inc +require ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "1302676cd8853f740a963fd6d5bb4172" +SRC_URI[sha256sum] = "dfc7707070520c93b14fbbdfdbe081364d806bf28e3e79e10318c2594c77bbb2" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#51900): https://lists.yoctoproject.org/g/yocto/message/51900 Mute This Topic: https://lists.yoctoproject.org/mt/79492068/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
