summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2017-09-04 22:59:44 -0700
committerMark Hatle <mark.hatle@windriver.com>2017-09-13 19:48:50 -0500
commitc9186be1b8a7cf18e9deaa5d8a4007b9492ca09d (patch)
tree208d106272110cb32ae5231686ef7c3d4fc1c79d
parentf838032d000b8878a8ba3dc08e9bea1064771f26 (diff)
downloadmeta-selinux-c9186be1b8a7cf18e9deaa5d8a4007b9492ca09d.tar.gz
policycoreutils: uprev to 2.7 (20170804)
Uprev the recipe file as is. Some packages have been moved out from policycoreutils, they will be added as new packages and the policycoreutils.inc need to be cleaned up from later commits accordingly. Moved packages: From: To: - policycoreutils/gui gui - policycoreutils/mcstrans mcstrans - policycoreutils/restorecond restorecond - policycoreutils/sandbox sandbox - policycoreutils/sepolicy/dbus dbus - policycoreutils/semodule_deps semodule-utils/semodule_deps - policycoreutils/semodule_expand semodule-utils/semodule_expand - policycoreutils/semodule_link semodule-utils/semodule_link - policycoreutils/semodule_package semodule-utils/semodule_package - policycoreutils/semanage python/semanage - policycoreutils/audit2allow python/audit2allow - policycoreutils/sepolgen-ifgen python/audit2allow/sepolgen-ifgen - policycoreutils/sepolicy python/sepolicy - policycoreutils/scripts/chcat python/chcat Released package list refer to: https://github.com/SELinuxProject/selinux/wiki/Releases Cleanup the patch file that have been removed in 2.6: - policycoreutils-fts_flags-FTS_NOCHDIR.patch Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Update policycoreutils_git.bb Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-rw-r--r--recipes-security/selinux/policycoreutils/policycoreutils-fts_flags-FTS_NOCHDIR.patch25
-rw-r--r--recipes-security/selinux/policycoreutils_2.7.bb (renamed from recipes-security/selinux/policycoreutils_2.6.bb)6
-rw-r--r--recipes-security/selinux/policycoreutils_git.bb6
3 files changed, 7 insertions, 30 deletions
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 @@
1This works around a bug in the default libc used by OE. FTS functions are
2supposed to change the current working directory as they walk the file
3hierarchy. The fts_accpath member of the FTSENT structure relies on this
4behavior and without it the path is not relative to cwd as expected.
5Supplying the FTS_NOCHDIR flag disables this optimization and causes
6fts_accpath to be relative to the directory where the traversal started.
7Use of this flag doesn't effect compatibility with glibc.
8
9An alternative fix could replace the use of fts_accpath with fts_path
10which is absolute.
11
12Signed-off-by: Philip Tricca <flihp@twobit.us>
13Index: policycoreutils/setfiles/setfiles.c
14===================================================================
15--- policycoreutils.orig/setfiles/setfiles.c
16+++ policycoreutils/setfiles/setfiles.c
17@@ -194,7 +194,7 @@ int main(int argc, char **argv)
18 r_opts.expand_realpath = 0;
19 r_opts.abort_on_error = 1;
20 r_opts.add_assoc = 1;
21- r_opts.fts_flags = FTS_PHYSICAL | FTS_XDEV;
22+ r_opts.fts_flags = FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR;
23 ctx_validate = 1;
24 } else {
25 /*
diff --git a/recipes-security/selinux/policycoreutils_2.6.bb b/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 @@
1include selinux_20161014.inc 1include selinux_20170804.inc
2include ${BPN}.inc 2include ${BPN}.inc
3 3
4LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 4LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
5 5
6SRC_URI[md5sum] = "0358f0136e2dd9a8c9e99f181aaab1b2" 6SRC_URI[md5sum] = "65311b66ae01f7b7ad7c2ea7401b68ed"
7SRC_URI[sha256sum] = "68891b376f5048edc53c6ccb2fca44da3dc7f4563f4b6894e201d70c04a05a29" 7SRC_URI[sha256sum] = "0a1b8a4a323b854981c6755ff025fe98a0f1cff307f109abb260f0490f13e4f4"
8 8
9SRC_URI += "\ 9SRC_URI += "\
10 file://policycoreutils-fix-sepolicy-install-path.patch \ 10 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 @@
1PR = "r99" 1PV = "2.7+git${SRCPV}"
2PV = "2.2.5+git${SRCPV}"
3 2
4include selinux_git.inc 3include selinux_git.inc
5include ${BPN}.inc 4include ${BPN}.inc
@@ -9,6 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
9SRC_URI += "\ 8SRC_URI += "\
10 file://policycoreutils-fix-sepolicy-install-path.patch \ 9 file://policycoreutils-fix-sepolicy-install-path.patch \
11 file://policycoreutils-make-O_CLOEXEC-optional.patch \ 10 file://policycoreutils-make-O_CLOEXEC-optional.patch \
11 file://policycoreutils-loadpolicy-symlink.patch \
12 file://policycoreutils-process-ValueError-for-sepolicy-seobject.patch \
13 file://policycoreutils-fix-TypeError-for-seobject.py.patch \
12 file://0001-mcstrans-fix-the-init-script.patch \ 14 file://0001-mcstrans-fix-the-init-script.patch \
13 file://enable-mcstrans.patch \ 15 file://enable-mcstrans.patch \
14 " 16 "