From d85c6734eebbc84e55af467b59bf79afbe8cec31 Mon Sep 17 00:00:00 2001 From: Joe MacDonald Date: Fri, 6 Jan 2017 15:07:23 -0500 Subject: refpolicy-git: Update patches A number of upstream changes caused patch conflicts or duplication in the final policy. Update the list of git patches appropriately. Signed-off-by: Joe MacDonald --- .../refpolicy-git/poky-fc-fix-real-path_shadow.patch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'recipes-security/refpolicy/refpolicy-git/poky-fc-fix-real-path_shadow.patch') diff --git a/recipes-security/refpolicy/refpolicy-git/poky-fc-fix-real-path_shadow.patch b/recipes-security/refpolicy/refpolicy-git/poky-fc-fix-real-path_shadow.patch index 29ac2c3..d74f524 100644 --- a/recipes-security/refpolicy/refpolicy-git/poky-fc-fix-real-path_shadow.patch +++ b/recipes-security/refpolicy/refpolicy-git/poky-fc-fix-real-path_shadow.patch @@ -7,11 +7,11 @@ Signed-off-by: Xin Ouyang policy/modules/admin/usermanage.fc | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/policy/modules/admin/usermanage.fc b/policy/modules/admin/usermanage.fc -index f82f0ce..841ba9b 100644 --- a/policy/modules/admin/usermanage.fc +++ b/policy/modules/admin/usermanage.fc -@@ -4,11 +4,17 @@ ifdef(`distro_gentoo',` +@@ -6,15 +6,21 @@ ifdef(`distro_debian',` + /etc/cron\.daily/cracklib-runtime -- gen_context(system_u:object_r:crack_exec_t,s0) + ') /usr/bin/chage -- gen_context(system_u:object_r:passwd_exec_t,s0) /usr/bin/chfn -- gen_context(system_u:object_r:chfn_exec_t,s0) @@ -29,6 +29,5 @@ index f82f0ce..841ba9b 100644 /usr/lib/cracklib_dict.* -- gen_context(system_u:object_r:crack_db_t,s0) --- -1.7.9.5 - + /usr/sbin/crack_[a-z]* -- gen_context(system_u:object_r:crack_exec_t,s0) + /usr/sbin/cracklib-[a-z]* -- gen_context(system_u:object_r:crack_exec_t,s0) -- cgit v1.2.3-54-g00ecf