From f6ae2e82ed5756a29b014afa477285775e2c68ac Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 14 Nov 2019 09:48:52 +0800 Subject: mcstrans: uprev to 2.9 (20190315) * Rebase patches Signed-off-by: Yi Zhao Signed-off-by: Joe MacDonald --- recipes-security/selinux/mcstrans.inc | 4 +-- .../0001-mcstrans-fix-the-init-script.patch | 28 ------------------- .../selinux/mcstrans/mcstrans-de-bashify.patch | 23 ++++++++++------ .../mcstrans/mcstrans-fix-the-init-script.patch | 32 ++++++++++++++++++++++ recipes-security/selinux/mcstrans_2.8.bb | 7 ----- recipes-security/selinux/mcstrans_2.9.bb | 7 +++++ 6 files changed, 55 insertions(+), 46 deletions(-) delete mode 100644 recipes-security/selinux/mcstrans/0001-mcstrans-fix-the-init-script.patch create mode 100644 recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch delete mode 100644 recipes-security/selinux/mcstrans_2.8.bb create mode 100644 recipes-security/selinux/mcstrans_2.9.bb 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" LICENSE = "GPLv2+" SRC_URI += "file://mcstrans-de-bashify.patch \ - file://0001-mcstrans-fix-the-init-script.patch \ + file://mcstrans-fix-the-init-script.patch \ " inherit systemd update-rc.d @@ -29,7 +29,7 @@ do_install_append() { else install -d ${D}${sysconfdir}/default/volatiles echo "d root root 0755 /var/run/setrans none" \ - >${D}${sysconfdir}/default/volatiles/volatiles.80_mcstrans + >${D}${sysconfdir}/default/volatiles/80_mcstrans fi install -d ${D}${datadir}/mcstrans cp -r share/* ${D}${datadir}/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 deleted file mode 100644 index 5f7163d..0000000 --- a/recipes-security/selinux/mcstrans/0001-mcstrans-fix-the-init-script.patch +++ /dev/null @@ -1,28 +0,0 @@ -[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 -Signed-off-by: Wenzong Fan ---- - 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 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 @@ -commit 54875dcb50f5e40fc86d6fe98dde244bfe4751af -Author: Joe MacDonald -Date: Fri Aug 7 15:16:45 2015 -0400 +From 544b3c078374e5001e7fdc1b7d0b2eafda36f8fe Mon Sep 17 00:00:00 2001 +From: Joe MacDonald +Date: Fri, 7 Aug 2015 15:16:45 -0400 +Subject: [PATCH] mcstrans: remove dependency on bash in initscript - mcstrans: remove dependency on bash in initscript +There were no apparent bashisms in mcstrans.init, so remove the +dependency on bash. - There were no apparent bashisms in mcstrans.init, so remove the dependency - on bash. - - Signed-off-by: Joe MacDonald +Signed-off-by: Joe MacDonald Upstream-Status: Pending Signed-off-by: Wenzong Fan +Signed-off-by: Yi Zhao --- - src/mcstrans.init | 2 +- + src/mcstrans.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/src/mcstrans.init b/src/mcstrans.init +index 2804ec0..8b4737d 100644 --- a/src/mcstrans.init +++ b/src/mcstrans.init @@ -1,4 +1,4 @@ @@ -24,3 +26,6 @@ Signed-off-by: Wenzong Fan # # mcstransd This starts and stops mcstransd # +-- +2.7.4 + diff --git a/recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch b/recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch new file mode 100644 index 0000000..79be090 --- /dev/null +++ b/recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch @@ -0,0 +1,32 @@ +From 4d918a9679d2902ca2d41fe769a4d76f07a67b5f Mon Sep 17 00:00:00 2001 +From: Roy Li +Date: Wed, 6 Nov 2019 22:13:33 +0800 +Subject: [PATCH] mcstrans: fix the init script + +replace daemon with start-stop-daemon, due to not daemon functions + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Roy Li +Signed-off-by: Wenzong Fan +Signed-off-by: Yi Zhao +--- + src/mcstrans.init | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mcstrans.init b/src/mcstrans.init +index 8b4737d..86c89ea 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 +-- +2.7.4 + 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 @@ -include selinux_20180524.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI[md5sum] = "3a0edb2a8b6a255199824abd58c0906c" -SRC_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 @@ +require selinux_20190315.inc +require ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI[md5sum] = "0f70a1eb6565a9f61a017cc408ea4c7a" +SRC_URI[sha256sum] = "7eddce6ffefc9a26340f2720ba9afd7d041a31569844842d0199bfe27c5efb19" -- cgit v1.2.3-54-g00ecf