Skip to contentSkip to conversation

refpolicy: backport build fix

PATCH In review [email protected] 2 participants 2 messages Jun 25, 2024 – Jun 27, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 refpolicy: backport build fix

From: Etienne Cordonnier <[email protected]>

---
 ...-selinuxutil-make-policykit-optional.patch | 36 +++++++++++++++++++
 .../refpolicy/refpolicy_common.inc            |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 recipes-security/refpolicy/refpolicy/0057-selinuxutil-make-policykit-optional.patch
recipes-security/refpolicy/refpolicy/0057-selinuxutil-make-policykit-optional.patch new file +36 -0
new file mode 100644
index 0000000..62b35d5
@@ -0,0 +1,36 @@
+From 0f997a134adb6c68d871a31ec27d63f02297c588 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+Date: Wed, 5 Jun 2024 10:32:34 +0800
+Subject: [PATCH] selinuxutil: make policykit optional
+
+Make policykit optional to avoid a potential build error.
+
+Upstream-Status: Backport [https://github.com/SELinuxProject/refpolicy/commit/c6dd4087def22fa0f3e2b62bce5fc531bbf824a0]
+
+Signed-off-by: Yi Zhao <[email protected]>
+Signed-off-by: Etienne Cordonnier <[email protected]>
+---
+ policy/modules/system/selinuxutil.te | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/policy/modules/system/selinuxutil.te b/policy/modules/system/selinuxutil.te
+index 57c2e0e01..c65d5e8e6 100644
+--- a/policy/modules/system/selinuxutil.te
++++ b/policy/modules/system/selinuxutil.te
+@@ -501,12 +501,14 @@ corecmd_exec_bin(selinux_dbus_t)
+ files_read_etc_symlinks(selinux_dbus_t)
+ files_list_usr(selinux_dbus_t)
+ 
+-policykit_dbus_chat(selinux_dbus_t)
+-
+ miscfiles_read_localization(selinux_dbus_t)
+ 
+ seutil_domtrans_semanage(selinux_dbus_t)
+ 
++optional_policy(`
++	policykit_dbus_chat(selinux_dbus_t)
++')
++
+ ########################################
+ #
+ # semodule local policy
recipes-security/refpolicy/refpolicy_common.inc +1 -0
index 6ea1fc2..0f5fe1b 100644
@@ -72,6 +72,7 @@ SRC_URI += " \
         file://0054-policy-modules-system-setrans-allow-setrans_t-use-fd.patch \
         file://0055-policy-modules-system-systemd-make-_systemd_t-MLS-tr.patch \
         file://0056-policy-modules-system-logging-make-syslogd_runtime_t.patch \
+        file://0057-selinuxutil-make-policykit-optional.patch \
         "
 
 S = "${WORKDIR}/refpolicy"
Signature · 1 line
2.36.1.vfs.0.0
#1 lore raw

This has been fixed in https://git.yoctoproject.org/meta-selinux/commit/?h=scarthgap&id=17c7cd46219e74bf7404dca23b9b9f6380e2d3c0

//Yi

Quoted 63 lines · Etienne Cordonnier via lists.yoctoproject.org

From: Etienne Cordonnier <[email protected]>

---
  ...-selinuxutil-make-policykit-optional.patch | 36 +++++++++++++++++++
  .../refpolicy/refpolicy_common.inc            |  1 +
  2 files changed, 37 insertions(+)

create mode 100644 recipes-security/refpolicy/refpolicy/0057-selinuxutil-make-policykit-optional.patch

recipes-security/refpolicy/refpolicy/0057-selinuxutil-make-policykit-optional.patch new file +36 -0
new file mode 100644
index 0000000..62b35d5
@@ -0,0 +1,36 @@
+From 0f997a134adb6c68d871a31ec27d63f02297c588 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+Date: Wed, 5 Jun 2024 10:32:34 +0800
+Subject: [PATCH] selinuxutil: make policykit optional
+
+Make policykit optional to avoid a potential build error.
+
+Upstream-Status: Backport [https://github.com/SELinuxProject/refpolicy/commit/c6dd4087def22fa0f3e2b62bce5fc531bbf824a0]
+
+Signed-off-by: Yi Zhao <[email protected]>
+Signed-off-by: Etienne Cordonnier <[email protected]>
+---
+ policy/modules/system/selinuxutil.te | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/policy/modules/system/selinuxutil.te b/policy/modules/system/selinuxutil.te
+index 57c2e0e01..c65d5e8e6 100644
+--- a/policy/modules/system/selinuxutil.te
++++ b/policy/modules/system/selinuxutil.te
+@@ -501,12 +501,14 @@ corecmd_exec_bin(selinux_dbus_t)
+ files_read_etc_symlinks(selinux_dbus_t)
+ files_list_usr(selinux_dbus_t)
+
+-policykit_dbus_chat(selinux_dbus_t)
+-
+ miscfiles_read_localization(selinux_dbus_t)
+
+ seutil_domtrans_semanage(selinux_dbus_t)
+
++optional_policy(`
++	policykit_dbus_chat(selinux_dbus_t)
++')
++
+ ########################################
+ #
+ # semodule local policy
recipes-security/refpolicy/refpolicy_common.inc +1 -0
index 6ea1fc2..0f5fe1b 100644
@@ -72,6 +72,7 @@ SRC_URI += " \
          file://0054-policy-modules-system-setrans-allow-setrans_t-use-fd.patch \
          file://0055-policy-modules-system-systemd-make-_systemd_t-MLS-tr.patch \
          file://0056-policy-modules-system-logging-make-syslogd_runtime_t.patch \
+        file://0057-selinuxutil-make-policykit-optional.patch \
          "
 
  S = "${WORKDIR}/refpolicy"