From 420efa1ba2b8358f452f5316b92bb637dfc42f2c Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Sun, 28 Aug 2022 10:29:28 +0800
Subject: restorecond: upgrade 3.3 -> 3.4

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

diff --git a/recipes-security/selinux/restorecond_3.3.bb b/recipes-security/selinux/restorecond_3.3.bb
deleted file mode 100644
index ee1cb44..0000000
--- a/recipes-security/selinux/restorecond_3.3.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY = "Daemon to watch for file creation and set default file context"
-DESCRIPTION = "\
-The restorecond daemon uses inotify to watch files listed in the \
-/etc/selinux/restorecond.conf, when they are created, this daemon \
-will make sure they have the correct file context associated with \
-the policy."
-SECTION = "base"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-require selinux_common.inc
-
-inherit systemd update-rc.d
-
-DEPENDS += "libsepol libselinux libpcre dbus-glib glib-2.0 pkgconfig-native"
-
-EXTRA_OEMAKE += "SYSTEMDSYSTEMUNITDIR=${systemd_system_unitdir} \
-                 SYSTEMDUSERUNITDIR=${systemd_user_unitdir} \
-                "
-
-S = "${WORKDIR}/git/restorecond"
-
-FILES:${PN} += "${datadir}/dbus-1/services/org.selinux.Restorecond.service \
-                ${systemd_user_unitdir}/* \
-               "
-
-SYSTEMD_SERVICE:restorecond = "restorecond.service"
-INITSCRIPT_PACKAGES = "restorecond"
-INITSCRIPT_NAME:restorecond = "restorecond"
-INITSCRIPT_PARAMS:restorecond = "defaults"
-
-do_install:append() {
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'false', 'true', d)}; then
-        # remove /usr/lib/systemd/user
-        rm -rf ${D}${nonarch_libdir}
-    fi
-}
diff --git a/recipes-security/selinux/restorecond_3.4.bb b/recipes-security/selinux/restorecond_3.4.bb
new file mode 100644
index 0000000..5b690d8
--- /dev/null
+++ b/recipes-security/selinux/restorecond_3.4.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Daemon to watch for file creation and set default file context"
+DESCRIPTION = "\
+The restorecond daemon uses inotify to watch files listed in the \
+/etc/selinux/restorecond.conf, when they are created, this daemon \
+will make sure they have the correct file context associated with \
+the policy."
+SECTION = "base"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+require selinux_common.inc
+
+inherit pkgconfig systemd update-rc.d
+
+DEPENDS = "libsepol libselinux glib-2.0"
+
+EXTRA_OEMAKE = "SYSTEMDSYSTEMUNITDIR=${systemd_system_unitdir} \
+                 SYSTEMDUSERUNITDIR=${systemd_user_unitdir} \
+                "
+
+S = "${WORKDIR}/git/restorecond"
+
+FILES:${PN} += "${datadir}/dbus-1/services/org.selinux.Restorecond.service \
+                ${systemd_user_unitdir}/* \
+               "
+
+SYSTEMD_SERVICE:restorecond = "restorecond.service"
+INITSCRIPT_PACKAGES = "restorecond"
+INITSCRIPT_NAME:restorecond = "restorecond"
+INITSCRIPT_PARAMS:restorecond = "defaults"
+
+do_install:append() {
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'false', 'true', d)}; then
+        # remove /usr/lib/systemd/user
+        rm -rf ${D}${nonarch_libdir}
+    fi
+}
-- 
cgit v1.2.3-54-g00ecf