selinux: bump to 20200710
cover selinux: bump to 20200710
Hi all,
The SELinux libraries and tools[1] has a new release, 20200710. This series bumps the packages coming from the project to this version and handles required changes (patches refreshing or removal, new dependencies, etc).
The series also includes the bump of setools to 4.3.0 as the version supported in Buildroot was quite old and incompatible with the latest version of the libraries provided by the SELinux project[1].
Thanks,
Antoine
[1] https://github.com/SELinuxProject/selinux
Antoine Tenart (9):
package/libsepol: bump to 20200710
package/libsemanage: bump to 20200710
package/libselinux: bump to 20200710
package/policycoreutils: bump to 20200710
package/checkpolicy: bump to 20200710
package/restorecond: bump to 20200710
package/semodule-utils: bump to 20200710
package/selinux-python: bump to 20200710
package/setools: bump to 4.3.0
...ckpolicy-remove-unused-te_assertions.patch | 45 -- package/checkpolicy/checkpolicy.hash | 2 +- package/checkpolicy/checkpolicy.mk | 4 +- ...T-and-rely-on-the-installed-file-nam.patch | 17 +- ...ng-against-musl-and-uclibc-libraries.patch | 32 -- package/libselinux/libselinux.hash | 2 +- package/libselinux/libselinux.mk | 4 +- package/libsemanage/libsemanage.hash | 2 +- package/libsemanage/libsemanage.mk | 4 +- ...IL_KEY_-build-errors-with-fno-common.patch | 528 ------------------ ...e-leftovers-of-cil_mem_error_handler.patch | 63 --- package/libsepol/libsepol.hash | 2 +- package/libsepol/libsepol.mk | 4 +- package/policycoreutils/policycoreutils.hash | 2 +- package/policycoreutils/policycoreutils.mk | 4 +- package/restorecond/restorecond.hash | 2 +- package/restorecond/restorecond.mk | 4 +- package/selinux-python/selinux-python.hash | 2 +- package/selinux-python/selinux-python.mk | 4 +- package/semodule-utils/semodule-utils.hash | 2 +- package/semodule-utils/semodule-utils.mk | 4 +- .../0001-remove-werror-flag-from-setup.patch | 16 +- ...e-setools.InfoFlowAnalysis-and-setoo.patch | 74 +-- ...py-drop-path-prefix-from-man-install.patch | 42 -- package/setools/setools.hash | 4 +- package/setools/setools.mk | 12 +- 26 files changed, 87 insertions(+), 794 deletions(-) delete mode 100644 package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch delete mode 100644 package/libselinux/0003-fix-building-against-musl-and-uclibc-libraries.patch delete mode 100644 package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch delete mode 100644 package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch delete mode 100644 package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch
Signature · 1 line
2.26.2
PATCH 1/9 package/libsepol: bump to 20200710
Patches 0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch and 0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch are now upstream.
--- ...IL_KEY_-build-errors-with-fno-common.patch | 528 ------------------ ...e-leftovers-of-cil_mem_error_handler.patch | 63 --- package/libsepol/libsepol.hash | 2 +- package/libsepol/libsepol.mk | 4 +- 4 files changed, 3 insertions(+), 594 deletions(-) delete mode 100644 package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch delete mode 100644 package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch
package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch deleted +0 -528
@@ -1,528 +0,0 @@ -From a96e8c59ecac84096d870b42701a504791a8cc8c Mon Sep 17 00:00:00 2001 -From: Ondrej Mosnacek <[email protected]> -Date: Thu, 23 Jan 2020 13:57:13 +0100 -Subject: [PATCH] libsepol: fix CIL_KEY_* build errors with -fno-common - -GCC 10 comes with -fno-common enabled by default - fix the CIL_KEY_* -global variables to be defined only once in cil.c and declared in the -header file correctly with the 'extern' keyword, so that other units -including the file don't generate duplicate definitions. - -Upstream: https://github.com/SELinuxProject/selinux/commit/a96e8c59ecac84096d870b42701a504791a8cc8c - -Signed-off-by: Ondrej Mosnacek <[email protected]> -Signed-off-by: Matt Weber <[email protected]> ---- - cil/src/cil.c | 162 ++++++++++++++++ - cil/src/cil_internal.h | 322 ++++++++++++++++---------------- - 2 files changed, 323 insertions(+), 161 deletions(-) - -diff --git a/cil/src/cil.c b/cil/src/cil.c -index de729cf8..d222ad3a 100644 ---- a/cil/src/cil.c -+++ b/cil/src/cil.c -@@ -77,6 +77,168 @@ int cil_sym_sizes[CIL_SYM_ARRAY_NUM][CIL_SYM_NUM] = { - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1} - }; - -+char *CIL_KEY_CONS_T1; -+char *CIL_KEY_CONS_T2; -+char *CIL_KEY_CONS_T3; -+char *CIL_KEY_CONS_R1; -+char *CIL_KEY_CONS_R2; -+char *CIL_KEY_CONS_R3; -+char *CIL_KEY_CONS_U1; -+char *CIL_KEY_CONS_U2; -+char *CIL_KEY_CONS_U3; -+char *CIL_KEY_CONS_L1; -+char *CIL_KEY_CONS_L2; -+char *CIL_KEY_CONS_H1; -+char *CIL_KEY_CONS_H2; -+char *CIL_KEY_AND; -+char *CIL_KEY_OR; -+char *CIL_KEY_NOT; -+char *CIL_KEY_EQ; -+char *CIL_KEY_NEQ; -+char *CIL_KEY_CONS_DOM; -+char *CIL_KEY_CONS_DOMBY; -+char *CIL_KEY_CONS_INCOMP; -+char *CIL_KEY_CONDTRUE; -+char *CIL_KEY_CONDFALSE; -+char *CIL_KEY_SELF; -+char *CIL_KEY_OBJECT_R; -+char *CIL_KEY_STAR; -+char *CIL_KEY_TCP; -+char *CIL_KEY_UDP; -+char *CIL_KEY_DCCP; -+char *CIL_KEY_SCTP; -+char *CIL_KEY_AUDITALLOW; -+char *CIL_KEY_TUNABLEIF; -+char *CIL_KEY_ALLOW; -+char *CIL_KEY_DONTAUDIT; -+char *CIL_KEY_TYPETRANSITION; -+char *CIL_KEY_TYPECHANGE; -+char *CIL_KEY_CALL; -+char *CIL_KEY_TUNABLE; -+char *CIL_KEY_XOR; -+char *CIL_KEY_ALL; -+char *CIL_KEY_RANGE; -+char *CIL_KEY_GLOB; -+char *CIL_KEY_FILE; -+char *CIL_KEY_DIR; -+char *CIL_KEY_CHAR; -+char *CIL_KEY_BLOCK; -+char *CIL_KEY_SOCKET; -+char *CIL_KEY_PIPE; -+char *CIL_KEY_SYMLINK; -+char *CIL_KEY_ANY; -+char *CIL_KEY_XATTR; -+char *CIL_KEY_TASK; -+char *CIL_KEY_TRANS; -+char *CIL_KEY_TYPE; -+char *CIL_KEY_ROLE; -+char *CIL_KEY_USER; -+char *CIL_KEY_USERATTRIBUTE; -+char *CIL_KEY_USERATTRIBUTESET; -+char *CIL_KEY_SENSITIVITY; -+char *CIL_KEY_CATEGORY; -+char *CIL_KEY_CATSET; -+char *CIL_KEY_LEVEL; -+char *CIL_KEY_LEVELRANGE; -+char *CIL_KEY_CLASS; -+char *CIL_KEY_IPADDR; -+char *CIL_KEY_MAP_CLASS; -+char *CIL_KEY_CLASSPERMISSION; -+char *CIL_KEY_BOOL; -+char *CIL_KEY_STRING; -+char *CIL_KEY_NAME; -+char *CIL_KEY_SOURCE; -+char *CIL_KEY_TARGET; -+char *CIL_KEY_LOW; -+char *CIL_KEY_HIGH; -+char *CIL_KEY_LOW_HIGH; -+char *CIL_KEY_GLBLUB; -+char *CIL_KEY_HANDLEUNKNOWN; -+char *CIL_KEY_HANDLEUNKNOWN_ALLOW; -+char *CIL_KEY_HANDLEUNKNOWN_DENY; -+char *CIL_KEY_HANDLEUNKNOWN_REJECT; -+char *CIL_KEY_MACRO; -+char *CIL_KEY_IN; -+char *CIL_KEY_MLS; -+char *CIL_KEY_DEFAULTRANGE; -+char *CIL_KEY_BLOCKINHERIT; -+char *CIL_KEY_BLOCKABSTRACT; -+char *CIL_KEY_CLASSORDER; -+char *CIL_KEY_CLASSMAPPING; -+char *CIL_KEY_CLASSPERMISSIONSET; -+char *CIL_KEY_COMMON; -+char *CIL_KEY_CLASSCOMMON; -+char *CIL_KEY_SID; -+char *CIL_KEY_SIDCONTEXT; -+char *CIL_KEY_SIDORDER; -+char *CIL_KEY_USERLEVEL; -+char *CIL_KEY_USERRANGE; -+char *CIL_KEY_USERBOUNDS; -+char *CIL_KEY_USERPREFIX; -+char *CIL_KEY_SELINUXUSER; -+char *CIL_KEY_SELINUXUSERDEFAULT; -+char *CIL_KEY_TYPEATTRIBUTE; -+char *CIL_KEY_TYPEATTRIBUTESET; -+char *CIL_KEY_EXPANDTYPEATTRIBUTE; -+char *CIL_KEY_TYPEALIAS; -+char *CIL_KEY_TYPEALIASACTUAL; -+char *CIL_KEY_TYPEBOUNDS; -+char *CIL_KEY_TYPEPERMISSIVE; -+char *CIL_KEY_RANGETRANSITION; -+char *CIL_KEY_USERROLE; -+char *CIL_KEY_ROLETYPE; -+char *CIL_KEY_ROLETRANSITION; -+char *CIL_KEY_ROLEALLOW; -+char *CIL_KEY_ROLEATTRIBUTE; -+char *CIL_KEY_ROLEATTRIBUTESET; -+char *CIL_KEY_ROLEBOUNDS; -+char *CIL_KEY_BOOLEANIF; -+char *CIL_KEY_NEVERALLOW; -+char *CIL_KEY_TYPEMEMBER; -+char *CIL_KEY_SENSALIAS; -+char *CIL_KEY_SENSALIASACTUAL; -+char *CIL_KEY_CATALIAS; -+char *CIL_KEY_CATALIASACTUAL; -+char *CIL_KEY_CATORDER; -+char *CIL_KEY_SENSITIVITYORDER; -+char *CIL_KEY_SENSCAT; -+char *CIL_KEY_CONSTRAIN; -+char *CIL_KEY_MLSCONSTRAIN; -+char *CIL_KEY_VALIDATETRANS; -+char *CIL_KEY_MLSVALIDATETRANS; -+char *CIL_KEY_CONTEXT; -+char *CIL_KEY_FILECON; -+char *CIL_KEY_IBPKEYCON; -+char *CIL_KEY_IBENDPORTCON; -+char *CIL_KEY_PORTCON; -+char *CIL_KEY_NODECON; -+char *CIL_KEY_GENFSCON; -+char *CIL_KEY_NETIFCON; -+char *CIL_KEY_PIRQCON; -+char *CIL_KEY_IOMEMCON; -+char *CIL_KEY_IOPORTCON; -+char *CIL_KEY_PCIDEVICECON; -+char *CIL_KEY_DEVICETREECON; -+char *CIL_KEY_FSUSE; -+char *CIL_KEY_POLICYCAP; -+char *CIL_KEY_OPTIONAL; -+char *CIL_KEY_DEFAULTUSER; -+char *CIL_KEY_DEFAULTROLE; -+char *CIL_KEY_DEFAULTTYPE; -+char *CIL_KEY_ROOT; -+char *CIL_KEY_NODE; -+char *CIL_KEY_PERM; -+char *CIL_KEY_ALLOWX; -+char *CIL_KEY_AUDITALLOWX; -+char *CIL_KEY_DONTAUDITX; -+char *CIL_KEY_NEVERALLOWX; -+char *CIL_KEY_PERMISSIONX; -+char *CIL_KEY_IOCTL; -+char *CIL_KEY_UNORDERED; -+char *CIL_KEY_SRC_INFO; -+char *CIL_KEY_SRC_CIL; -+char *CIL_KEY_SRC_HLL; -+ - static void cil_init_keys(void) - { - /* Initialize CIL Keys into strpool */ -diff --git a/cil/src/cil_internal.h b/cil/src/cil_internal.h -index 30fab649..9bdcbdd0 100644 ---- a/cil/src/cil_internal.h -+++ b/cil/src/cil_internal.h -@@ -74,167 +74,167 @@ enum cil_pass { - /* - Keywords - */ --char *CIL_KEY_CONS_T1; --char *CIL_KEY_CONS_T2; --char *CIL_KEY_CONS_T3; --char *CIL_KEY_CONS_R1; --char *CIL_KEY_CONS_R2; --char *CIL_KEY_CONS_R3; --char *CIL_KEY_CONS_U1; --char *CIL_KEY_CONS_U2; --char *CIL_KEY_CONS_U3; --char *CIL_KEY_CONS_L1; --char *CIL_KEY_CONS_L2; --char *CIL_KEY_CONS_H1; --char *CIL_KEY_CONS_H2; --char *CIL_KEY_AND; --char *CIL_KEY_OR; --char *CIL_KEY_NOT; --char *CIL_KEY_EQ; --char *CIL_KEY_NEQ; --char *CIL_KEY_CONS_DOM; --char *CIL_KEY_CONS_DOMBY; --char *CIL_KEY_CONS_INCOMP; --char *CIL_KEY_CONDTRUE; --char *CIL_KEY_CONDFALSE; --char *CIL_KEY_SELF; --char *CIL_KEY_OBJECT_R; --char *CIL_KEY_STAR; --char *CIL_KEY_TCP; --char *CIL_KEY_UDP; --char *CIL_KEY_DCCP; --char *CIL_KEY_SCTP; --char *CIL_KEY_AUDITALLOW; --char *CIL_KEY_TUNABLEIF; --char *CIL_KEY_ALLOW; --char *CIL_KEY_DONTAUDIT; --char *CIL_KEY_TYPETRANSITION; --char *CIL_KEY_TYPECHANGE; --char *CIL_KEY_CALL; --char *CIL_KEY_TUNABLE; --char *CIL_KEY_XOR; --char *CIL_KEY_ALL; --char *CIL_KEY_RANGE; --char *CIL_KEY_GLOB; --char *CIL_KEY_FILE; --char *CIL_KEY_DIR; --char *CIL_KEY_CHAR; --char *CIL_KEY_BLOCK; --char *CIL_KEY_SOCKET; --char *CIL_KEY_PIPE; --char *CIL_KEY_SYMLINK; --char *CIL_KEY_ANY; --char *CIL_KEY_XATTR; --char *CIL_KEY_TASK; --char *CIL_KEY_TRANS; --char *CIL_KEY_TYPE; --char *CIL_KEY_ROLE; --char *CIL_KEY_USER; --char *CIL_KEY_USERATTRIBUTE; --char *CIL_KEY_USERATTRIBUTESET; --char *CIL_KEY_SENSITIVITY; --char *CIL_KEY_CATEGORY; --char *CIL_KEY_CATSET; --char *CIL_KEY_LEVEL; --char *CIL_KEY_LEVELRANGE; --char *CIL_KEY_CLASS; --char *CIL_KEY_IPADDR; --char *CIL_KEY_MAP_CLASS; --char *CIL_KEY_CLASSPERMISSION; --char *CIL_KEY_BOOL; --char *CIL_KEY_STRING; --char *CIL_KEY_NAME; --char *CIL_KEY_SOURCE; --char *CIL_KEY_TARGET; --char *CIL_KEY_LOW; --char *CIL_KEY_HIGH; --char *CIL_KEY_LOW_HIGH; --char *CIL_KEY_GLBLUB; --char *CIL_KEY_HANDLEUNKNOWN; --char *CIL_KEY_HANDLEUNKNOWN_ALLOW; --char *CIL_KEY_HANDLEUNKNOWN_DENY; --char *CIL_KEY_HANDLEUNKNOWN_REJECT; --char *CIL_KEY_MACRO; --char *CIL_KEY_IN; --char *CIL_KEY_MLS; --char *CIL_KEY_DEFAULTRANGE; --char *CIL_KEY_BLOCKINHERIT; --char *CIL_KEY_BLOCKABSTRACT; --char *CIL_KEY_CLASSORDER; --char *CIL_KEY_CLASSMAPPING; --char *CIL_KEY_CLASSPERMISSIONSET; --char *CIL_KEY_COMMON; --char *CIL_KEY_CLASSCOMMON; --char *CIL_KEY_SID; --char *CIL_KEY_SIDCONTEXT; --char *CIL_KEY_SIDORDER; --char *CIL_KEY_USERLEVEL; --char *CIL_KEY_USERRANGE; --char *CIL_KEY_USERBOUNDS; --char *CIL_KEY_USERPREFIX; --char *CIL_KEY_SELINUXUSER; --char *CIL_KEY_SELINUXUSERDEFAULT; --char *CIL_KEY_TYPEATTRIBUTE; --char *CIL_KEY_TYPEATTRIBUTESET; --char *CIL_KEY_EXPANDTYPEATTRIBUTE; --char *CIL_KEY_TYPEALIAS; --char *CIL_KEY_TYPEALIASACTUAL; --char *CIL_KEY_TYPEBOUNDS; --char *CIL_KEY_TYPEPERMISSIVE; --char *CIL_KEY_RANGETRANSITION; --char *CIL_KEY_USERROLE; --char *CIL_KEY_ROLETYPE; --char *CIL_KEY_ROLETRANSITION; --char *CIL_KEY_ROLEALLOW; --char *CIL_KEY_ROLEATTRIBUTE; --char *CIL_KEY_ROLEATTRIBUTESET; --char *CIL_KEY_ROLEBOUNDS; --char *CIL_KEY_BOOLEANIF; --char *CIL_KEY_NEVERALLOW; --char *CIL_KEY_TYPEMEMBER; --char *CIL_KEY_SENSALIAS; --char *CIL_KEY_SENSALIASACTUAL; --char *CIL_KEY_CATALIAS; --char *CIL_KEY_CATALIASACTUAL; --char *CIL_KEY_CATORDER; --char *CIL_KEY_SENSITIVITYORDER; --char *CIL_KEY_SENSCAT; --char *CIL_KEY_CONSTRAIN; --char *CIL_KEY_MLSCONSTRAIN; --char *CIL_KEY_VALIDATETRANS; --char *CIL_KEY_MLSVALIDATETRANS; --char *CIL_KEY_CONTEXT; --char *CIL_KEY_FILECON; --char *CIL_KEY_IBPKEYCON; --char *CIL_KEY_IBENDPORTCON; --char *CIL_KEY_PORTCON; --char *CIL_KEY_NODECON; --char *CIL_KEY_GENFSCON; --char *CIL_KEY_NETIFCON; --char *CIL_KEY_PIRQCON; --char *CIL_KEY_IOMEMCON; --char *CIL_KEY_IOPORTCON; --char *CIL_KEY_PCIDEVICECON; --char *CIL_KEY_DEVICETREECON; --char *CIL_KEY_FSUSE; --char *CIL_KEY_POLICYCAP; --char *CIL_KEY_OPTIONAL; --char *CIL_KEY_DEFAULTUSER; --char *CIL_KEY_DEFAULTROLE; --char *CIL_KEY_DEFAULTTYPE; --char *CIL_KEY_ROOT; --char *CIL_KEY_NODE; --char *CIL_KEY_PERM; --char *CIL_KEY_ALLOWX; --char *CIL_KEY_AUDITALLOWX; --char *CIL_KEY_DONTAUDITX; --char *CIL_KEY_NEVERALLOWX; --char *CIL_KEY_PERMISSIONX; --char *CIL_KEY_IOCTL; --char *CIL_KEY_UNORDERED; --char *CIL_KEY_SRC_INFO; --char *CIL_KEY_SRC_CIL; --char *CIL_KEY_SRC_HLL; -+extern char *CIL_KEY_CONS_T1; -+extern char *CIL_KEY_CONS_T2; -+extern char *CIL_KEY_CONS_T3; -+extern char *CIL_KEY_CONS_R1; -+extern char *CIL_KEY_CONS_R2; -+extern char *CIL_KEY_CONS_R3; -+extern char *CIL_KEY_CONS_U1; -+extern char *CIL_KEY_CONS_U2; -+extern char *CIL_KEY_CONS_U3; -+extern char *CIL_KEY_CONS_L1; -+extern char *CIL_KEY_CONS_L2; -+extern char *CIL_KEY_CONS_H1; -+extern char *CIL_KEY_CONS_H2; -+extern char *CIL_KEY_AND; -+extern char *CIL_KEY_OR; -+extern char *CIL_KEY_NOT; -+extern char *CIL_KEY_EQ; -+extern char *CIL_KEY_NEQ; -+extern char *CIL_KEY_CONS_DOM; -+extern char *CIL_KEY_CONS_DOMBY; -+extern char *CIL_KEY_CONS_INCOMP; -+extern char *CIL_KEY_CONDTRUE; -+extern char *CIL_KEY_CONDFALSE; -+extern char *CIL_KEY_SELF; -+extern char *CIL_KEY_OBJECT_R; -+extern char *CIL_KEY_STAR; -+extern char *CIL_KEY_TCP; -+extern char *CIL_KEY_UDP; -+extern char *CIL_KEY_DCCP; -+extern char *CIL_KEY_SCTP; -+extern char *CIL_KEY_AUDITALLOW; -+extern char *CIL_KEY_TUNABLEIF; -+extern char *CIL_KEY_ALLOW; -+extern char *CIL_KEY_DONTAUDIT; -+extern char *CIL_KEY_TYPETRANSITION; -+extern char *CIL_KEY_TYPECHANGE; -+extern char *CIL_KEY_CALL; -+extern char *CIL_KEY_TUNABLE; -+extern char *CIL_KEY_XOR; -+extern char *CIL_KEY_ALL; -+extern char *CIL_KEY_RANGE; -+extern char *CIL_KEY_GLOB; -+extern char *CIL_KEY_FILE; -+extern char *CIL_KEY_DIR; -+extern char *CIL_KEY_CHAR; -+extern char *CIL_KEY_BLOCK; -+extern char *CIL_KEY_SOCKET; -+extern char *CIL_KEY_PIPE; -+extern char *CIL_KEY_SYMLINK; -+extern char *CIL_KEY_ANY; -+extern char *CIL_KEY_XATTR; -+extern char *CIL_KEY_TASK; -+extern char *CIL_KEY_TRANS; -+extern char *CIL_KEY_TYPE; -+extern char *CIL_KEY_ROLE; -+extern char *CIL_KEY_USER; -+extern char *CIL_KEY_USERATTRIBUTE; -+extern char *CIL_KEY_USERATTRIBUTESET; -+extern char *CIL_KEY_SENSITIVITY; -+extern char *CIL_KEY_CATEGORY; -+extern char *CIL_KEY_CATSET; -+extern char *CIL_KEY_LEVEL; -+extern char *CIL_KEY_LEVELRANGE; -+extern char *CIL_KEY_CLASS; -+extern char *CIL_KEY_IPADDR; -+extern char *CIL_KEY_MAP_CLASS; -+extern char *CIL_KEY_CLASSPERMISSION; -+extern char *CIL_KEY_BOOL; -+extern char *CIL_KEY_STRING; -+extern char *CIL_KEY_NAME; -+extern char *CIL_KEY_SOURCE; -+extern char *CIL_KEY_TARGET; -+extern char *CIL_KEY_LOW; -+extern char *CIL_KEY_HIGH; -+extern char *CIL_KEY_LOW_HIGH; -+extern char *CIL_KEY_GLBLUB; -+extern char *CIL_KEY_HANDLEUNKNOWN; -+extern char *CIL_KEY_HANDLEUNKNOWN_ALLOW; -+extern char *CIL_KEY_HANDLEUNKNOWN_DENY; -+extern char *CIL_KEY_HANDLEUNKNOWN_REJECT; -+extern char *CIL_KEY_MACRO; -+extern char *CIL_KEY_IN; -+extern char *CIL_KEY_MLS; -+extern char *CIL_KEY_DEFAULTRANGE; -+extern char *CIL_KEY_BLOCKINHERIT; -+extern char *CIL_KEY_BLOCKABSTRACT; -+extern char *CIL_KEY_CLASSORDER; -+extern char *CIL_KEY_CLASSMAPPING; -+extern char *CIL_KEY_CLASSPERMISSIONSET; -+extern char *CIL_KEY_COMMON; -+extern char *CIL_KEY_CLASSCOMMON; -+extern char *CIL_KEY_SID; -+extern char *CIL_KEY_SIDCONTEXT; -+extern char *CIL_KEY_SIDORDER; -+extern char *CIL_KEY_USERLEVEL; -+extern char *CIL_KEY_USERRANGE; -+extern char *CIL_KEY_USERBOUNDS; -+extern char *CIL_KEY_USERPREFIX; -+extern char *CIL_KEY_SELINUXUSER; -+extern char *CIL_KEY_SELINUXUSERDEFAULT; -+extern char *CIL_KEY_TYPEATTRIBUTE; -+extern char *CIL_KEY_TYPEATTRIBUTESET; -+extern char *CIL_KEY_EXPANDTYPEATTRIBUTE; -+extern char *CIL_KEY_TYPEALIAS; -+extern char *CIL_KEY_TYPEALIASACTUAL; -+extern char *CIL_KEY_TYPEBOUNDS; -+extern char *CIL_KEY_TYPEPERMISSIVE; -+extern char *CIL_KEY_RANGETRANSITION; -+extern char *CIL_KEY_USERROLE; -+extern char *CIL_KEY_ROLETYPE; -+extern char *CIL_KEY_ROLETRANSITION; -+extern char *CIL_KEY_ROLEALLOW; -+extern char *CIL_KEY_ROLEATTRIBUTE; -+extern char *CIL_KEY_ROLEATTRIBUTESET; -+extern char *CIL_KEY_ROLEBOUNDS; -+extern char *CIL_KEY_BOOLEANIF; -+extern char *CIL_KEY_NEVERALLOW; -+extern char *CIL_KEY_TYPEMEMBER; -+extern char *CIL_KEY_SENSALIAS; -+extern char *CIL_KEY_SENSALIASACTUAL; -+extern char *CIL_KEY_CATALIAS; -+extern char *CIL_KEY_CATALIASACTUAL; -+extern char *CIL_KEY_CATORDER; -+extern char *CIL_KEY_SENSITIVITYORDER; -+extern char *CIL_KEY_SENSCAT; -+extern char *CIL_KEY_CONSTRAIN; -+extern char *CIL_KEY_MLSCONSTRAIN; -+extern char *CIL_KEY_VALIDATETRANS; -+extern char *CIL_KEY_MLSVALIDATETRANS; -+extern char *CIL_KEY_CONTEXT; -+extern char *CIL_KEY_FILECON; -+extern char *CIL_KEY_IBPKEYCON; -+extern char *CIL_KEY_IBENDPORTCON; -+extern char *CIL_KEY_PORTCON; -+extern char *CIL_KEY_NODECON; -+extern char *CIL_KEY_GENFSCON; -+extern char *CIL_KEY_NETIFCON; -+extern char *CIL_KEY_PIRQCON; -+extern char *CIL_KEY_IOMEMCON; -+extern char *CIL_KEY_IOPORTCON; -+extern char *CIL_KEY_PCIDEVICECON; -+extern char *CIL_KEY_DEVICETREECON; -+extern char *CIL_KEY_FSUSE; -+extern char *CIL_KEY_POLICYCAP; -+extern char *CIL_KEY_OPTIONAL; -+extern char *CIL_KEY_DEFAULTUSER; -+extern char *CIL_KEY_DEFAULTROLE; -+extern char *CIL_KEY_DEFAULTTYPE; -+extern char *CIL_KEY_ROOT; -+extern char *CIL_KEY_NODE; -+extern char *CIL_KEY_PERM; -+extern char *CIL_KEY_ALLOWX; -+extern char *CIL_KEY_AUDITALLOWX; -+extern char *CIL_KEY_DONTAUDITX; -+extern char *CIL_KEY_NEVERALLOWX; -+extern char *CIL_KEY_PERMISSIONX; -+extern char *CIL_KEY_IOCTL; -+extern char *CIL_KEY_UNORDERED; -+extern char *CIL_KEY_SRC_INFO; -+extern char *CIL_KEY_SRC_CIL; -+extern char *CIL_KEY_SRC_HLL; - - /* - Symbol Table Array Indices --- -2.17.1 -
package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch deleted +0 -63
63 lines not on this page · raw message
package/libsepol/libsepol.hash +1 -1
@@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 5b7ae1881909f1048b06f7a0c364c5c8a86ec12e0ec76e740fe9595a6033eb79 libsepol-3.0.tar.gz +sha256 ae6778d01443fdd38cd30eeee846494e19f4d407b09872580372f4aa4bf8a3cc libsepol-3.1.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
package/libsepol/libsepol.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -LIBSEPOL_VERSION = 3.0 -LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 +LIBSEPOL_VERSION = 3.1 +LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = COPYING
Signature · 1 line
2.26.2
PATCH 2/9 package/libsemanage: bump to 20200710
In reply to Antoine Tenart--- package/libsemanage/libsemanage.hash | 2 +- package/libsemanage/libsemanage.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
package/libsemanage/libsemanage.hash +1 -1
@@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 a497b0720d54eac427f1f3f618eed417e50ed8f4e47ed0f7a1d391bd416e84cf libsemanage-3.0.tar.gz +sha256 22d6c75526e40d1781c30bcf29abf97171bdfe6780923f11c8e1c76a75a21ff8 libsemanage-3.1.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
package/libsemanage/libsemanage.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 3.0 -LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 +LIBSEMANAGE_VERSION = 3.1 +LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux bzip2
Signature · 1 line
2.26.2
PATCH 3/9 package/libselinux: bump to 20200710
In reply to Antoine TenartRefresh patch 0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch for 3.1; and remove patch 0003-fix-building-against-musl-and-uclibc-libraries.patch that is now upstream.
--- ...T-and-rely-on-the-installed-file-nam.patch | 17 +++++----- ...ng-against-musl-and-uclibc-libraries.patch | 32 ------------------- package/libselinux/libselinux.hash | 2 +- package/libselinux/libselinux.mk | 4 +-- 4 files changed, 12 insertions(+), 43 deletions(-) delete mode 100644 package/libselinux/0003-fix-building-against-musl-and-uclibc-libraries.patch
package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch +9 -8
@@ -1,4 +1,4 @@ -From 0d4da8093bc2ef92b7c6f7fd1f4804f6ebc6cb56 Mon Sep 17 00:00:00 2001 +From c26495025ab1a2597e5433b67a3bf793d3ce1e08 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <[email protected]> Date: Fri, 25 Oct 2019 13:37:14 +0200 Subject: [PATCH] Do not use PYCEXT, and rely on the installed file name
@@ -15,29 +15,30 @@ To address this and keep things simple, this patch just changes the ln invocation to rely on the name of the _selinux*.so Python module that was installed. -[Upstream: https://github.com/SELinuxProject/selinux/pull/184] +Signed-off-by: Antoine Tenart <[email protected]> +[Refreshed for 3.1] Signed-off-by: Thomas Petazzoni <[email protected]> [Refreshed for 3.0] Signed-off-by: Adam Duskett <[email protected]> --- - libselinux/src/Makefile | 3 +-- + src/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 4b6a4d4..7b14ef1 100644 +index 190016e2af34..7ee22fd35da3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,7 +15,6 @@ INCLUDEDIR ?= $(PREFIX)/include PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX)) PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX)) PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(plat_specific=1, prefix='$(PREFIX)'))") --PYCEXT ?= $(shell $(PYTHON) -c 'import imp;print([s for s,m,t in imp.get_suffixes() if t == imp.C_EXTENSION][0])') +-PYCEXT ?= $(shell $(PYTHON) -c 'import importlib.machinery;print(importlib.machinery.EXTENSION_SUFFIXES[0])') RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]') RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]') RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') -@@ -175,7 +174,7 @@ install: all +@@ -176,7 +175,7 @@ install: all install-pywrap: pywrap - $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` + $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` $(PYTHON_SETUP_ARGS) install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py - ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) + ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux*.so $(DESTDIR)$(PYTHONLIBDIR)/
@@ -45,5 +46,5 @@ index 4b6a4d4..7b14ef1 100644 install-rubywrap: rubywrap test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) -- -2.23.0 +2.26.2
package/libselinux/0003-fix-building-against-musl-and-uclibc-libraries.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 0f6cd4ef20639ac3b3e26af8f743ee03b5d6f8a4 Mon Sep 17 00:00:00 2001 -From: Adam Duskett <[email protected]> -Date: Wed, 11 Dec 2019 14:00:16 -0800 -Subject: [PATCH] Fix building against musl and uClibc libc libraries. - -Currently, the src/Makefile provides the FTS_LDLIBS when building against musl -or uClibc. However, this is missing from utils/Makefile, which causes linking -to fail. - -Add the FTS_LDLIBS variable to the LDLIBS variable in utils/Makefile to fix -compiling against uClibc and musl. - -Signed-off-by: Adam Duskett <[email protected]> - ---- - libselinux/utils/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/Makefile b/utils/Makefile -index 36150638..a5632b7c 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -45,7 +45,7 @@ endif - - override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) - override LDFLAGS += -L../src --override LDLIBS += -lselinux -+override LDLIBS += -lselinux $(FTS_LDLIBS) - PCRE_LDLIBS ?= -lpcre - - ifeq ($(ANDROID_HOST),y) -
package/libselinux/libselinux.hash +1 -1
@@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 2ea2b30f671dae9d6b1391cbe8fb2ce5d36a3ee4fb1cd3c32f0d933c31b82433 libselinux-3.0.tar.gz +sha256 ea5dcbb4d859e3f999c26a13c630da2f16dff9462e3cc8cb7b458ac157d112e7 libselinux-3.1.tar.gz # Hash for license file sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE
package/libselinux/libselinux.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -LIBSELINUX_VERSION = 3.0 -LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 +LIBSELINUX_VERSION = 3.1 +LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE
Signature · 1 line
2.26.2
PATCH 3/9 package/libselinux: bump to 20200710
Antoine,
Quoted 6 lines · Antoine Tenart
Refresh patch 0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch for 3.1; and remove patch 0003-fix-building-against-musl-and-uclibc-libraries.patch that is now upstream.
Signed-off-by Antoine Tenart <[email protected]>
I've reviewed the complete series, thanks for sending it!
Quoted 129 lines
--- ...T-and-rely-on-the-installed-file-nam.patch | 17 +++++----- ...ng-against-musl-and-uclibc-libraries.patch | 32 ------------------- package/libselinux/libselinux.hash | 2 +- package/libselinux/libselinux.mk | 4 +-- 4 files changed, 12 insertions(+), 43 deletions(-) delete mode 100644 package/libselinux/0003-fix-building-against-musl-and-uclibc-libraries.patchpackage/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch +9
-8@@ -1,4 +1,4 @@ -From 0d4da8093bc2ef92b7c6f7fd1f4804f6ebc6cb56 Mon Sep 17 00:00:00 2001 +From c26495025ab1a2597e5433b67a3bf793d3ce1e08 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <[email protected]> Date: Fri, 25 Oct 2019 13:37:14 +0200 Subject: [PATCH] Do not use PYCEXT, and rely on the installed file name@@ -15,29 +15,30 @@ To address this and keep things simple, this patch just changes the ln invocation to rely on the name of the _selinux*.so Python module that was installed. -[Upstream: https://github.com/SELinuxProject/selinux/pull/184] +Signed-off-by: Antoine Tenart <[email protected]> +[Refreshed for 3.1] Signed-off-by: Thomas Petazzoni <[email protected]> [Refreshed for 3.0] Signed-off-by: Adam Duskett <[email protected]> --- - libselinux/src/Makefile | 3 +-- + src/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 4b6a4d4..7b14ef1 100644 +index 190016e2af34..7ee22fd35da3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,7 +15,6 @@ INCLUDEDIR ?= $(PREFIX)/include PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX)) PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX)) PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(plat_specific=1, prefix='$(PREFIX)'))") --PYCEXT ?= $(shell $(PYTHON) -c 'import imp;print([s for s,m,t in imp.get_suffixes() if t == imp.C_EXTENSION][0])') +-PYCEXT ?= $(shell $(PYTHON) -c 'import importlib.machinery;print(importlib.machinery.EXTENSION_SUFFIXES[0])') RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]') RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]') RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') -@@ -175,7 +174,7 @@ install: all +@@ -176,7 +175,7 @@ install: all install-pywrap: pywrap - $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` + $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` $(PYTHON_SETUP_ARGS) install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py - ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) + ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux*.so $(DESTDIR)$(PYTHONLIBDIR)/@@ -45,5 +46,5 @@ index 4b6a4d4..7b14ef1 100644 install-rubywrap: rubywrap test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) -- -2.23.0 +2.26.2package/libselinux/0003-fix-building-against-musl-and-uclibc-libraries.patch deleted +0
-32@@ -1,32 +0,0 @@ -From 0f6cd4ef20639ac3b3e26af8f743ee03b5d6f8a4 Mon Sep 17 00:00:00 2001 -From: Adam Duskett <[email protected]> -Date: Wed, 11 Dec 2019 14:00:16 -0800 -Subject: [PATCH] Fix building against musl and uClibc libc libraries. - -Currently, the src/Makefile provides the FTS_LDLIBS when building against musl -or uClibc. However, this is missing from utils/Makefile, which causes linking -to fail. - -Add the FTS_LDLIBS variable to the LDLIBS variable in utils/Makefile to fix -compiling against uClibc and musl. - -Signed-off-by: Adam Duskett <[email protected]> - ---- - libselinux/utils/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/Makefile b/utils/Makefile -index 36150638..a5632b7c 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -45,7 +45,7 @@ endif - - override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) - override LDFLAGS += -L../src --override LDLIBS += -lselinux -+override LDLIBS += -lselinux $(FTS_LDLIBS) - PCRE_LDLIBS ?= -lpcre - - ifeq ($(ANDROID_HOST),y) -package/libselinux/libselinux.hash +1
-1@@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 2ea2b30f671dae9d6b1391cbe8fb2ce5d36a3ee4fb1cd3c32f0d933c31b82433 libselinux-3.0.tar.gz +sha256 ea5dcbb4d859e3f999c26a13c630da2f16dff9462e3cc8cb7b458ac157d112e7 libselinux-3.1.tar.gz # Hash for license file sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSEpackage/libselinux/libselinux.mk +2
-3@@ -4,8 +4,8 @@ # ################################################################################ -LIBSELINUX_VERSION = 3.0 -LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 +LIBSELINUX_VERSION = 3.1 +LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE --2.26.2
PATCH 4/9 package/policycoreutils: bump to 20200710
In reply to Antoine Tenart--- package/policycoreutils/policycoreutils.hash | 2 +- package/policycoreutils/policycoreutils.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
package/policycoreutils/policycoreutils.hash +1 -1
@@ -1,3 +1,3 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 3379c9bd722e36be9bf8856c6fa373bfa9b33305ac9da5fc807cfe7fa605f489 policycoreutils-3.0.tar.gz +sha256 c889f62ee80f8b6a369469a9b8af51f5b797975aeaa291f5c5960cc12eed1934 policycoreutils-3.1.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
package/policycoreutils/policycoreutils.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -POLICYCOREUTILS_VERSION = 3.0 -POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 +POLICYCOREUTILS_VERSION = 3.1 +POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 POLICYCOREUTILS_LICENSE = GPL-2.0 POLICYCOREUTILS_LICENSE_FILES = COPYING
Signature · 1 line
2.26.2
PATCH 5/9 package/checkpolicy: bump to 20200710
In reply to Antoine TenartPatch 0001-checkpolicy-remove-unused-te_assertions.patch is now part of the upstream release 20200710.
--- ...ckpolicy-remove-unused-te_assertions.patch | 45 ------------------- package/checkpolicy/checkpolicy.hash | 2 +- package/checkpolicy/checkpolicy.mk | 4 +- 3 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch
package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch deleted +0 -45
@@ -1,45 +0,0 @@ -From 4d330d0d3155211f119b3082f728ae42dcc01e96 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: https://github.com/SELinuxProject/selinux/commit/4d330d0d3155211f119b3082f728ae42dcc01e96#diff-daf264ea505347df0d59a3a97a07742e - -Signed-off-by: Ondrej Mosnacek <[email protected]> -Signed-off-by: Matthew Weber <[email protected]> ---- - checkpolicy.h | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/checkpolicy.h b/checkpolicy.h -index 3868f1fa..f127687e 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.17.1 -
package/checkpolicy/checkpolicy.hash +1 -1
@@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 c88c719a141dd5c1202d49c378c7f063349d630522d5e04dc6e0c53da81aa4f8 checkpolicy-3.0.tar.gz +sha256 dfc7707070520c93b14fbbdfdbe081364d806bf28e3e79e10318c2594c77bbb2 checkpolicy-3.1.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
package/checkpolicy/checkpolicy.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -CHECKPOLICY_VERSION = 3.0 -CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 +CHECKPOLICY_VERSION = 3.1 +CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = COPYING
Signature · 1 line
2.26.2
PATCH 6/9 package/restorecond: bump to 20200710
In reply to Antoine Tenart--- package/restorecond/restorecond.hash | 2 +- package/restorecond/restorecond.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
package/restorecond/restorecond.hash +1 -1
@@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 32a92c9f4bf48c613f9f467ced58d8c369eec8892239cd44d5d0e139b41926dc restorecond-3.0.tar.gz +sha256 82ca45099685a45d718f11f8859963c1ba83d98e510312cbf0b7dc5664c60ad0 restorecond-3.1.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
package/restorecond/restorecond.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -RESTORECOND_VERSION = 3.0 -RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 +RESTORECOND_VERSION = 3.1 +RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = COPYING
Signature · 1 line
2.26.2
PATCH 7/9 package/semodule-utils: bump to 20200710
In reply to Antoine Tenart--- package/semodule-utils/semodule-utils.hash | 2 +- package/semodule-utils/semodule-utils.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
package/semodule-utils/semodule-utils.hash +1 -1
@@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 14ee2db21f36766ffbbb65770f8e7236d21675db9f0f5d40f50974711da598cf semodule-utils-3.0.tar.gz +sha256 0cc37f9cec751d9c2abb5f2b228b060567e973cb47c19b53b8a4a7378baaa853 semodule-utils-3.1.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
package/semodule-utils/semodule-utils.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 3.0 -SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 +SEMODULE_UTILS_VERSION = 3.1 +SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = COPYING SEMODULE_UTILS_DEPENDENCIES = libsepol
Signature · 1 line
2.26.2
PATCH 8/9 package/selinux-python: bump to 20200710
In reply to Antoine Tenart--- package/selinux-python/selinux-python.hash | 2 +- package/selinux-python/selinux-python.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
package/selinux-python/selinux-python.hash +1 -1
@@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 43c08fa881ccc64251d396b1ac6c56b354bf98421b4ec937d54a8db190135494 selinux-python-3.0.tar.gz +sha256 f4d0a1a030bc291a6af498b26e0676b745075dd289a8ba16cdec86c3ea8f2f02 selinux-python-3.1.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
package/selinux-python/selinux-python.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 3.0 -SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204 +SELINUX_PYTHON_VERSION = 3.1 +SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/20200710 SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = COPYING SELINUX_PYTHON_DEPENDENCIES = python3
Signature · 1 line
2.26.2
PATCH 9/9 package/setools: bump to 4.3.0
In reply to Antoine Tenartsetools is no longer hosted on https://github.com/TresysTechnology/setools/.
Update the source location to its new home,
https://github.com/SELinuxProject/setools/.
Refresh patches 0001-remove-werror-flag-from-setup.patch and 0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch for 4.3.0 and remove patch 0003-setup.py-drop-path-prefix-from-man-install.patch that is now upstream.
Add a new dependency on host-python-cython, as setup.py now depends on it.
--- .../0001-remove-werror-flag-from-setup.patch | 16 ++-- ...e-setools.InfoFlowAnalysis-and-setoo.patch | 74 ++++++++++--------- ...py-drop-path-prefix-from-man-install.patch | 42 ----------- package/setools/setools.hash | 4 +- package/setools/setools.mk | 12 +-- 5 files changed, 54 insertions(+), 94 deletions(-) delete mode 100644 package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch
package/setools/0001-remove-werror-flag-from-setup.patch +9 -7
@@ -1,4 +1,4 @@ -From b2fe84bfd00117d4897f1f2e8f83d3410eb188b8 Mon Sep 17 00:00:00 2001 +From 8ab5a49247d870d92a8287db6134877ebf7a4379 Mon Sep 17 00:00:00 2001 From: Adam Duskett <[email protected]> Date: Thu, 12 Oct 2017 22:04:58 -0400 Subject: [PATCH] remove werror flag from setup
@@ -6,24 +6,26 @@ Subject: [PATCH] remove werror flag from setup Compilers older than gcc6 will generate uninitialized variable warnings which will cause compiling to fail. +Signed-off-by: Antoine Tenart <[email protected]> +[Refreshed for 4.3.0] Signed-off-by: Adam Duskett <[email protected]> --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 2ca44c9..9319bf6 100644 +index 457c83049ca5..4dcb30196abf 100644 --- a/setup.py +++ b/setup.py -@@ -146,7 +146,7 @@ ext_py_mods = [Extension('setools.policyrep._qpol', - 'libqpol/policy_scan.c', - 'libqpol/xen_query.c'], - include_dirs=include_dirs, +@@ -106,7 +106,7 @@ ext_py_mods = [Extension('setools.policyrep', ['setools/policyrep.pyx'], + libraries=['selinux', 'sepol'], + library_dirs=lib_dirs, + define_macros=macros, - extra_compile_args=['-Werror', '-Wextra', + extra_compile_args=['-Wextra', '-Waggregate-return', '-Wfloat-equal', '-Wformat', '-Wformat=2', -- -2.13.6 +2.26.2
package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch +38 -36
162 lines not on this page · raw message
package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch deleted +0 -42
42 lines not on this page · raw message
package/setools/setools.hash +1 -3
@@ -1,7 +1,5 @@ -# From https://github.com/TresysTechnology/setools3/wiki/Download -md5 d68d0d4e4da0f01da0f208782ff04b91 setools-4.1.1.tar.bz2 # Locally computed -sha256 46a927ea2b163cbe1d35cc35da43e45853e13720c7e02d4cf75a498783c19610 setools-4.1.1.tar.gz +sha256 da2c1d23edd24c4aa17d01d78e86c9e5fb5bf3aa38c71d5d63f41c750f6ef26c setools-4.3.0.tar.gz sha256 2f7547e10f76a382c24c053595f38a5cc6dda9347f508f254ca490e0046a9624 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
package/setools/setools.mk +6 -6
@@ -4,14 +4,14 @@ # ################################################################################ -SETOOLS_VERSION = 4.1.1 -SETOOLS_SITE = $(call github,TresysTechnology,setools,$(SETOOLS_VERSION)) -SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-flex host-swig +SETOOLS_VERSION = 4.3.0 +SETOOLS_SITE = $(call github,SELinuxProject,setools,$(SETOOLS_VERSION)) +SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-flex host-python-cython host-swig SETOOLS_INSTALL_STAGING = YES SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL SETOOLS_SETUP_TYPE = setuptools -HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol host-python-networkx +HOST_SETOOLS_DEPENDENCIES = host-python-cython host-libselinux host-libsepol host-python-networkx ifeq ($(BR2_PACKAGE_PYTHON3),y) SETOOLS_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
@@ -24,7 +24,7 @@ endif define SETOOLS_FIX_SETUP # By default, setup.py will look for libsepol.a in the host machines # /usr/lib directory. This needs to be changed to the staging directory. - $(SED) "s at base_lib_dirs =.*@base_lib_dirs = ['$(STAGING_DIR)/usr/lib']@g" \ + $(SED) "s at lib_dirs =.*@lib_dirs = ['$(STAGING_DIR)/usr/lib']@g" \ $(@D)/setup.py endef SETOOLS_POST_PATCH_HOOKS += SETOOLS_FIX_SETUP
@@ -32,7 +32,7 @@ SETOOLS_POST_PATCH_HOOKS += SETOOLS_FIX_SETUP define HOST_SETOOLS_FIX_SETUP # By default, setup.py will look for libsepol.a in the host machines # /usr/lib directory. This needs to be changed to the host directory. - $(SED) "s at base_lib_dirs =.*@base_lib_dirs = ['$(HOST_DIR)/lib']@g" \ + $(SED) "s at lib_dirs =.*@lib_dirs = ['$(HOST_DIR)/lib']@g" \ $(@D)/setup.py endef HOST_SETOOLS_POST_PATCH_HOOKS += HOST_SETOOLS_FIX_SETUP
Signature · 1 line
2.26.2
PATCH 9/9 package/setools: bump to 4.3.0
Hello,
+Adam who worked on setools
Quoted 9 lines · On Wed, 15 Jul 2020 15:07:40 +0200 Antoine Tenart <[email protected]>…
setools is no longer hosted on https://github.com/TresysTechnology/setools/.
Update the source location to its new home,
https://github.com/SELinuxProject/setools/.Refresh patches 0001-remove-werror-flag-from-setup.patch and 0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch for 4.3.0 and remove patch 0003-setup.py-drop-path-prefix-from-man-install.patch that is now upstream.
Quoted 4 lines
Add a new dependency on host-python-cython, as
setup.pynow depends on it.Signed-off-by Antoine Tenart <[email protected]>
Independently from your version bump, I think this package would probably warrant a further review as a few things look suspicious, or at least would be good to check if they are still needed after all the version bumps.
List of things that makes me a bit "meh":
- It would be good if we could get rid of the SETOOLS_FIX_SETUP / HOST_SETOOLS_FIX_SETUP macros by having an upstreamable solution to specify the path to the libraries via some setup.py argument.
- It is quite weird that the dependencies of the target and host variant are so different, even if we build them in exactly the same way. The target variant needs host-flex, host-bison and host-swig, but not the host variant ? The host variant needs host-python-networkx, but the target does not need python-networkx ? The target needs python-setuptools ? Why ?
- It would be nice to also find an upstream solution for the "apol" installation issue, where it gets installed even if python-pyqt5 is not available.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
cover selinux: bump to 20200710
In reply to Antoine TenartQuoted 10 lines · On Wed, 15 Jul 2020 15:07:31 +0200 Antoine Tenart <[email protected]>…
Antoine Tenart (9):
package/libsepol: bump to 20200710
package/libsemanage: bump to 20200710
package/libselinux: bump to 20200710
package/policycoreutils: bump to 20200710
package/checkpolicy: bump to 20200710
package/restorecond: bump to 20200710
package/semodule-utils: bump to 20200710
package/selinux-python: bump to 20200710
package/setools: bump to 4.3.0
Thanks. Series applied!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com