userspace: update core selinux userspace tools

Update to the latest stable release, 20140506.

Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Joe MacDonald 2014-09-28 22:34:09 -04:00
parent 981b184290
commit 713359e1b8
15 changed files with 63 additions and 1551 deletions

View File

@ -11,7 +11,7 @@ LICENSE = "GPLv2+"
DEPENDS += "libsepol libselinux bison-native flex-native"
SRC_URI += "file://checkpolicy-Do-not-link-against-libfl.patch"
#SRC_URI += "file://checkpolicy-Do-not-link-against-libfl.patch"
EXTRA_OEMAKE += "PREFIX=${D}"
EXTRA_OEMAKE += "LEX='flex'"

View File

@ -1,9 +0,0 @@
PR = "r99"
include selinux_20131030.inc
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
SRC_URI[md5sum] = "d76d5c70cd594fdb15f8d319c6536324"
SRC_URI[sha256sum] = "5d74075379cbaf17135c2a113a3053bd2e7b2a2c54ac04458de652457306c020"

View File

@ -0,0 +1,7 @@
include selinux_20140506.inc
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
SRC_URI[md5sum] = "920f1a048b6023a22e1bae7b40fd413c"
SRC_URI[sha256sum] = "8072c12121613ba943417bbb6d33224d12373ea19d75c5acd1846a35e0e05b74"

View File

@ -1,12 +1,10 @@
PR = "r99"
include selinux_20131030.inc
include selinux_20140506.inc
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0"
SRC_URI[md5sum] = "c13ea5de171f21fee399abfd4aef9481"
SRC_URI[sha256sum] = "cc8354d67d7bef11fb2a03d23e788c6f4e8510b6760c3778dc7baf6dcfa97539"
SRC_URI[md5sum] = "d27e249ad8450e7182203134cf4d85e2"
SRC_URI[sha256sum] = "03fe2baa7ceeea531a64fd321b44ecf09a55f3af5ef66a58a4135944f34e9851"
SRC_URI += "\
file://libselinux-drop-Wno-unused-but-set-variable.patch \

View File

@ -1,12 +1,10 @@
PR = "r99"
include selinux_20131030.inc
include selinux_20140506.inc
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
SRC_URI[md5sum] = "2bb8f4b728a5667519764297b7725c19"
SRC_URI[sha256sum] = "9b421ce1df10594cb467eef37faeb403d5c6b341a4b7e4b407ac4cb77df95cba"
SRC_URI[md5sum] = "cc313b400637d94e3a549bf77555d8c3"
SRC_URI[sha256sum] = "4c984379a98ee9f05b80ff6e57dd2de886273d7136146456cabdce21ac32ed7f"
SRC_URI += "\
file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \

View File

@ -1,9 +0,0 @@
PR = "r99"
include selinux_20131030.inc
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
SRC_URI[md5sum] = "2d43599ed29fea9ef41218ec9635ef64"
SRC_URI[sha256sum] = "fbd77459fd03979a9020289b10c89a0af56a52bcd0f7ae0a78455713bb04878b"

View File

@ -0,0 +1,7 @@
include selinux_20140506.inc
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
SRC_URI[md5sum] = "c6b3dc07bf19ab4f364f21bbecb44beb"
SRC_URI[sha256sum] = "5a4481bfd0fad6fdad1511c786d69de1fc3eddc28154eae1691e1bf4e9e505c3"

View File

@ -211,7 +211,7 @@ FILES_${PN}-setsebool += "\
FILES_system-config-selinux = " \
${bindir}/sepolgen \
${datadir}/system-config-selinux/* \
${datadir}/icons/hicolor/24x24/apps/system-config-selinux.png \
${datadir}/icons/hicolor/ \
${datadir}/polkit-1/actions/org.selinux.config.policy \
"

View File

@ -1,12 +1,10 @@
PR = "r99"
include selinux_20131030.inc
include selinux_20140506.inc
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
SRC_URI[md5sum] = "f330a90c566c8b564858d45399ce3dd1"
SRC_URI[sha256sum] = "3d2c8806742004693c2d4726abbc4f412340ee07bed407976dd8abeda09a4333"
SRC_URI[md5sum] = "4f5c508e3c3867c8beb343e993d353dd"
SRC_URI[sha256sum] = "11e8815ac13debb87897d2781381b89ec5c6c746a3d44223a493bc7ace6cc71f"
SRC_URI += "\
file://policycoreutils-fix-sepolicy-install-path.patch \

View File

@ -1,6 +1,6 @@
SRCREV = "edc2e99687b050d5be21a78a66d038aa1fc068d9"
SRC_URI = "git://oss.tresys.com/git/selinux.git;protocol=http"
SRC_URI = "git://github.com/SELinuxProject/selinux.git;protocol=http"
include selinux_common.inc

View File

@ -1,6 +1,4 @@
PR = "r99"
include selinux_20131030.inc
include selinux_20140506.inc
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"

View File

@ -0,0 +1,34 @@
From 74680dfb3df4c0c5b0e4bcf41717a9ea16fd8680 Mon Sep 17 00:00:00 2001
From: Joe MacDonald <joe_macdonald@mentor.com>
Date: Mon, 29 Sep 2014 14:19:48 -0400
Subject: [PATCH] replcon: correct invalid prototype for lsetfilecon_raw
Port debian patch from:
git://anonscm.debian.org/selinux/setools.git
commit a3ab84b35efd9c42641d53ec2236ad01f7411df7
Upstream-Status: Denied [ the setools3 tree is in stasis and the focus is
only on setools4 now ]
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
---
secmds/replcon.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/secmds/replcon.cc b/secmds/replcon.cc
index 34f7c1a..307c39f 100644
--- a/secmds/replcon.cc
+++ b/secmds/replcon.cc
@@ -60,7 +60,7 @@ static struct option const longopts[] = {
{NULL, 0, NULL, 0}
};
-extern int lsetfilecon_raw(const char *, security_context_t) __attribute__ ((weak));
+extern int lsetfilecon_raw(const char *, const char *) __attribute__ ((weak));
/**
* As that setools must work with older libselinux versions that may
--
1.9.1

View File

@ -14,7 +14,6 @@ SRC_URI[sha256sum] = "44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e3
SRC_URI += "file://setools-neverallow-rules-all-always-fail.patch"
SRC_URI += "file://setools-Fix-sepol-calls-to-work-with-latest-libsepol.patch"
#SRC_URI += "file://setools-Changes-to-support-named-file_trans-rules.patch"
SRC_URI += "file://setools-Don-t-check-selinux-policies-if-disabled.patch"
SRC_URI += "file://setools-configure-ac.patch"
@ -23,6 +22,8 @@ SRC_URI += "file://setools-cross-ar.patch"
SRC_URI += "file://setools-Fix-test-bug-for-unary-operator.patch"
SRC_URI += "file://setools-Fix-python-setools-Makefile.am-for-cross.patch"
SRC_URI += "file://setools-replcon-correct-invalid-prototype-for-lsetfilecon_ra.patch"
LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=26035c503c68ae1098177934ac0cc795 \
file://${S}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \
file://${S}/COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24"