diff --git a/recipes-security/selinux/policycoreutils/policycoreutils-fts_flags-FTS_NOCHDIR.patch b/recipes-security/selinux/policycoreutils/policycoreutils-fts_flags-FTS_NOCHDIR.patch deleted file mode 100644 index fd04b51..0000000 --- a/recipes-security/selinux/policycoreutils/policycoreutils-fts_flags-FTS_NOCHDIR.patch +++ /dev/null @@ -1,25 +0,0 @@ -This works around a bug in the default libc used by OE. FTS functions are -supposed to change the current working directory as they walk the file -hierarchy. The fts_accpath member of the FTSENT structure relies on this -behavior and without it the path is not relative to cwd as expected. -Supplying the FTS_NOCHDIR flag disables this optimization and causes -fts_accpath to be relative to the directory where the traversal started. -Use of this flag doesn't effect compatibility with glibc. - -An alternative fix could replace the use of fts_accpath with fts_path -which is absolute. - -Signed-off-by: Philip Tricca -Index: policycoreutils/setfiles/setfiles.c -=================================================================== ---- policycoreutils.orig/setfiles/setfiles.c -+++ policycoreutils/setfiles/setfiles.c -@@ -194,7 +194,7 @@ int main(int argc, char **argv) - r_opts.expand_realpath = 0; - r_opts.abort_on_error = 1; - r_opts.add_assoc = 1; -- r_opts.fts_flags = FTS_PHYSICAL | FTS_XDEV; -+ r_opts.fts_flags = FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR; - ctx_validate = 1; - } else { - /* diff --git a/recipes-security/selinux/policycoreutils_2.6.bb b/recipes-security/selinux/policycoreutils_2.7.bb similarity index 74% rename from recipes-security/selinux/policycoreutils_2.6.bb rename to recipes-security/selinux/policycoreutils_2.7.bb index 6a625b3..50f15d0 100644 --- a/recipes-security/selinux/policycoreutils_2.6.bb +++ b/recipes-security/selinux/policycoreutils_2.7.bb @@ -1,10 +1,10 @@ -include selinux_20161014.inc +include selinux_20170804.inc include ${BPN}.inc LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRC_URI[md5sum] = "0358f0136e2dd9a8c9e99f181aaab1b2" -SRC_URI[sha256sum] = "68891b376f5048edc53c6ccb2fca44da3dc7f4563f4b6894e201d70c04a05a29" +SRC_URI[md5sum] = "65311b66ae01f7b7ad7c2ea7401b68ed" +SRC_URI[sha256sum] = "0a1b8a4a323b854981c6755ff025fe98a0f1cff307f109abb260f0490f13e4f4" SRC_URI += "\ file://policycoreutils-fix-sepolicy-install-path.patch \ diff --git a/recipes-security/selinux/policycoreutils_git.bb b/recipes-security/selinux/policycoreutils_git.bb index b630797..5be8728 100644 --- a/recipes-security/selinux/policycoreutils_git.bb +++ b/recipes-security/selinux/policycoreutils_git.bb @@ -1,5 +1,4 @@ -PR = "r99" -PV = "2.2.5+git${SRCPV}" +PV = "2.7+git${SRCPV}" include selinux_git.inc include ${BPN}.inc @@ -9,6 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" SRC_URI += "\ file://policycoreutils-fix-sepolicy-install-path.patch \ file://policycoreutils-make-O_CLOEXEC-optional.patch \ + file://policycoreutils-loadpolicy-symlink.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 \ "