From b4385b6746f618aed3ff0afbfcc660e53ce00845 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Sat, 11 Mar 2023 21:13:02 +0800
Subject: mcstrans: upgrade 3.4 -> 3.5

License-Update: Rename COPYING to LICENSE. No content changes.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
---
 recipes-security/selinux/mcstrans_3.4.bb | 58 --------------------------------
 recipes-security/selinux/mcstrans_3.5.bb | 58 ++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 58 deletions(-)
 delete mode 100644 recipes-security/selinux/mcstrans_3.4.bb
 create mode 100644 recipes-security/selinux/mcstrans_3.5.bb

diff --git a/recipes-security/selinux/mcstrans_3.4.bb b/recipes-security/selinux/mcstrans_3.4.bb
deleted file mode 100644
index b5d6b54..0000000
--- a/recipes-security/selinux/mcstrans_3.4.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-
-SUMMARY = "Daemon to translate SELinux MCS/MLS sensitivity labels"
-DESCRIPTION = "\
-mcstrans provides an translation daemon to translate SELinux categories \
-from internal representations to user defined representation."
-SECTION = "base"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-require selinux_common.inc
-
-inherit pkgconfig systemd update-rc.d
-
-SRC_URI += "file://mcstrans-de-bashify.patch \
-            file://mcstrans-fix-the-init-script.patch \
-           "
-
-DEPENDS = "libsepol libselinux libcap"
-
-EXTRA_OEMAKE = "SBINDIR=${base_sbindir} \
-                INITDIR=${sysconfdir}/init.d \
-                SYSTEMDDIR=${systemd_unitdir} \
-               "
-
-S = "${WORKDIR}/git/mcstrans"
-
-do_install:append() {
-    install -d ${D}${sbindir}
-    install -m 755 utils/untranscon ${D}${sbindir}/
-    install -m 755 utils/transcon ${D}${sbindir}/
-
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-        install -d ${D}${sysconfdir}/tmpfiles.d
-        echo "d ${localstatedir}/run/setrans - - - -" \
-            > ${D}${sysconfdir}/tmpfiles.d/setrans.conf
-    else
-        install -d ${D}${sysconfdir}/default/volatiles
-        echo "d root root 0755 /var/run/setrans none" \
-            >${D}${sysconfdir}/default/volatiles/80_mcstrans
-    fi
-    install -d ${D}${datadir}/mcstrans
-    cp -r share/* ${D}${datadir}/mcstrans/.
-}
-
-SYSTEMD_SERVICE:mcstrans = "mcstrans.service"
-INITSCRIPT_PACKAGES = "mcstrans"
-INITSCRIPT_NAME:mcstrans = "mcstrans"
-INITSCRIPT_PARAMS:mcstrans = "defaults"
-
-pkg_postinst:mcstrans () {
-    if [ -z "$D" ]; then
-        if command -v systemd-tmpfiles >/dev/null; then
-            systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/setrans.conf
-        elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
-            ${sysconfdir}/init.d/populate-volatile.sh update
-        fi
-    fi
-}
diff --git a/recipes-security/selinux/mcstrans_3.5.bb b/recipes-security/selinux/mcstrans_3.5.bb
new file mode 100644
index 0000000..4a8482f
--- /dev/null
+++ b/recipes-security/selinux/mcstrans_3.5.bb
@@ -0,0 +1,58 @@
+
+SUMMARY = "Daemon to translate SELinux MCS/MLS sensitivity labels"
+DESCRIPTION = "\
+mcstrans provides an translation daemon to translate SELinux categories \
+from internal representations to user defined representation."
+SECTION = "base"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+require selinux_common.inc
+
+inherit pkgconfig systemd update-rc.d
+
+SRC_URI += "file://mcstrans-de-bashify.patch \
+            file://mcstrans-fix-the-init-script.patch \
+           "
+
+DEPENDS = "libsepol libselinux libcap"
+
+EXTRA_OEMAKE = "SBINDIR=${base_sbindir} \
+                INITDIR=${sysconfdir}/init.d \
+                SYSTEMDDIR=${systemd_unitdir} \
+               "
+
+S = "${WORKDIR}/git/mcstrans"
+
+do_install:append() {
+    install -d ${D}${sbindir}
+    install -m 755 utils/untranscon ${D}${sbindir}/
+    install -m 755 utils/transcon ${D}${sbindir}/
+
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/tmpfiles.d
+        echo "d ${localstatedir}/run/setrans - - - -" \
+            > ${D}${sysconfdir}/tmpfiles.d/setrans.conf
+    else
+        install -d ${D}${sysconfdir}/default/volatiles
+        echo "d root root 0755 /var/run/setrans none" \
+            >${D}${sysconfdir}/default/volatiles/80_mcstrans
+    fi
+    install -d ${D}${datadir}/mcstrans
+    cp -r share/* ${D}${datadir}/mcstrans/.
+}
+
+SYSTEMD_SERVICE:mcstrans = "mcstrans.service"
+INITSCRIPT_PACKAGES = "mcstrans"
+INITSCRIPT_NAME:mcstrans = "mcstrans"
+INITSCRIPT_PARAMS:mcstrans = "defaults"
+
+pkg_postinst:mcstrans () {
+    if [ -z "$D" ]; then
+        if command -v systemd-tmpfiles >/dev/null; then
+            systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/setrans.conf
+        elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
+            ${sysconfdir}/init.d/populate-volatile.sh update
+        fi
+    fi
+}
-- 
cgit v1.2.3-54-g00ecf