Update toolstack to 2.4 release dated 2015-02-02.
cover Update toolstack to 2.4 release dated 2015-02-02.
Update toolstack to 2.4 release dated 2015-02-02. Backport patches to setools for compatibility with new toolstack. Update refpolicy recipe to cope with new policy CIL.
Philip Tricca (8):
Add common files for 20150202 SELinux userspace release.
libsepol: Bump version to 2.4.
libselinux: Bump version to 2.4.
checkpolicy: Bump version to 2.4.
libsemanage: Bump version to 2.4.
policycoreutuils: Bump version to 2.4.
setools: Add patch to support 2.4 toolstack.
refpolicy: Update policy install and bootstrap process for CIL.
recipes-security/refpolicy/refpolicy_common.inc | 40 +++++--- recipes-security/selinux/checkpolicy_2.3.bb | 7 -- recipes-security/selinux/checkpolicy_2.4.bb | 7 ++ recipes-security/selinux/libselinux_2.3.bb | 15 --- recipes-security/selinux/libselinux_2.4.bb | 15 +++ ...anage-disable-expand-check-on-policy-load.patch | 20 ++-- recipes-security/selinux/libsemanage_2.3.bb | 17 --- recipes-security/selinux/libsemanage_2.4.bb | 18 ++++ recipes-security/selinux/libsepol_2.3.bb | 7 -- recipes-security/selinux/libsepol_2.4.bb | 7 ++ recipes-security/selinux/policycoreutils.inc | 11 +- .../policycoreutils-pp-builtin-roles.patch | 70 +++++++++++++ recipes-security/selinux/policycoreutils_2.3.bb | 19 ---- recipes-security/selinux/policycoreutils_2.4.bb | 20 ++++ recipes-security/selinux/selinux_20150202.inc | 5 + ...s-Update-for-2015-02-02-Userspace-release.patch | 114 +++++++++++++++++++++ ...rect-invalid-prototype-for-lsetfilecon_ra.patch | 34 ------ recipes-security/setools/setools_3.3.8.bb | 2 +- 18 files changed, 301 insertions(+), 127 deletions(-) delete mode 100644 recipes-security/selinux/checkpolicy_2.3.bb create mode 100644 recipes-security/selinux/checkpolicy_2.4.bb delete mode 100644 recipes-security/selinux/libselinux_2.3.bb create mode 100644 recipes-security/selinux/libselinux_2.4.bb delete mode 100644 recipes-security/selinux/libsemanage_2.3.bb create mode 100644 recipes-security/selinux/libsemanage_2.4.bb delete mode 100644 recipes-security/selinux/libsepol_2.3.bb create mode 100644 recipes-security/selinux/libsepol_2.4.bb create mode 100644 recipes-security/selinux/policycoreutils/policycoreutils-pp-builtin-roles.patch delete mode 100644 recipes-security/selinux/policycoreutils_2.3.bb create mode 100644 recipes-security/selinux/policycoreutils_2.4.bb create mode 100644 recipes-security/selinux/selinux_20150202.inc create mode 100644 recipes-security/setools/setools/setools-Update-for-2015-02-02-Userspace-release.patch delete mode 100644 recipes-security/setools/setools/setools-replcon-correct-invalid-prototype-for-lsetfilecon_ra.patch
Signature · 1 line
2.1.4
PATCH 1/8 Add common files for 20150202 SELinux userspace release.
Note the change in the URL from the last release. We were pulling source tarballs generated by GitHub as part of its reponse to the addition of tags. The SELinux project maintains their own releases on the wiki at:
https://github.com/SELinuxProject/selinux/wiki/Releases
--- recipes-security/selinux/selinux_20150202.inc | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 recipes-security/selinux/selinux_20150202.inc
recipes-security/selinux/selinux_20150202.inc new file +5 -0
@@ -0,0 +1,5 @@ +SELINUX_RELEASE = "20150202" + +SRC_URI = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${SELINUX_RELEASE}/${BPN}-${PV}.tar.gz" + +include selinux_common.inc
Signature · 1 line
2.1.4
PATCH 2/8 libsepol: Bump version to 2.4.
In reply to Philip Tricca--- recipes-security/selinux/libsepol_2.3.bb | 7 ------- recipes-security/selinux/libsepol_2.4.bb | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 recipes-security/selinux/libsepol_2.3.bb create mode 100644 recipes-security/selinux/libsepol_2.4.bb
recipes-security/selinux/libsepol_2.3.bb deleted +0 -7
@@ -1,7 +0,0 @@ -include selinux_20140506.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI[md5sum] = "e47e8527b5d4ea971726c455f847efdd" -SRC_URI[sha256sum] = "cc8d8642c3b7b95d6928d65dcbca2ab0627abc1c05166637851e63c1a6eae68f"
recipes-security/selinux/libsepol_2.4.bb new file +7 -0
@@ -0,0 +1,7 @@ +include selinux_20150202.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI[md5sum] = "8a75d27acf17af1911797e6b12986b50" +SRC_URI[sha256sum] = "299015d59932404c6b69d365fdecffe5c0e2f9c44e08b47286a4bfc02ee49659"
Signature · 1 line
2.1.4
PATCH 3/8 libselinux: Bump version to 2.4.
In reply to Philip Tricca--- recipes-security/selinux/libselinux_2.3.bb | 15 --------------- recipes-security/selinux/libselinux_2.4.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 recipes-security/selinux/libselinux_2.3.bb create mode 100644 recipes-security/selinux/libselinux_2.4.bb
recipes-security/selinux/libselinux_2.3.bb deleted +0 -15
@@ -1,15 +0,0 @@ -include selinux_20140506.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" - -SRC_URI[md5sum] = "b11d4d95ef4bde732dbc8462df57a1e5" -SRC_URI[sha256sum] = "0b1e0b43ecd84a812713d09564019b08e7c205d89072b5cbcd07b052cd8e77b2" - -SRC_URI += "\ - file://libselinux-drop-Wno-unused-but-set-variable.patch \ - file://libselinux-make-O_CLOEXEC-optional.patch \ - file://libselinux-make-SOCK_CLOEXEC-optional.patch \ - file://libselinux-define-FD_CLOEXEC-as-necessary.patch \ - file://libselinux-get-pywrap-depends-on-selinux.py.patch \ - "
recipes-security/selinux/libselinux_2.4.bb new file +15 -0
@@ -0,0 +1,15 @@ +include selinux_20150202.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" + +SRC_URI[md5sum] = "d19af2a367a81fb00bedc1b381694995" +SRC_URI[sha256sum] = "46043091f4c5ba4f43e8d3715f30d665a2d571c9126c1f03945c9ea4ed380f7b" + +SRC_URI += "\ + file://libselinux-drop-Wno-unused-but-set-variable.patch \ + file://libselinux-make-O_CLOEXEC-optional.patch \ + file://libselinux-make-SOCK_CLOEXEC-optional.patch \ + file://libselinux-define-FD_CLOEXEC-as-necessary.patch \ + file://libselinux-get-pywrap-depends-on-selinux.py.patch \ + "
Signature · 1 line
2.1.4
PATCH 4/8 checkpolicy: Bump version to 2.4.
In reply to Philip Tricca--- recipes-security/selinux/checkpolicy_2.3.bb | 7 ------- recipes-security/selinux/checkpolicy_2.4.bb | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 recipes-security/selinux/checkpolicy_2.3.bb create mode 100644 recipes-security/selinux/checkpolicy_2.4.bb
recipes-security/selinux/checkpolicy_2.3.bb deleted +0 -7
@@ -1,7 +0,0 @@ -include selinux_20140506.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "90caed59291291b184890f563bf6c095" -SRC_URI[sha256sum] = "90632d11afecb66997971d4c5c5d70dfb02d3969ec610ee2918ba6df99c8207b"
recipes-security/selinux/checkpolicy_2.4.bb new file +7 -0
@@ -0,0 +1,7 @@ +include selinux_20150202.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "4d35189dcfdcf9e3b8b8466f3f706756" +SRC_URI[sha256sum] = "9bbdac28a88de4c405c769730863f3adcd266adbfa45881a5de67e3a4895bcd4"
Signature · 1 line
2.1.4
PATCH 5/8 libsemanage: Bump version to 2.4.
In reply to Philip Tricca--- ...emanage-disable-expand-check-on-policy-load.patch | 20 +++++++++----------- recipes-security/selinux/libsemanage_2.3.bb | 17 ----------------- recipes-security/selinux/libsemanage_2.4.bb | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 28 deletions(-) delete mode 100644 recipes-security/selinux/libsemanage_2.3.bb create mode 100644 recipes-security/selinux/libsemanage_2.4.bb
recipes-security/selinux/libsemanage/libsemanage-disable-expand-check-on-policy-load.patch +9 -11
@@ -16,17 +16,15 @@ Signed-off-by: Joe MacDonald <[email protected]> src/semanage.conf | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/src/semanage.conf b/src/semanage.conf -index 24e1999..42050a7 100644 ---- a/src/semanage.conf -+++ b/src/semanage.conf -@@ -36,3 +36,6 @@ module-store = direct - # version is necessary. - #policy-version = 19 - +Index: libsemanage-2.4/src/semanage.conf +=================================================================== +--- libsemanage-2.4.orig/src/semanage.conf ++++ libsemanage-2.4/src/semanage.conf +@@ -39,3 +39,7 @@ module-store = direct + # By default, semanage will generate policies for the SELinux target. + # To build policies for Xen, uncomment the following line. + #target-platform = xen ++ +# Don't check the entire policy hierarchy when inserting / expanding a policy +# module. This results in a significant speed-up in policy loading. +expand-check=0 --- -1.7.10.4 -
recipes-security/selinux/libsemanage_2.3.bb deleted +0 -17
@@ -1,17 +0,0 @@ -include selinux_20140506.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI[md5sum] = "e564e2b92d18db35707060da29cddab9" -SRC_URI[sha256sum] = "03e09e35e611c286e446bef92b6023ef2623815996f5a53394bb02e49a312e4b" - -SRC_URI += "\ - file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \ - file://libsemanage-fix-path-len-limit.patch \ - file://libsemanage-fix-path-nologin.patch \ - file://libsemanage-drop-Wno-unused-but-set-variable.patch \ - file://libsemanage-define-FD_CLOEXEC-as-necessary.patch;striplevel=2 \ - file://libsemanage-allow-to-disable-audit-support.patch \ - file://libsemanage-disable-expand-check-on-policy-load.patch \ - "
recipes-security/selinux/libsemanage_2.4.bb new file +18 -0
@@ -0,0 +1,18 @@ +include selinux_20150202.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI[md5sum] = "cd551eb1cc5d20652660bda037972f0d" +SRC_URI[sha256sum] = "1a4cace4ef16786531ec075c0e7b2f961e2fee5dc86c5f983a689058899a6484" + +SRC_URI += "\ + file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \ + file://libsemanage-fix-path-len-limit.patch \ + file://libsemanage-fix-path-nologin.patch \ + file://libsemanage-drop-Wno-unused-but-set-variable.patch \ + file://libsemanage-define-FD_CLOEXEC-as-necessary.patch;striplevel=2 \ + file://libsemanage-allow-to-disable-audit-support.patch \ + file://libsemanage-disable-expand-check-on-policy-load.patch \ + " +FILES_${PN} += "/usr/libexec"
Signature · 1 line
2.1.4
PATCH 6/8 policycoreutuils: Bump version to 2.4.
In reply to Philip TriccaThis integrates the new hll tool for compiling pp files into cil. The hack to stage pp into the sysroot is a bit weird but the libexec dir seems to be something bitbake doesn't account for.
Had to pull one patch from upstream to build the MLS policy. This fixes an error where the auditadm_r and secadm_r roles end up defined twice in the CIL.
--- recipes-security/selinux/policycoreutils.inc | 11 +++- .../policycoreutils-pp-builtin-roles.patch | 70 ++++++++++++++++++++++ recipes-security/selinux/policycoreutils_2.3.bb | 19 ------ recipes-security/selinux/policycoreutils_2.4.bb | 20 +++++++ 4 files changed, 99 insertions(+), 21 deletions(-) create mode 100644 recipes-security/selinux/policycoreutils/policycoreutils-pp-builtin-roles.patch delete mode 100644 recipes-security/selinux/policycoreutils_2.3.bb create mode 100644 recipes-security/selinux/policycoreutils_2.4.bb
recipes-security/selinux/policycoreutils.inc +9 -2
@@ -126,6 +126,7 @@ PACKAGES =+ "\ ${PN}-chcat \ ${PN}-fixfiles \ ${PN}-genhomedircon \ + ${PN}-hll \ ${PN}-loadpolicy \ ${PN}-newrole \ ${PN}-python \
@@ -195,7 +196,7 @@ FILES_${PN}-runinit += "\ ${sbindir}/open_init_pty \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/run_init', '', d)} \ " -FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/sepolicy/.debug/*" +FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/sepolicy/.debug/* ${prefix}/libexec/selinux/hll/.debug" FILES_${PN}-sandbox += "\ ${datadir}/sandbox/* \ ${bindir}/sandbox \
@@ -215,6 +216,8 @@ FILES_${PN}-semodule-package += "\ ${bindir}/semodule_package \ ${bindir}/semodule_unpackage \ " +FILES_${PN}-hll += "${prefix}/libexec/selinux/hll/*" + FILES_${PN}-sepolicy += "\ ${bindir}/sepolicy \ ${datadir}/bash-completion/completions/sepolicy \
@@ -274,7 +277,7 @@ EXTRA_OEMAKE += "INITDIR=${D}/etc/init.d" BBCLASSEXTEND = "native" -PCU_NATIVE_CMDS = "setfiles semodule_package semodule semodule_link semodule_expand semodule_deps" +PCU_NATIVE_CMDS = "setfiles semodule_package semodule semodule_link semodule_expand semodule_deps hll" do_compile_virtclass-native() { for PCU_CMD in ${PCU_NATIVE_CMDS} ; do
@@ -284,6 +287,10 @@ do_compile_virtclass-native() { done } +sysroot_stage_dirs_append_virtclass-native() { + cp -R $from/${prefix}/libexec $to/${prefix}/libexec +} + do_compile_prepend() { export PYTHON=python export PYLIBVER='python${PYTHON_BASEVERSION}'
recipes-security/selinux/policycoreutils/policycoreutils-pp-builtin-roles.patch new file +70 -0
70 lines not on this page · raw message
recipes-security/selinux/policycoreutils_2.3.bb deleted +0 -19
@@ -1,19 +0,0 @@ -include selinux_20140506.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "9a5db20adfe2250f53833b277ac796ae" -SRC_URI[sha256sum] = "864cfaee58b5d2f15b140c354e59666e57143293c89f2b2e85bc0d0e4beefcd2" - -SRC_URI += "\ - file://policycoreutils-fix-sepolicy-install-path.patch \ - file://policycoreutils-make-O_CLOEXEC-optional.patch \ - file://policycoreutils-loadpolicy-symlink.patch \ - file://policycoreutils-semanage-edit-user.patch \ - file://policycoreutils-process-ValueError-for-sepolicy-seobject.patch \ - file://policycoreutils-fix-TypeError-for-seobject.py.patch \ - file://0001-mcstrans-fix-the-init-script.patch \ - file://enable-mcstrans.patch \ - file://policycoreutils-fts_flags-FTS_NOCHDIR.patch \ - "
recipes-security/selinux/policycoreutils_2.4.bb new file +20 -0
@@ -0,0 +1,20 @@ +include selinux_20150202.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "795b05c3ad58253cba61249ec65b28ef" +SRC_URI[sha256sum] = "b819f876f12473783ccce9f63b9a79cd77177477cd6d46818441f808cc4c3479" + +SRC_URI += "\ + file://policycoreutils-fix-sepolicy-install-path.patch \ + file://policycoreutils-make-O_CLOEXEC-optional.patch \ + file://policycoreutils-loadpolicy-symlink.patch \ + file://policycoreutils-semanage-edit-user.patch \ + file://policycoreutils-process-ValueError-for-sepolicy-seobject.patch \ + file://policycoreutils-fix-TypeError-for-seobject.py.patch \ + file://0001-mcstrans-fix-the-init-script.patch \ + file://enable-mcstrans.patch \ + file://policycoreutils-fts_flags-FTS_NOCHDIR.patch \ + file://policycoreutils-pp-builtin-roles.patch \ + "
Signature · 1 line
2.1.4
PATCH 7/8 setools: Add patch to support 2.4 toolstack.
In reply to Philip Tricca--- ...s-Update-for-2015-02-02-Userspace-release.patch | 114 +++++++++++++++++++++ ...rect-invalid-prototype-for-lsetfilecon_ra.patch | 34 ------ recipes-security/setools/setools_3.3.8.bb | 2 +- 3 files changed, 115 insertions(+), 35 deletions(-) create mode 100644 recipes-security/setools/setools/setools-Update-for-2015-02-02-Userspace-release.patch delete mode 100644 recipes-security/setools/setools/setools-replcon-correct-invalid-prototype-for-lsetfilecon_ra.patch
recipes-security/setools/setools/setools-Update-for-2015-02-02-Userspace-release.patch new file +114 -0
@@ -0,0 +1,114 @@ +From f1e5b208d507171968ca4d2eeefd7980f1004a3c Mon Sep 17 00:00:00 2001 +From: Chris PeBenito <[email protected]> +Date: Thu, 12 Feb 2015 08:55:12 -0500 +Subject: [PATCH] Update for 2015-02-02 Userspace release (2.4) + +SETools now requires libsepol 2.4 and libselinux 2.4. +--- + configure.ac | 6 +++--- + libqpol/src/policy_define.c | 4 ++-- + libqpol/src/policy_extend.c | 4 ++-- + libqpol/src/syn_rule_query.c | 6 +++--- + secmds/replcon.cc | 2 +- + 5 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 80395e6..ae20da7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,9 +25,9 @@ libseaudit_version=4.5 + setoolsdir='${prefix}/share/setools-3.3' + javadir='${prefix}/share/java' + +-version_min_sepol_major=1 +-version_min_sepol_minor=12 +-version_min_sepol_patch=27 ++version_min_sepol_major=2 ++version_min_sepol_minor=4 ++version_min_sepol_patch=0 + + dnl *** end of tunable values *** + +diff --git a/libqpol/src/policy_define.c b/libqpol/src/policy_define.c +index 229779c..15f70ba 100644 +--- a/libqpol/src/policy_define.c ++++ b/libqpol/src/policy_define.c +@@ -1661,7 +1661,7 @@ int define_compute_type_helper(int which, avrule_t ** rule) + goto bad; + } + class_perm_node_init(perm); +- perm->class = i + 1; ++ perm->tclass = i + 1; + perm->data = datum->s.value; + perm->next = avrule->perms; + avrule->perms = perm; +@@ -1901,7 +1901,7 @@ int define_te_avtab_helper(int which, avrule_t ** rule) + goto out; + } + class_perm_node_init(cur_perms); +- cur_perms->class = i + 1; ++ cur_perms->tclass = i + 1; + if (!perms) + perms = cur_perms; + if (tail) +diff --git a/libqpol/src/policy_extend.c b/libqpol/src/policy_extend.c +index 5325a87..1417271 100644 +--- a/libqpol/src/policy_extend.c ++++ b/libqpol/src/policy_extend.c +@@ -843,7 +843,7 @@ static int qpol_syn_rule_table_insert_sepol_avrule(qpol_policy_t * policy, qpol_ + for (class_node = rule->perms; class_node; class_node = class_node->next) { + key.rule_type = rule->specified; + key.source_val = key.target_val = i + 1; +- key.class_val = class_node->class; ++ key.class_val = class_node->tclass; + key.cond = cond; + if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule)) + goto err; +@@ -856,7 +856,7 @@ static int qpol_syn_rule_table_insert_sepol_avrule(qpol_policy_t * policy, qpol_ + key.rule_type = rule->specified; + key.source_val = i + 1; + key.target_val = j + 1; +- key.class_val = class_node->class; ++ key.class_val = class_node->tclass; + key.cond = cond; + if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule)) + goto err; +diff --git a/libqpol/src/syn_rule_query.c b/libqpol/src/syn_rule_query.c +index 3e63204..d7578f1 100644 +--- a/libqpol/src/syn_rule_query.c ++++ b/libqpol/src/syn_rule_query.c +@@ -67,7 +67,7 @@ static void *syn_rule_class_state_get_cur(const qpol_iterator_t * iter) + return NULL; + } + +- return db->class_val_to_struct[srcs->cur->class - 1]; ++ return db->class_val_to_struct[srcs->cur->tclass - 1]; + } + + static int syn_rule_class_state_next(qpol_iterator_t * iter) +@@ -465,10 +465,10 @@ int qpol_syn_avrule_get_perm_iter(const qpol_policy_t * policy, const qpol_syn_a + } + + for (node = internal_rule->perms; node; node = node->next) { +- for (i = 0; i < db->class_val_to_struct[node->class - 1]->permissions.nprim; i++) { ++ for (i = 0; i < db->class_val_to_struct[node->tclass - 1]->permissions.nprim; i++) { + if (!(node->data & (1 << i))) + continue; +- tmp = sepol_av_to_string(db, node->class, (sepol_access_vector_t) (1 << i)); ++ tmp = sepol_av_to_string(db, node->tclass, (sepol_access_vector_t) (1 << i)); + if (tmp) { + tmp++; /* remove prepended space */ + for (cur = 0; cur < perm_list_sz; cur++) +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
recipes-security/setools/setools/setools-replcon-correct-invalid-prototype-for-lsetfilecon_ra.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 74680dfb3df4c0c5b0e4bcf41717a9ea16fd8680 Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <[email protected]> -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 <[email protected]> ---- - 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 -
recipes-security/setools/setools_3.3.8.bb +1 -1
@@ -22,7 +22,7 @@ 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" +SRC_URI += "file://setools-Update-for-2015-02-02-Userspace-release.patch" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=26035c503c68ae1098177934ac0cc795 \ file://${S}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \
Signature · 1 line
2.1.4
PATCH 8/8 refpolicy: Update policy install and bootstrap process for CIL.
In reply to Philip TriccaThe policy modules are now installed into /var/lib/selinux instead of /etc/selinux.
Policies now have priorities. This is represented as part of the path under /var/lib/selinux.
The new intermediate policy representation requires that we install the policy package as 3 files (hll, cil & lang_ext) instead of just the *.pp as before. The cil is generated from the hll (the pp file) using the new 'pp' utility.
The base policy module now lives with all of the other modules. policy.kern has gone away.
--- recipes-security/refpolicy/refpolicy_common.inc | 40 ++++++++++++++++--------- 1 file changed, 26 insertions(+), 14 deletions(-)
recipes-security/refpolicy/refpolicy_common.inc +26 -14
@@ -14,6 +14,7 @@ S = "${WORKDIR}/refpolicy" FILES_${PN} = " \ ${sysconfdir}/selinux/${POLICY_NAME}/ \ ${datadir}/selinux/${POLICY_NAME}/*.pp \ + ${localstatedir}/lib/selinux/${POLICY_NAME}/ \ " FILES_${PN}-dev =+ " \ ${datadir}/selinux/${POLICY_NAME}/include/ \
@@ -65,20 +66,33 @@ do_compile() { prepare_policy_store () { oe_runmake 'DESTDIR=${D}' 'prefix=${D}${prefix}' install + POL_PRIORITY=100 + POL_SRC=${D}${datadir}/selinux/${POLICY_NAME} + POL_STORE=${D}${localstatedir}/lib/selinux/${POLICY_NAME} + POL_ACTIVE_MODS=${POL_STORE}/active/modules/${POL_PRIORITY} # Prepare to create policy store - mkdir -p ${D}${sysconfdir}/selinux/ - mkdir -p ${D}${sysconfdir}/selinux/${POLICY_NAME}/policy - mkdir -p ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/modules - mkdir -p ${D}${sysconfdir}/selinux/${POLICY_NAME}/contexts/files - touch ${D}${sysconfdir}/selinux/${POLICY_NAME}/contexts/files/file_contexts.local - for i in ${D}${datadir}/selinux/${POLICY_NAME}/*.pp; do - bzip2 -f $i && mv -f $i.bz2 $i - if [ "`basename $i`" != "base.pp" ]; then - cp $i ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/modules/`basename $i` + mkdir -p ${POL_STORE} + mkdir -p ${POL_ACTIVE_MODS} + + # get hll type from suffix on base policy module + HLL_TYPE=$(echo ${POL_SRC}/base.* | awk -F . '{if (NF>1) {print $NF}}') + HLL_BIN=${STAGING_DIR_NATIVE}${prefix}/libexec/selinux/hll/${HLL_TYPE} + + for i in ${POL_SRC}/*.${HLL_TYPE}; do + MOD_NAME=$(basename $i | sed "s/\.${HLL_TYPE}$//") + MOD_DIR=${POL_ACTIVE_MODS}/${MOD_NAME} + mkdir -p ${MOD_DIR} + echo -n "${HLL_TYPE}" > ${MOD_DIR}/lang_ext + if ! bzip2 -qt $i 2>/dev/null; then + ${HLL_BIN} $i | bzip2 --stdout > ${MOD_DIR}/cil + bzip2 -f $i && mv -f $i.bz2 $i else - cp $i ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/`basename $i` + bunzip2 --stdout $i | \ + ${HLL_BIN} | \ + bzip2 --stdout > ${MOD_DIR}/cil fi + cp $i ${MOD_DIR}/hll done }
@@ -100,6 +114,8 @@ EOF # Create policy store and build the policy semodule -p ${D} -s ${POLICY_NAME} -n -B rm -f ${D}${sysconfdir}/selinux/semanage.conf + # no need to leave tmp dir created by semanage lanying around + rm -rf ${D}${localstatedir}/lib/selinux/tmp } install_misc_files () {
@@ -114,10 +130,6 @@ install_misc_files () { # install policy headers oe_runmake 'DESTDIR=${D}' 'prefix=${D}${prefix}' install-headers - - # Fix symbol link policy.kern - link_path=`readlink -f ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/policy.kern` - ln -sf ../../policy/`basename $link_path` ${D}${sysconfdir}/selinux/${POLICY_NAME}/modules/active/policy.kern } do_install () {
Signature · 1 line
2.1.4