Merged, thanks. -J. [[yocto] [meta-selinux][PATCH 1/1] refpolicy: fix ftpwho install dir] On 14.02.08 (Sat 10:34) rongqing...@windriver.com wrote:
> From: Roy Li <rongqing...@windriver.com> > > ftpwho is installed into /usr/bin, not /usr/sbin. > > Signed-off-by: Roy Li <rongqing...@windriver.com> > --- > .../refpolicy-2.20130424/poky-fc-ftpwho-dir.patch | 27 > ++++++++++++++++++++ > .../refpolicy/refpolicy_2.20130424.inc | 1 + > 2 files changed, 28 insertions(+) > create mode 100644 > recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-ftpwho-dir.patch > > diff --git > a/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-ftpwho-dir.patch > b/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-ftpwho-dir.patch > new file mode 100644 > index 0000000..a7d434f > --- /dev/null > +++ b/recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-ftpwho-dir.patch > @@ -0,0 +1,27 @@ > +fix ftpwho install dir > + > +Upstream-Status: Pending > + > +ftpwho is installed into /usr/bin/, not /usr/sbin, so fix it > + > +Signed-off-by: Roy Li <rongqing...@windriver.com> > +--- > + policy/modules/contrib/ftp.fc | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/policy/modules/contrib/ftp.fc b/policy/modules/contrib/ftp.fc > +index ddb75c1..26fec47 100644 > +--- a/policy/modules/contrib/ftp.fc > ++++ b/policy/modules/contrib/ftp.fc > +@@ -9,7 +9,7 @@ > + > + /usr/kerberos/sbin/ftpd -- > gen_context(system_u:object_r:ftpd_exec_t,s0) > + > +-/usr/sbin/ftpwho -- gen_context(system_u:object_r:ftpd_exec_t,s0) > ++/usr/bin/ftpwho -- gen_context(system_u:object_r:ftpd_exec_t,s0) > + /usr/sbin/in\.ftpd -- gen_context(system_u:object_r:ftpd_exec_t,s0) > + /usr/sbin/muddleftpd -- > gen_context(system_u:object_r:ftpd_exec_t,s0) > + /usr/sbin/proftpd -- gen_context(system_u:object_r:ftpd_exec_t,s0) > +-- > +1.7.10.4 > + > diff --git a/recipes-security/refpolicy/refpolicy_2.20130424.inc > b/recipes-security/refpolicy/refpolicy_2.20130424.inc > index 4b618b2..7ecfdc1 100644 > --- a/recipes-security/refpolicy/refpolicy_2.20130424.inc > +++ b/recipes-security/refpolicy/refpolicy_2.20130424.inc > @@ -29,6 +29,7 @@ SRC_URI += "file://poky-fc-subs_dist.patch \ > file://poky-fc-sysnetwork.patch \ > file://poky-fc-udevd.patch \ > file://poky-fc-rpm.patch \ > + file://poky-fc-ftpwho-dir.patch \ > " > > # Specific policy for Poky -- -Joe MacDonald. :wq
signature.asc
Description: Digital signature
_______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
