summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2014-04-03 14:05:50 -0400
committerJoe MacDonald <joe@deserted.net>2014-04-03 14:46:10 -0400
commita5c4a0951a2137eacb99d33d67dda84d86fd6ae6 (patch)
tree7782875b5d9b686e2621a9d1ee456b91ffd24e24
parentccb3c64d97a9833f0740bd590eb78f08887816bc (diff)
downloadmeta-selinux-a5c4a0951a2137eacb99d33d67dda84d86fd6ae6.tar.gz
policycoreutils: drop the patch for old refpolicy
The patch policycoreutils-revert-run_init-open_init_pty.patch is only for refpolicy version older than 2.20120725, now the refpolicy is updated to 2.20130424 so drop the patch or it will make run_init fail to start some init scripts. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r--recipes-security/selinux/policycoreutils/policycoreutils-revert-run_init-open_init_pty.patch40
-rw-r--r--recipes-security/selinux/policycoreutils_2.2.5.bb1
-rw-r--r--recipes-security/selinux/policycoreutils_git.bb1
3 files changed, 0 insertions, 42 deletions
diff --git a/recipes-security/selinux/policycoreutils/policycoreutils-revert-run_init-open_init_pty.patch b/recipes-security/selinux/policycoreutils/policycoreutils-revert-run_init-open_init_pty.patch
deleted file mode 100644
index aedae21..0000000
--- a/recipes-security/selinux/policycoreutils/policycoreutils-revert-run_init-open_init_pty.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 0b2d9e47c759bf2d0842f20d6af5c4e678e9c34c Mon Sep 17 00:00:00 2001
2From: Xin Ouyang <Xin.Ouyang@windriver.com>
3Date: Tue, 4 Jun 2013 17:04:44 +0800
4Subject: [PATCH] policycoreutils: Revert "run_init: If open_init_pty ..."
5
6This reverts commit d46e88abb6e1f7b0228c30c98ba4fb739e63cda3.
7
8In d46e88ab, run_init will not use open_init_pty as Redhat did. Our
9old refpolicy still does no work well with this, and make init scripts
10fail to start so revert it.
11
12This patch should be dropped while refpolicy is upreved to 2.20120725+.
13
14Upstream-Status: Inappropriate [for old refpolicy]
15
16---
17 run_init/run_init.c | 7 -------
18 1 file changed, 7 deletions(-)
19
20diff --git a/run_init/run_init.c b/run_init/run_init.c
21index 92034be..9db766c 100644
22--- a/run_init/run_init.c
23+++ b/run_init/run_init.c
24@@ -406,13 +406,6 @@ int main(int argc, char *argv[])
25 new_context);
26 exit(-1);
27 }
28- if (! access("/usr/sbin/open_init_pty", X_OK)) {
29- if (execvp(argv[1], argv + 1)) {
30- perror("execvp");
31- exit(-1);
32- }
33- return 0;
34- }
35 /*
36 * Do not execvp the command directly from run_init; since it would run
37 * under with a pty under sysadm_devpts_t. Instead, we call open_init_tty,
38--
391.8.1.2
40
diff --git a/recipes-security/selinux/policycoreutils_2.2.5.bb b/recipes-security/selinux/policycoreutils_2.2.5.bb
index bd3a5dd..c278aff 100644
--- a/recipes-security/selinux/policycoreutils_2.2.5.bb
+++ b/recipes-security/selinux/policycoreutils_2.2.5.bb
@@ -9,7 +9,6 @@ SRC_URI[md5sum] = "a2963d7024c5c4ce89f2459d48f91ec8"
9SRC_URI[sha256sum] = "bbf850a8c3c2f371f439d6525663eecdd3a737acd594d2f27f8d8f3a07830cc4" 9SRC_URI[sha256sum] = "bbf850a8c3c2f371f439d6525663eecdd3a737acd594d2f27f8d8f3a07830cc4"
10 10
11SRC_URI += "\ 11SRC_URI += "\
12 file://policycoreutils-revert-run_init-open_init_pty.patch \
13 file://policycoreutils-fix-sepolicy-install-path.patch \ 12 file://policycoreutils-fix-sepolicy-install-path.patch \
14 file://policycoreutils-make-O_CLOEXEC-optional.patch \ 13 file://policycoreutils-make-O_CLOEXEC-optional.patch \
15 file://policycoreutils-loadpolicy-symlink.patch \ 14 file://policycoreutils-loadpolicy-symlink.patch \
diff --git a/recipes-security/selinux/policycoreutils_git.bb b/recipes-security/selinux/policycoreutils_git.bb
index 9a6425b..92f6c26 100644
--- a/recipes-security/selinux/policycoreutils_git.bb
+++ b/recipes-security/selinux/policycoreutils_git.bb
@@ -7,7 +7,6 @@ include ${BPN}.inc
7LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 7LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
8 8
9SRC_URI += "\ 9SRC_URI += "\
10 file://policycoreutils-revert-run_init-open_init_pty.patch \
11 file://policycoreutils-fix-sepolicy-install-path.patch \ 10 file://policycoreutils-fix-sepolicy-install-path.patch \
12 file://policycoreutils-make-O_CLOEXEC-optional.patch \ 11 file://policycoreutils-make-O_CLOEXEC-optional.patch \
13 " 12 "