Skip to contentSkip to conversation

refpolicy: fix ftpwho install dir

PATCH Applied [email protected] 2 participants 3 messages Feb 8, 2014 – Feb 13, 2014

lore
Share & tools
lore
#0 lore raw

cover refpolicy: fix ftpwho install dir

From: Roy Li <[email protected]>

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
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 refpolicy: fix ftpwho install dir

From: Roy Li <[email protected]>

ftpwho is installed into /usr/bin, not /usr/sbin.

---
 .../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
recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-ftpwho-dir.patch new file +27 -0
new file mode 100644
index 0000000..a7d434f
@@ -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 <[email protected]>
+---
+ 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
+
recipes-security/refpolicy/refpolicy_2.20130424.inc +1 -0
index 4b618b2..7ecfdc1 100644
@@ -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
Signature · 1 line
1.7.10.4
#2 lore raw

Merged, thanks.
-J.

Quoted 56 lines · [[yocto] [meta-selinux][PATCH 1/1] refpolicy: fix ftpwho install dir] On…

From: Roy Li <[email protected]>

ftpwho is installed into /usr/bin, not /usr/sbin.

---
 .../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
recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-ftpwho-dir.patch new file +27 -0
new file mode 100644
index 0000000..a7d434f
@@ -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 <[email protected]>
+---
+ 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
+
recipes-security/refpolicy/refpolicy_2.20130424.inc +1 -0
index 4b618b2..7ecfdc1 100644
@@ -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
Signature · 2 lines
-Joe MacDonald.
:wq