From ecba8b0d6b628bc4716c3cf6dcf3fe83209b90b4388b0beb9770b51d3a4c4b3c Mon Sep 17 00:00:00 2001 From: Hu Date: Wed, 4 Oct 2023 15:03:23 +0000 Subject: [PATCH] Accepting request 1115645 from home:jsegitz:branches:security:SELinux_3 - Use /var/adm/update-scripts in macros.selinux-policy. The rpm state directory doesn't exist on SUSE systems (bsc#1213593) OBS-URL: https://build.opensuse.org/request/show/1115645 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/selinux-policy?expand=0&rev=192 --- macros.selinux-policy | 4 ++-- selinux-policy.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/macros.selinux-policy b/macros.selinux-policy index 0d8bb2a..77f8aa9 100644 --- a/macros.selinux-policy +++ b/macros.selinux-policy @@ -28,7 +28,7 @@ %_selinux_store_policy_path %{_selinux_store_path}/${_policytype} %_file_context_file %{_sysconfdir}/selinux/${SELINUXTYPE}/contexts/files/file_contexts -%_file_context_file_pre /run/rpm-state/file_contexts.pre +%_file_context_file_pre /var/adm/update-scripts/file_contexts.pre %_file_custom_defined_booleans %{_selinux_store_policy_path}/rpmbooleans.custom %_file_custom_defined_booleans_tmp %{_selinux_store_policy_path}/rpmbooleans.custom.tmp @@ -92,7 +92,7 @@ if %{_sbindir}/selinuxenabled; then \ _policytype="targeted" \ fi \ if [ "${SELINUXTYPE}" = "${_policytype}" ]; then \ - mkdir -p /run/rpm-state \ + mkdir -p $(dirname %{_file_context_file_pre}) \ [ -f %{_file_context_file_pre} ] || cp -f %{_file_context_file} %{_file_context_file_pre} \ fi \ fi \ diff --git a/selinux-policy.changes b/selinux-policy.changes index dc72c9d..81640ad 100644 --- a/selinux-policy.changes +++ b/selinux-policy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 4 14:40:03 UTC 2023 - Johannes Segitz + +- Use /var/adm/update-scripts in macros.selinux-policy. The rpm state + directory doesn't exist on SUSE systems (bsc#1213593) + ------------------------------------------------------------------- Tue Sep 19 07:57:02 UTC 2023 - Johannes Segitz