diff options
author | Wenzong Fan <wenzong.fan@windriver.com> | 2017-09-04 22:59:46 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@windriver.com> | 2017-09-13 19:48:51 -0500 |
commit | d8d6ac6a5de6cc37e61ed48ea3a91c138bc4d213 (patch) | |
tree | 3c6bcc776b80577b20288a49fc177911c4f0c2a9 /recipes-security/selinux/mcstrans | |
parent | 9b70823774000acf803f0400b3cc7216e6116c99 (diff) | |
download | meta-selinux-d8d6ac6a5de6cc37e61ed48ea3a91c138bc4d213.tar.gz |
mcstrans: add package 2.7 (20170804)
Move policycoreutils/mcstrans to mcstrans:
* Move and rebase patches:
- mcstrans-de-bashify.patch
- 0001-mcstrans-fix-the-init-script.patch
* Remove useless patch:
- enable-mcstrans.patch
* Cleanup policycoreutils_2.7.bb and policycoreutils.inc.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Update policycoreutils_git.bb
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'recipes-security/selinux/mcstrans')
-rw-r--r-- | recipes-security/selinux/mcstrans/0001-mcstrans-fix-the-init-script.patch | 28 | ||||
-rw-r--r-- | recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch | 26 |
2 files changed, 54 insertions, 0 deletions
diff --git a/recipes-security/selinux/mcstrans/0001-mcstrans-fix-the-init-script.patch b/recipes-security/selinux/mcstrans/0001-mcstrans-fix-the-init-script.patch new file mode 100644 index 0000000..5f7163d --- /dev/null +++ b/recipes-security/selinux/mcstrans/0001-mcstrans-fix-the-init-script.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | [PATCH] mcstrans: fix the init script | ||
2 | |||
3 | Upstream-Status: Inappropriate [embedded specific] | ||
4 | |||
5 | replace daemon with start-stop-daemon, due to not daemon functions | ||
6 | |||
7 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
8 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
9 | --- | ||
10 | src/mcstrans.init | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/src/mcstrans.init b/src/mcstrans.init | ||
14 | index 2804ec0..c660290 100644 | ||
15 | --- a/src/mcstrans.init | ||
16 | +++ b/src/mcstrans.init | ||
17 | @@ -51,7 +51,7 @@ start(){ | ||
18 | fi | ||
19 | |||
20 | unset HOME MAIL USER USERNAME | ||
21 | - daemon $prog "$EXTRAOPTIONS" | ||
22 | + start-stop-daemon --start --quiet --exec $prog -- "$EXTRAOPTIONS" | ||
23 | RETVAL=$? | ||
24 | echo | ||
25 | if test $RETVAL = 0 ; then | ||
26 | -- | ||
27 | 1.9.1 | ||
28 | |||
diff --git a/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch b/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch new file mode 100644 index 0000000..805d7e5 --- /dev/null +++ b/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | commit 54875dcb50f5e40fc86d6fe98dde244bfe4751af | ||
2 | Author: Joe MacDonald <joe_macdonald@mentor.com> | ||
3 | Date: Fri Aug 7 15:16:45 2015 -0400 | ||
4 | |||
5 | mcstrans: remove dependency on bash in initscript | ||
6 | |||
7 | There were no apparent bashisms in mcstrans.init, so remove the dependency | ||
8 | on bash. | ||
9 | |||
10 | Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
15 | --- | ||
16 | src/mcstrans.init | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | --- a/src/mcstrans.init | ||
20 | +++ b/src/mcstrans.init | ||
21 | @@ -1,4 +1,4 @@ | ||
22 | -#!/bin/bash | ||
23 | +#!/bin/sh | ||
24 | # | ||
25 | # mcstransd This starts and stops mcstransd | ||
26 | # | ||