From d8d6ac6a5de6cc37e61ed48ea3a91c138bc4d213 Mon Sep 17 00:00:00 2001 From: Wenzong Fan 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 Update policycoreutils_git.bb Signed-off-by: Mark Hatle --- .../0001-mcstrans-fix-the-init-script.patch | 27 ---------------------- .../selinux/policycoreutils/enable-mcstrans.patch | 17 -------------- .../policycoreutils/mcstrans-de-bashify.patch | 12 ---------- 3 files changed, 56 deletions(-) delete mode 100644 recipes-security/selinux/policycoreutils/0001-mcstrans-fix-the-init-script.patch delete mode 100644 recipes-security/selinux/policycoreutils/enable-mcstrans.patch delete mode 100644 recipes-security/selinux/policycoreutils/mcstrans-de-bashify.patch (limited to 'recipes-security/selinux/policycoreutils') 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 @@ -[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 ---- - mcstrans/src/mcstrans.init | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mcstrans/src/mcstrans.init b/mcstrans/src/mcstrans.init -index 2804ec0..c660290 100644 ---- a/mcstrans/src/mcstrans.init -+++ b/mcstrans/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/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 @@ -Add the "mcstrans" subdir so it gets built too. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Roy Li -diff --git a/Makefile b/Makefile -index 83ebd45..3ae784f 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,7 @@ - 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 - -+SUBDIRS += mcstrans -+ - INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) - - 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 @@ ---- - mcstrans/src/mcstrans.init | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/mcstrans/src/mcstrans.init -+++ b/mcstrans/src/mcstrans.init -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # mcstransd This starts and stops mcstransd - # -- cgit v1.2.3-54-g00ecf