From patchwork Wed Jul 15 13:07:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 1329497 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6Hmw5sZzz9sTN for ; Wed, 15 Jul 2020 23:10:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 74E4923265; Wed, 15 Jul 2020 13:10:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WgNCV+V14t-Q; Wed, 15 Jul 2020 13:10:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 16475230F6; Wed, 15 Jul 2020 13:10:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 964391BF983 for ; Wed, 15 Jul 2020 13:10:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8F2CB20487 for ; Wed, 15 Jul 2020 13:10:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aBlDr3wKiOHH for ; Wed, 15 Jul 2020 13:10:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by silver.osuosl.org (Postfix) with ESMTPS id 0B77A2041F for ; Wed, 15 Jul 2020 13:10:05 +0000 (UTC) X-Originating-IP: 90.76.143.236 Received: from localhost (lfbn-tou-1-1075-236.w90-76.abo.wanadoo.fr [90.76.143.236]) (Authenticated sender: antoine.tenart@bootlin.com) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id F088A4000B; Wed, 15 Jul 2020 13:10:01 +0000 (UTC) From: Antoine Tenart To: buildroot@buildroot.org Date: Wed, 15 Jul 2020 15:07:32 +0200 Message-Id: <20200715130740.775804-2-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200715130740.775804-1-antoine.tenart@bootlin.com> References: <20200715130740.775804-1-antoine.tenart@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/9] package/libsepol: bump to 20200710 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.weber@rockwellcollins.com, thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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. Signed-off-by: Antoine Tenart --- ...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 diff --git a/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch b/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch deleted file mode 100644 index 6876751ee0b3..000000000000 --- a/package/libsepol/0002-libsepol-fix-CIL_KEY_-build-errors-with-fno-common.patch +++ /dev/null @@ -1,528 +0,0 @@ -From a96e8c59ecac84096d870b42701a504791a8cc8c Mon Sep 17 00:00:00 2001 -From: Ondrej Mosnacek -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 -Signed-off-by: Matt Weber ---- - 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 - diff --git a/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch b/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch deleted file mode 100644 index a1b016121fc2..000000000000 --- a/package/libsepol/0003-libsepol-remove-leftovers-of-cil_mem_error_handler.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 3d32fc24d6aff360a538c63dad08ca5c957551b0 Mon Sep 17 00:00:00 2001 -From: Ondrej Mosnacek -Date: Thu, 23 Jan 2020 13:57:14 +0100 -Subject: [PATCH] libsepol: remove leftovers of cil_mem_error_handler - -Commit 4459d635b8f1 ("libsepol: Remove cil_mem_error_handler() function -pointer") replaced cil_mem_error_handler usage with inline contents of -the default handler. However, it left over the header declaration and -two callers. Convert these as well and remove the header declaration. - -This also fixes a build failure with -fno-common. - -Upstream: https://github.com/SELinuxProject/selinux/commit/3d32fc24d6aff360a538c63dad08ca5c957551b0 - -Fixes: 4459d635b8f1 ("libsepol: Remove cil_mem_error_handler() function pointer") -Signed-off-by: Ondrej Mosnacek -Signed-off-by: Matt Weber ---- - cil/src/cil_mem.h | 1 - - cil/src/cil_strpool.c | 8 ++++---- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/cil/src/cil_mem.h b/cil/src/cil_mem.h -index 902ce131..794f02a3 100644 ---- a/cil/src/cil_mem.h -+++ b/cil/src/cil_mem.h -@@ -36,7 +36,6 @@ void *cil_calloc(size_t num_elements, size_t element_size); - void *cil_realloc(void *ptr, size_t size); - char *cil_strdup(const char *str); - int cil_asprintf(char **strp, const char *fmt, ...); --void (*cil_mem_error_handler)(void); - - #endif /* CIL_MEM_H_ */ - -diff --git a/cil/src/cil_strpool.c b/cil/src/cil_strpool.c -index 97d4c4b9..2598bbf3 100644 ---- a/cil/src/cil_strpool.c -+++ b/cil/src/cil_strpool.c -@@ -80,8 +80,8 @@ char *cil_strpool_add(const char *str) - int rc = hashtab_insert(cil_strpool_tab, (hashtab_key_t)strpool_ref->str, strpool_ref); - if (rc != SEPOL_OK) { - pthread_mutex_unlock(&cil_strpool_mutex); -- (*cil_mem_error_handler)(); -- pthread_mutex_lock(&cil_strpool_mutex); -+ cil_log(CIL_ERR, "Failed to allocate memory\n"); -+ exit(1); - } - } - -@@ -104,8 +104,8 @@ void cil_strpool_init(void) - cil_strpool_tab = hashtab_create(cil_strpool_hash, cil_strpool_compare, CIL_STRPOOL_TABLE_SIZE); - if (cil_strpool_tab == NULL) { - pthread_mutex_unlock(&cil_strpool_mutex); -- (*cil_mem_error_handler)(); -- return; -+ cil_log(CIL_ERR, "Failed to allocate memory\n"); -+ exit(1); - } - } - cil_strpool_readers++; --- -2.17.1 - diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index a43d387a4f45..1759d3ba04b9 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -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 diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 2d64c53bc3c6..7d8b7b206381 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -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 From patchwork Wed Jul 15 13:07:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 1329494 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6Hmn0CVCz9sTN for ; Wed, 15 Jul 2020 23:10:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4FD588B473; Wed, 15 Jul 2020 13:10:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RkZXIH+DgD6u; Wed, 15 Jul 2020 13:10:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1FB008B474; Wed, 15 Jul 2020 13:10:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 3595C1BF983 for ; Wed, 15 Jul 2020 13:10:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2D98820488 for ; Wed, 15 Jul 2020 13:10:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t2NKAAoJe6Fo for ; Wed, 15 Jul 2020 13:10:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by silver.osuosl.org (Postfix) with ESMTPS id 8893720487 for ; Wed, 15 Jul 2020 13:10:06 +0000 (UTC) X-Originating-IP: 90.76.143.236 Received: from localhost (lfbn-tou-1-1075-236.w90-76.abo.wanadoo.fr [90.76.143.236]) (Authenticated sender: antoine.tenart@bootlin.com) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id DC48D1C0015; Wed, 15 Jul 2020 13:10:02 +0000 (UTC) From: Antoine Tenart To: buildroot@buildroot.org Date: Wed, 15 Jul 2020 15:07:33 +0200 Message-Id: <20200715130740.775804-3-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200715130740.775804-1-antoine.tenart@bootlin.com> References: <20200715130740.775804-1-antoine.tenart@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/9] package/libsemanage: bump to 20200710 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.weber@rockwellcollins.com, thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Antoine Tenart --- package/libsemanage/libsemanage.hash | 2 +- package/libsemanage/libsemanage.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index 85dafeb44dd5..a977ddabc6d5 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -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 diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index deba5fafcdfd..3ea0603f53b4 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -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 From patchwork Wed Jul 15 13:07:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 1329495 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6Hmn4WCZz9sTQ for ; Wed, 15 Jul 2020 23:10:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 817D12291C; Wed, 15 Jul 2020 13:10:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0eTSVX2rBA15; Wed, 15 Jul 2020 13:10:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8148020488; Wed, 15 Jul 2020 13:10:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 02E0D1BF3F4 for ; Wed, 15 Jul 2020 13:10:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id F40FF89558 for ; Wed, 15 Jul 2020 13:10:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id njudDp6Lgd1I for ; Wed, 15 Jul 2020 13:10:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 51F0B89688 for ; Wed, 15 Jul 2020 13:10:07 +0000 (UTC) Received: from localhost (lfbn-tou-1-1075-236.w90-76.abo.wanadoo.fr [90.76.143.236]) (Authenticated sender: antoine.tenart@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 05C6A240003; Wed, 15 Jul 2020 13:10:03 +0000 (UTC) From: Antoine Tenart To: buildroot@buildroot.org Date: Wed, 15 Jul 2020 15:07:34 +0200 Message-Id: <20200715130740.775804-4-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200715130740.775804-1-antoine.tenart@bootlin.com> References: <20200715130740.775804-1-antoine.tenart@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/9] package/libselinux: bump to 20200710 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.weber@rockwellcollins.com, thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Reviewed-by: Matthew Weber --- ...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 diff --git a/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch b/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch index ed0519710527..cbd98a61ad51 100644 --- a/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch +++ b/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch @@ -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 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 +[Refreshed for 3.1] Signed-off-by: Thomas Petazzoni [Refreshed for 3.0] Signed-off-by: Adam Duskett --- - 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 diff --git a/package/libselinux/0003-fix-building-against-musl-and-uclibc-libraries.patch b/package/libselinux/0003-fix-building-against-musl-and-uclibc-libraries.patch deleted file mode 100644 index 1880c8f69269..000000000000 --- a/package/libselinux/0003-fix-building-against-musl-and-uclibc-libraries.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0f6cd4ef20639ac3b3e26af8f743ee03b5d6f8a4 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -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 - ---- - 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) - diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index d1b421048381..1101b4050133 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -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 diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index d0e7b66241f0..f7397141d588 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -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 From patchwork Wed Jul 15 13:07:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 1329493 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6Hmj2WKZz9sTN for ; Wed, 15 Jul 2020 23:10:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C80328AE03; Wed, 15 Jul 2020 13:10:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gR+2gxv6cUhY; Wed, 15 Jul 2020 13:10:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 52ED48AE05; Wed, 15 Jul 2020 13:10:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 4F7951BF3F4 for ; Wed, 15 Jul 2020 13:10:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4C48B8964D for ; Wed, 15 Jul 2020 13:10:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yQXymDsXhQDs for ; Wed, 15 Jul 2020 13:10:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by fraxinus.osuosl.org (Postfix) with ESMTPS id BFAC589558 for ; Wed, 15 Jul 2020 13:10:06 +0000 (UTC) X-Originating-IP: 90.76.143.236 Received: from localhost (lfbn-tou-1-1075-236.w90-76.abo.wanadoo.fr [90.76.143.236]) (Authenticated sender: antoine.tenart@bootlin.com) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id EA9651C000E; Wed, 15 Jul 2020 13:10:04 +0000 (UTC) From: Antoine Tenart To: buildroot@buildroot.org Date: Wed, 15 Jul 2020 15:07:35 +0200 Message-Id: <20200715130740.775804-5-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200715130740.775804-1-antoine.tenart@bootlin.com> References: <20200715130740.775804-1-antoine.tenart@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/9] package/policycoreutils: bump to 20200710 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.weber@rockwellcollins.com, thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Antoine Tenart --- package/policycoreutils/policycoreutils.hash | 2 +- package/policycoreutils/policycoreutils.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/policycoreutils/policycoreutils.hash b/package/policycoreutils/policycoreutils.hash index 206d2e35a721..5dae18f17d51 100644 --- a/package/policycoreutils/policycoreutils.hash +++ b/package/policycoreutils/policycoreutils.hash @@ -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 diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index a06c7847abc0..4c0fdc71a717 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -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 From patchwork Wed Jul 15 13:07:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 1329503 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6Hn93DSQz9sTX for ; Wed, 15 Jul 2020 23:10:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D7F3D23358; Wed, 15 Jul 2020 13:10:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dsKN9MkAOlc8; Wed, 15 Jul 2020 13:10:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0148C2324E; Wed, 15 Jul 2020 13:10:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A9D5E1BF3F4 for ; Wed, 15 Jul 2020 13:10:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9BE032041F for ; Wed, 15 Jul 2020 13:10:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hdy3wfNAsrQH for ; Wed, 15 Jul 2020 13:10:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by silver.osuosl.org (Postfix) with ESMTPS id BA1ED22274 for ; Wed, 15 Jul 2020 13:10:07 +0000 (UTC) Received: from localhost (lfbn-tou-1-1075-236.w90-76.abo.wanadoo.fr [90.76.143.236]) (Authenticated sender: antoine.tenart@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id AE36B240008; Wed, 15 Jul 2020 13:10:05 +0000 (UTC) From: Antoine Tenart To: buildroot@buildroot.org Date: Wed, 15 Jul 2020 15:07:36 +0200 Message-Id: <20200715130740.775804-6-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200715130740.775804-1-antoine.tenart@bootlin.com> References: <20200715130740.775804-1-antoine.tenart@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 5/9] package/checkpolicy: bump to 20200710 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.weber@rockwellcollins.com, thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Patch 0001-checkpolicy-remove-unused-te_assertions.patch is now part of the upstream release 20200710. Signed-off-by: Antoine Tenart --- ...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 diff --git a/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch b/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch deleted file mode 100644 index 0c4ffcbf8749..000000000000 --- a/package/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4d330d0d3155211f119b3082f728ae42dcc01e96 Mon Sep 17 00:00:00 2001 -From: Ondrej Mosnacek -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 -Signed-off-by: Matthew Weber ---- - 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 -- --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 - diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index 264e21b8f3a3..55f4f09f76a1 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -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 diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index 3b055df4897a..86eaffccb1ac 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -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 From patchwork Wed Jul 15 13:07:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 1329502 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6Hn910Tlz9sTQ for ; Wed, 15 Jul 2020 23:10:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7E0FA896C9; Wed, 15 Jul 2020 13:10:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EW9Qa3Ukb9KS; Wed, 15 Jul 2020 13:10:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 45446896A6; Wed, 15 Jul 2020 13:10:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id EFE721BF3F4 for ; Wed, 15 Jul 2020 13:10:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DDBF3228EB for ; Wed, 15 Jul 2020 13:10:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W7aEGFSXqI1u for ; Wed, 15 Jul 2020 13:10:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by silver.osuosl.org (Postfix) with ESMTPS id E586F2041F for ; Wed, 15 Jul 2020 13:10:11 +0000 (UTC) X-Originating-IP: 90.76.143.236 Received: from localhost (lfbn-tou-1-1075-236.w90-76.abo.wanadoo.fr [90.76.143.236]) (Authenticated sender: antoine.tenart@bootlin.com) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id D49E1C001B; Wed, 15 Jul 2020 13:10:09 +0000 (UTC) From: Antoine Tenart To: buildroot@buildroot.org Date: Wed, 15 Jul 2020 15:07:37 +0200 Message-Id: <20200715130740.775804-7-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200715130740.775804-1-antoine.tenart@bootlin.com> References: <20200715130740.775804-1-antoine.tenart@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 6/9] package/restorecond: bump to 20200710 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.weber@rockwellcollins.com, thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Antoine Tenart --- package/restorecond/restorecond.hash | 2 +- package/restorecond/restorecond.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash index 7532bbf05487..e30e62a8128b 100644 --- a/package/restorecond/restorecond.hash +++ b/package/restorecond/restorecond.hash @@ -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 diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index 0cf0ec35e9c5..7ab7e978ddce 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -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 From patchwork Wed Jul 15 13:07:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 1329496 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6Hmt0jY8z9sTQ for ; Wed, 15 Jul 2020 23:10:21 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9B6778968D; Wed, 15 Jul 2020 13:10:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JVaqQ963tI6l; Wed, 15 Jul 2020 13:10:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2D1108955E; Wed, 15 Jul 2020 13:10:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8B8B31BF3F4 for ; Wed, 15 Jul 2020 13:10:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8897B89558 for ; Wed, 15 Jul 2020 13:10:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 21L8JH57bLUg for ; Wed, 15 Jul 2020 13:10:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by fraxinus.osuosl.org (Postfix) with ESMTPS id CEE2D8964D for ; Wed, 15 Jul 2020 13:10:08 +0000 (UTC) Received: from localhost (lfbn-tou-1-1075-236.w90-76.abo.wanadoo.fr [90.76.143.236]) (Authenticated sender: antoine.tenart@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 1786624000F; Wed, 15 Jul 2020 13:10:06 +0000 (UTC) From: Antoine Tenart To: buildroot@buildroot.org Date: Wed, 15 Jul 2020 15:07:38 +0200 Message-Id: <20200715130740.775804-8-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200715130740.775804-1-antoine.tenart@bootlin.com> References: <20200715130740.775804-1-antoine.tenart@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 7/9] package/semodule-utils: bump to 20200710 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.weber@rockwellcollins.com, thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Antoine Tenart --- package/semodule-utils/semodule-utils.hash | 2 +- package/semodule-utils/semodule-utils.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/semodule-utils/semodule-utils.hash b/package/semodule-utils/semodule-utils.hash index c1a4ef1b9bde..d015205d53f8 100644 --- a/package/semodule-utils/semodule-utils.hash +++ b/package/semodule-utils/semodule-utils.hash @@ -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 diff --git a/package/semodule-utils/semodule-utils.mk b/package/semodule-utils/semodule-utils.mk index ec1759ece13a..c89f28d60efe 100644 --- a/package/semodule-utils/semodule-utils.mk +++ b/package/semodule-utils/semodule-utils.mk @@ -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 From patchwork Wed Jul 15 13:07:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 1329499 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6Hn45VLmz9sTN for ; Wed, 15 Jul 2020 23:10:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0599F896BC; Wed, 15 Jul 2020 13:10:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lZGeEFPjWEx8; Wed, 15 Jul 2020 13:10:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4E388896A0; Wed, 15 Jul 2020 13:10:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B0A0B1BF3F4 for ; Wed, 15 Jul 2020 13:10:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AD98F8B473 for ; Wed, 15 Jul 2020 13:10:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xcC7KJHFbiCd for ; Wed, 15 Jul 2020 13:10:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0053C8B472 for ; Wed, 15 Jul 2020 13:10:11 +0000 (UTC) X-Originating-IP: 90.76.143.236 Received: from localhost (lfbn-tou-1-1075-236.w90-76.abo.wanadoo.fr [90.76.143.236]) (Authenticated sender: antoine.tenart@bootlin.com) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 0894AC000B; Wed, 15 Jul 2020 13:10:07 +0000 (UTC) From: Antoine Tenart To: buildroot@buildroot.org Date: Wed, 15 Jul 2020 15:07:39 +0200 Message-Id: <20200715130740.775804-9-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200715130740.775804-1-antoine.tenart@bootlin.com> References: <20200715130740.775804-1-antoine.tenart@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 8/9] package/selinux-python: bump to 20200710 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.weber@rockwellcollins.com, thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Antoine Tenart --- package/selinux-python/selinux-python.hash | 2 +- package/selinux-python/selinux-python.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash index 8fb72423e850..f896168f7ace 100644 --- a/package/selinux-python/selinux-python.hash +++ b/package/selinux-python/selinux-python.hash @@ -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 diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index d6c32317868f..3b1e15bdf88c 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -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 From patchwork Wed Jul 15 13:07:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 1329498 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6Hn01B8Rz9sTN for ; Wed, 15 Jul 2020 23:10:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AC60989699; Wed, 15 Jul 2020 13:10:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R7SdODVRSKWd; Wed, 15 Jul 2020 13:10:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4B3F18969B; Wed, 15 Jul 2020 13:10:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 5FEF81BF3F4 for ; Wed, 15 Jul 2020 13:10:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5CE328955E for ; Wed, 15 Jul 2020 13:10:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qjj7cSrhnpMd for ; Wed, 15 Jul 2020 13:10:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B913689558 for ; Wed, 15 Jul 2020 13:10:10 +0000 (UTC) Received: from localhost (lfbn-tou-1-1075-236.w90-76.abo.wanadoo.fr [90.76.143.236]) (Authenticated sender: antoine.tenart@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id DADEF24000E; Wed, 15 Jul 2020 13:10:08 +0000 (UTC) From: Antoine Tenart To: buildroot@buildroot.org Date: Wed, 15 Jul 2020 15:07:40 +0200 Message-Id: <20200715130740.775804-10-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200715130740.775804-1-antoine.tenart@bootlin.com> References: <20200715130740.775804-1-antoine.tenart@bootlin.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 9/9] package/setools: bump to 4.3.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.weber@rockwellcollins.com, thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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. Add a new dependency on host-python-cython, as setup.py now depends on it. Signed-off-by: Antoine Tenart --- .../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 diff --git a/package/setools/0001-remove-werror-flag-from-setup.patch b/package/setools/0001-remove-werror-flag-from-setup.patch index 4f6d2efb966c..0ab4006661f7 100644 --- a/package/setools/0001-remove-werror-flag-from-setup.patch +++ b/package/setools/0001-remove-werror-flag-from-setup.patch @@ -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 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 +[Refreshed for 4.3.0] Signed-off-by: Adam Duskett --- 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 diff --git a/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch b/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch index 508087ff2c3f..f9519a07903e 100644 --- a/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch +++ b/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch @@ -1,4 +1,4 @@ -From 2512c3ba608077db3a5e0286b976fadc8a04a5c4 Mon Sep 17 00:00:00 2001 +From ae84e5ef59bb24d5b8fd17e6756952f42c2d5c36 Mon Sep 17 00:00:00 2001 From: rpm-build Date: Thu, 23 Feb 2017 08:17:07 +0100 Subject: [PATCH] Do not export/use setools.InfoFlowAnalysis and @@ -12,30 +12,32 @@ Therefore it's better to use setools.infoflow.InfoFlowAnalysis and setools.dta.DomainTransitionAnalysis and let the package containing sedta and seinfoflow to require python3-networkx +Signed-off-by: Antoine Tenart +[Refreshed for 4.3.0] Signed-off-by: Adam Duskett --- sedta | 3 ++- - seinfoflow | 3 ++- + seinfoflow | 5 +++-- setools/__init__.py | 4 ++-- setoolsgui/apol/dta.py | 2 +- setoolsgui/apol/infoflow.py | 2 +- - tests/dta.py | 3 ++- - tests/infoflow.py | 3 ++- - 7 files changed, 12 insertions(+), 8 deletions(-) + tests/dta.py | 2 +- + tests/infoflow.py | 2 +- + 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/sedta b/sedta -index 1c76ebb..255ad49 100755 +index 60861ca630a5..0056172a55e5 100755 --- a/sedta +++ b/sedta -@@ -23,6 +23,7 @@ import argparse - import logging +@@ -23,6 +23,7 @@ import logging + import signal import setools +import setools.dta def print_transition(trans): -@@ -111,7 +112,7 @@ else: +@@ -114,7 +115,7 @@ else: try: p = setools.SELinuxPolicy(args.policy) @@ -45,31 +47,33 @@ index 1c76ebb..255ad49 100755 if args.shortest_path or args.all_paths: if args.shortest_path: diff --git a/seinfoflow b/seinfoflow -index b287921..d53bdef 100755 +index f10c39de4d8e..fe733bbd0787 100755 --- a/seinfoflow +++ b/seinfoflow -@@ -19,6 +19,7 @@ +@@ -18,6 +18,7 @@ + # - from __future__ import print_function import setools +import setools.infoflow import argparse import sys import logging -@@ -79,7 +80,7 @@ else: +@@ -101,8 +102,8 @@ elif args.booleans is not None: try: p = setools.SELinuxPolicy(args.policy) m = setools.PermissionMap(args.map) -- g = setools.InfoFlowAnalysis(p, m, min_weight=args.min_weight, exclude=args.exclude) -+ g = setools.infoflow.InfoFlowAnalysis(p, m, min_weight=args.min_weight, exclude=args.exclude) +- g = setools.InfoFlowAnalysis(p, m, min_weight=args.min_weight, exclude=args.exclude, +- booleans=booleans) ++ g = setools.infoflow.InfoFlowAnalysis(p, m, min_weight=args.min_weight, exclude=args.exclude, ++ booleans=booleans) if args.shortest_path or args.all_paths: if args.shortest_path: diff --git a/setools/__init__.py b/setools/__init__.py -index a84c846..a53c5a7 100644 +index 26fa5aa34a19..9e9058a6bf90 100644 --- a/setools/__init__.py +++ b/setools/__init__.py -@@ -74,11 +74,11 @@ from .pcideviceconquery import PcideviceconQuery +@@ -75,11 +75,11 @@ from .pcideviceconquery import PcideviceconQuery from .devicetreeconquery import DevicetreeconQuery # Information Flow Analysis @@ -84,59 +88,57 @@ index a84c846..a53c5a7 100644 # Policy difference from .diff import PolicyDifference diff --git a/setoolsgui/apol/dta.py b/setoolsgui/apol/dta.py -index 0aaf13f..5b1ea20 100644 +index 4608b9dbf34e..2cde44c142e9 100644 --- a/setoolsgui/apol/dta.py +++ b/setoolsgui/apol/dta.py @@ -23,7 +23,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread from PyQt5.QtGui import QPalette, QTextCursor from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \ - QTreeWidgetItem + QTreeWidgetItem -from setools import DomainTransitionAnalysis +from setools.dta import DomainTransitionAnalysis from ..logtosignal import LogHandlerToSignal from .analysistab import AnalysisTab diff --git a/setoolsgui/apol/infoflow.py b/setoolsgui/apol/infoflow.py -index 1ae16de..fdf8f7b 100644 +index 7bca299d23fc..7fee2778f35f 100644 --- a/setoolsgui/apol/infoflow.py +++ b/setoolsgui/apol/infoflow.py -@@ -25,7 +25,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread +@@ -26,7 +26,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread from PyQt5.QtGui import QPalette, QTextCursor from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \ - QTreeWidgetItem + QTreeWidgetItem -from setools import InfoFlowAnalysis +from setools.infoflow import InfoFlowAnalysis from setools.exception import UnmappedClass, UnmappedPermission from ..logtosignal import LogHandlerToSignal diff --git a/tests/dta.py b/tests/dta.py -index 32b9271..2bdd052 100644 +index a0cc9381469c..177e6fb0b961 100644 --- a/tests/dta.py +++ b/tests/dta.py -@@ -17,7 +17,8 @@ - # +@@ -18,7 +18,7 @@ + import os import unittest --from setools import SELinuxPolicy, DomainTransitionAnalysis -+from setools import SELinuxPolicy +-from setools import DomainTransitionAnalysis +from setools.dta import DomainTransitionAnalysis from setools import TERuletype as TERT - from setools.policyrep.exception import InvalidType - from setools.policyrep.typeattr import Type + from setools.exception import InvalidType + from setools.policyrep import Type diff --git a/tests/infoflow.py b/tests/infoflow.py -index 7751dda..a21c683 100644 +index aa0e44a7e4f8..fca2848aeca5 100644 --- a/tests/infoflow.py +++ b/tests/infoflow.py -@@ -17,7 +17,8 @@ - # +@@ -18,7 +18,7 @@ + import os import unittest --from setools import SELinuxPolicy, InfoFlowAnalysis -+from setools import SELinuxPolicy +-from setools import InfoFlowAnalysis +from setools.infoflow import InfoFlowAnalysis from setools import TERuletype as TERT + from setools.exception import InvalidType from setools.permmap import PermissionMap - from setools.policyrep.exception import InvalidType -- -2.9.3 +2.26.2 diff --git a/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch b/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch deleted file mode 100644 index 63344506b216..000000000000 --- a/package/setools/0003-setup.py-drop-path-prefix-from-man-install.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bc36cba1393120e65bfe4d0f642fd8d38010c0f7 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Wed, 28 Nov 2018 20:49:00 -0600 -Subject: [PATCH] setup.py: drop path prefix from man install - -If the directory is a relative path, it is interpreted relative to the -installation prefix (Python's sys.prefix for pure-Python packages, -sys.exec_prefix for packages that contain extension modules). -So the sys.prefix should not be joined because the correct one will be -added regardless. The reason why a relative path is going to work is -because the installation path is built internally joining python root -with python prefix, thus forming the correct path $(TARGET_DIR)/usr. -(https://docs.python.org/3/distutils/setupscript.html#installing-additional-files) - -For this man file install scenario, joining the sys.prefix makes the -path absolute (this was previously working by accident). - -Upstream: https://github.com/SELinuxProject/setools/pull/13/commits/bc36cba1393120e65bfe4d0f642fd8d38010c0f7 - -Cc: Angelo Compagnucci -Cc: Arnout Vandecappelle -Signed-off-by: Matthew Weber ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 3767fbc..80e0400 100644 ---- a/setup.py -+++ b/setup.py -@@ -136,7 +136,7 @@ setup(name='setools', - cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand}, - packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'], - scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'], -- data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))], -+ data_files=[('share/man/man1', glob.glob("man/*.1"))], - package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']}, - ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'], - annotate=cython_annotate, --- -1.9.1 - diff --git a/package/setools/setools.hash b/package/setools/setools.hash index 872929706406..689b20a3570c 100644 --- a/package/setools/setools.hash +++ b/package/setools/setools.hash @@ -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 diff --git a/package/setools/setools.mk b/package/setools/setools.mk index 63ca3651e878..fc49fc218e6b 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -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@base_lib_dirs =.*@base_lib_dirs = ['$(STAGING_DIR)/usr/lib']@g" \ + $(SED) "s@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@base_lib_dirs =.*@base_lib_dirs = ['$(HOST_DIR)/lib']@g" \ + $(SED) "s@lib_dirs =.*@lib_dirs = ['$(HOST_DIR)/lib']@g" \ $(@D)/setup.py endef HOST_SETOOLS_POST_PATCH_HOOKS += HOST_SETOOLS_FIX_SETUP