summaryrefslogtreecommitdiffstats
path: root/recipes-security/selinux/policycoreutils
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2017-09-04 22:59:46 -0700
committerMark Hatle <mark.hatle@windriver.com>2017-09-13 19:48:51 -0500
commitd8d6ac6a5de6cc37e61ed48ea3a91c138bc4d213 (patch)
tree3c6bcc776b80577b20288a49fc177911c4f0c2a9 /recipes-security/selinux/policycoreutils
parent9b70823774000acf803f0400b3cc7216e6116c99 (diff)
downloadmeta-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/policycoreutils')
-rw-r--r--recipes-security/selinux/policycoreutils/0001-mcstrans-fix-the-init-script.patch27
-rw-r--r--recipes-security/selinux/policycoreutils/enable-mcstrans.patch17
-rw-r--r--recipes-security/selinux/policycoreutils/mcstrans-de-bashify.patch12
3 files changed, 0 insertions, 56 deletions
diff --git a/recipes-security/selinux/policycoreutils/0001-mcstrans-fix-the-init-script.patch b/recipes-security/selinux/policycoreutils/0001-mcstrans-fix-the-init-script.patch
deleted file mode 100644
index 39be80a..0000000
--- a/recipes-security/selinux/policycoreutils/0001-mcstrans-fix-the-init-script.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1[PATCH] mcstrans: fix the init script
2
3Upstream-Status: Inappropriate [embedded specific]
4
5replace daemon with start-stop-daemon, due to not daemon functions
6
7Signed-off-by: Roy Li <rongqing.li@windriver.com>
8---
9 mcstrans/src/mcstrans.init | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/mcstrans/src/mcstrans.init b/mcstrans/src/mcstrans.init
13index 2804ec0..c660290 100644
14--- a/mcstrans/src/mcstrans.init
15+++ b/mcstrans/src/mcstrans.init
16@@ -51,7 +51,7 @@ start(){
17 fi
18
19 unset HOME MAIL USER USERNAME
20- daemon $prog "$EXTRAOPTIONS"
21+ start-stop-daemon --start --quiet --exec $prog -- "$EXTRAOPTIONS"
22 RETVAL=$?
23 echo
24 if test $RETVAL = 0 ; then
25--
261.9.1
27
diff --git a/recipes-security/selinux/policycoreutils/enable-mcstrans.patch b/recipes-security/selinux/policycoreutils/enable-mcstrans.patch
deleted file mode 100644
index e923903..0000000
--- a/recipes-security/selinux/policycoreutils/enable-mcstrans.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Add the "mcstrans" subdir so it gets built too.
2
3Upstream-Status: Inappropriate [embedded specific]
4
5Signed-off-by: Roy Li <rongqing.li@windriver.com>
6diff --git a/Makefile b/Makefile
7index 83ebd45..3ae784f 100644
8--- a/Makefile
9+++ b/Makefile
10@@ -1,5 +1,7 @@
11 SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui
12
13+SUBDIRS += mcstrans
14+
15 INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
16
17 ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
diff --git a/recipes-security/selinux/policycoreutils/mcstrans-de-bashify.patch b/recipes-security/selinux/policycoreutils/mcstrans-de-bashify.patch
deleted file mode 100644
index 86141a2..0000000
--- a/recipes-security/selinux/policycoreutils/mcstrans-de-bashify.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1---
2 mcstrans/src/mcstrans.init | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-)
4
5--- a/mcstrans/src/mcstrans.init
6+++ b/mcstrans/src/mcstrans.init
7@@ -1,4 +1,4 @@
8-#!/bin/bash
9+#!/bin/sh
10 #
11 # mcstransd This starts and stops mcstransd
12 #