From d8d6ac6a5de6cc37e61ed48ea3a91c138bc4d213 Mon Sep 17 00:00:00 2001
From: Wenzong Fan <wenzong.fan@windriver.com>
Date: Mon, 4 Sep 2017 22:59:46 -0700
Subject: 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>
---
 .../0001-mcstrans-fix-the-init-script.patch        | 28 ++++++++++++++++++++++
 .../selinux/mcstrans/mcstrans-de-bashify.patch     | 26 ++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 recipes-security/selinux/mcstrans/0001-mcstrans-fix-the-init-script.patch
 create mode 100644 recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch

(limited to 'recipes-security/selinux/mcstrans')

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 @@
+[PATCH] mcstrans: fix the init script
+
+Upstream-Status: Inappropriate [embedded specific]
+
+replace daemon with start-stop-daemon, due to not daemon functions
+
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+---
+ src/mcstrans.init | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mcstrans.init b/src/mcstrans.init
+index 2804ec0..c660290 100644
+--- a/src/mcstrans.init
++++ b/src/mcstrans.init
+@@ -51,7 +51,7 @@ start(){
+ 	fi
+ 
+ 	unset HOME MAIL USER USERNAME
+-	daemon $prog "$EXTRAOPTIONS"
++	start-stop-daemon --start --quiet --exec $prog -- "$EXTRAOPTIONS"
+ 	RETVAL=$?
+ 	echo
+ 	if test $RETVAL = 0 ; then
+-- 
+1.9.1
+
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 @@
+commit 54875dcb50f5e40fc86d6fe98dde244bfe4751af
+Author: Joe MacDonald <joe_macdonald@mentor.com>
+Date:   Fri Aug 7 15:16:45 2015 -0400
+
+    mcstrans: remove dependency on bash in initscript
+
+    There were no apparent bashisms in mcstrans.init, so remove the dependency
+    on bash.
+
+    Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+---
+ src/mcstrans.init |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/mcstrans.init
++++ b/src/mcstrans.init
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # mcstransd        This starts and stops mcstransd
+ #
-- 
cgit v1.2.3-54-g00ecf