summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-11-14 09:48:52 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2019-12-19 11:09:21 -0500
commitf6ae2e82ed5756a29b014afa477285775e2c68ac (patch)
treeed1512665c4256f1367c012494dd7b3eff973e6d
parent62ee1a51c20bb82d529bb104e6d21d6fa43ad218 (diff)
downloadmeta-selinux-f6ae2e82ed5756a29b014afa477285775e2c68ac.tar.gz
mcstrans: uprev to 2.9 (20190315)
* Rebase patches Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-security/selinux/mcstrans.inc4
-rw-r--r--recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch23
-rw-r--r--recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch (renamed from recipes-security/selinux/mcstrans/0001-mcstrans-fix-the-init-script.patch)14
-rw-r--r--recipes-security/selinux/mcstrans_2.8.bb7
-rw-r--r--recipes-security/selinux/mcstrans_2.9.bb7
5 files changed, 32 insertions, 23 deletions
diff --git a/recipes-security/selinux/mcstrans.inc b/recipes-security/selinux/mcstrans.inc
index 0eb8720..b9c670b 100644
--- a/recipes-security/selinux/mcstrans.inc
+++ b/recipes-security/selinux/mcstrans.inc
@@ -7,7 +7,7 @@ SECTION = "base"
7LICENSE = "GPLv2+" 7LICENSE = "GPLv2+"
8 8
9SRC_URI += "file://mcstrans-de-bashify.patch \ 9SRC_URI += "file://mcstrans-de-bashify.patch \
10 file://0001-mcstrans-fix-the-init-script.patch \ 10 file://mcstrans-fix-the-init-script.patch \
11" 11"
12 12
13inherit systemd update-rc.d 13inherit systemd update-rc.d
@@ -29,7 +29,7 @@ do_install_append() {
29 else 29 else
30 install -d ${D}${sysconfdir}/default/volatiles 30 install -d ${D}${sysconfdir}/default/volatiles
31 echo "d root root 0755 /var/run/setrans none" \ 31 echo "d root root 0755 /var/run/setrans none" \
32 >${D}${sysconfdir}/default/volatiles/volatiles.80_mcstrans 32 >${D}${sysconfdir}/default/volatiles/80_mcstrans
33 fi 33 fi
34 install -d ${D}${datadir}/mcstrans 34 install -d ${D}${datadir}/mcstrans
35 cp -r share/* ${D}${datadir}/mcstrans/. 35 cp -r share/* ${D}${datadir}/mcstrans/.
diff --git a/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch b/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch
index 805d7e5..27fd677 100644
--- a/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch
+++ b/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch
@@ -1,21 +1,23 @@
1commit 54875dcb50f5e40fc86d6fe98dde244bfe4751af 1From 544b3c078374e5001e7fdc1b7d0b2eafda36f8fe Mon Sep 17 00:00:00 2001
2Author: Joe MacDonald <joe_macdonald@mentor.com> 2From: Joe MacDonald <joe_macdonald@mentor.com>
3Date: Fri Aug 7 15:16:45 2015 -0400 3Date: Fri, 7 Aug 2015 15:16:45 -0400
4Subject: [PATCH] mcstrans: remove dependency on bash in initscript
4 5
5 mcstrans: remove dependency on bash in initscript 6There were no apparent bashisms in mcstrans.init, so remove the
7dependency on bash.
6 8
7 There were no apparent bashisms in mcstrans.init, so remove the dependency 9Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
8 on bash.
9
10 Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
11 10
12Upstream-Status: Pending 11Upstream-Status: Pending
13 12
14Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> 13Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
14Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
15--- 15---
16 src/mcstrans.init | 2 +- 16 src/mcstrans.init | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
18 18
19diff --git a/src/mcstrans.init b/src/mcstrans.init
20index 2804ec0..8b4737d 100644
19--- a/src/mcstrans.init 21--- a/src/mcstrans.init
20+++ b/src/mcstrans.init 22+++ b/src/mcstrans.init
21@@ -1,4 +1,4 @@ 23@@ -1,4 +1,4 @@
@@ -24,3 +26,6 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
24 # 26 #
25 # mcstransd This starts and stops mcstransd 27 # mcstransd This starts and stops mcstransd
26 # 28 #
29--
302.7.4
31
diff --git a/recipes-security/selinux/mcstrans/0001-mcstrans-fix-the-init-script.patch b/recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch
index 5f7163d..79be090 100644
--- a/recipes-security/selinux/mcstrans/0001-mcstrans-fix-the-init-script.patch
+++ b/recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch
@@ -1,17 +1,21 @@
1[PATCH] mcstrans: fix the init script 1From 4d918a9679d2902ca2d41fe769a4d76f07a67b5f Mon Sep 17 00:00:00 2001
2 2From: Roy Li <rongqing.li@windriver.com>
3Upstream-Status: Inappropriate [embedded specific] 3Date: Wed, 6 Nov 2019 22:13:33 +0800
4Subject: [PATCH] mcstrans: fix the init script
4 5
5replace daemon with start-stop-daemon, due to not daemon functions 6replace daemon with start-stop-daemon, due to not daemon functions
6 7
8Upstream-Status: Inappropriate [embedded specific]
9
7Signed-off-by: Roy Li <rongqing.li@windriver.com> 10Signed-off-by: Roy Li <rongqing.li@windriver.com>
8Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> 11Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
12Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
9--- 13---
10 src/mcstrans.init | 2 +- 14 src/mcstrans.init | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
12 16
13diff --git a/src/mcstrans.init b/src/mcstrans.init 17diff --git a/src/mcstrans.init b/src/mcstrans.init
14index 2804ec0..c660290 100644 18index 8b4737d..86c89ea 100644
15--- a/src/mcstrans.init 19--- a/src/mcstrans.init
16+++ b/src/mcstrans.init 20+++ b/src/mcstrans.init
17@@ -51,7 +51,7 @@ start(){ 21@@ -51,7 +51,7 @@ start(){
@@ -24,5 +28,5 @@ index 2804ec0..c660290 100644
24 echo 28 echo
25 if test $RETVAL = 0 ; then 29 if test $RETVAL = 0 ; then
26-- 30--
271.9.1 312.7.4
28 32
diff --git a/recipes-security/selinux/mcstrans_2.8.bb b/recipes-security/selinux/mcstrans_2.8.bb
deleted file mode 100644
index 8923c3c..0000000
--- a/recipes-security/selinux/mcstrans_2.8.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1include selinux_20180524.inc
2include ${BPN}.inc
3
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5
6SRC_URI[md5sum] = "3a0edb2a8b6a255199824abd58c0906c"
7SRC_URI[sha256sum] = "ec6ea65660550ed6bbd2a834725ba7526ac53599753d7b95072e4afd4afc14e4"
diff --git a/recipes-security/selinux/mcstrans_2.9.bb b/recipes-security/selinux/mcstrans_2.9.bb
new file mode 100644
index 0000000..34aab03
--- /dev/null
+++ b/recipes-security/selinux/mcstrans_2.9.bb
@@ -0,0 +1,7 @@
1require selinux_20190315.inc
2require ${BPN}.inc
3
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5
6SRC_URI[md5sum] = "0f70a1eb6565a9f61a017cc408ea4c7a"
7SRC_URI[sha256sum] = "7eddce6ffefc9a26340f2720ba9afd7d041a31569844842d0199bfe27c5efb19"