* [meta-selinux][PATCH 0/1] refpolicy: fix ftpwho install dir @ 2014-02-08 2:34 rongqing.li 2014-02-08 2:34 ` [meta-selinux][PATCH 1/1] " rongqing.li 0 siblings, 1 reply; 3+ messages in thread From: rongqing.li @ 2014-02-08 2:34 UTC (permalink / raw) To: yocto From: Roy Li <rongqing.li@windriver.com> The following changes since commit 13266999932edaa334b24c18c79815eb19559b86: refpolicy: Allow ping to get/set capabilities (2014-01-28 16:41:59 +0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib roy/meta-selinux_ftpwho http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=roy/meta-selinux_ftpwho Roy Li (1): refpolicy: fix ftpwho install dir .../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 -- 1.7.10.4 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [meta-selinux][PATCH 1/1] refpolicy: fix ftpwho install dir 2014-02-08 2:34 [meta-selinux][PATCH 0/1] refpolicy: fix ftpwho install dir rongqing.li @ 2014-02-08 2:34 ` rongqing.li 2014-02-13 0:54 ` Joe MacDonald 0 siblings, 1 reply; 3+ messages in thread From: rongqing.li @ 2014-02-08 2:34 UTC (permalink / raw) To: yocto From: Roy Li <rongqing.li@windriver.com> ftpwho is installed into /usr/bin, not /usr/sbin. Signed-off-by: Roy Li <rongqing.li@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.li@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 -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-selinux][PATCH 1/1] refpolicy: fix ftpwho install dir 2014-02-08 2:34 ` [meta-selinux][PATCH 1/1] " rongqing.li @ 2014-02-13 0:54 ` Joe MacDonald 0 siblings, 0 replies; 3+ messages in thread From: Joe MacDonald @ 2014-02-13 0:54 UTC (permalink / raw) To: rongqing.li; +Cc: yocto [-- Attachment #1: Type: text/plain, Size: 2537 bytes --] Merged, thanks. -J. [[yocto] [meta-selinux][PATCH 1/1] refpolicy: fix ftpwho install dir] On 14.02.08 (Sat 10:34) rongqing.li@windriver.com wrote: > From: Roy Li <rongqing.li@windriver.com> > > ftpwho is installed into /usr/bin, not /usr/sbin. > > Signed-off-by: Roy Li <rongqing.li@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.li@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 [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-13 0:54 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-02-08 2:34 [meta-selinux][PATCH 0/1] refpolicy: fix ftpwho install dir rongqing.li 2014-02-08 2:34 ` [meta-selinux][PATCH 1/1] " rongqing.li 2014-02-13 0:54 ` Joe MacDonald
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.