pool/selinux-policy
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1115645 from home:jsegitz:branches:security:SELinux_3

Browse Source 
- 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
This commit is contained in:
Cathy Hu 2023-10-04 15:03:23 +00:00 committed by Git OBS Bridge
parent fe4723a538
commit ecba8b0d6b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macros.selinux-policy
View File

@ -28,7 +28,7 @@
%_selinux_store_policy_path %{_selinux_store_path}/${_policytype} %_selinux_store_policy_path %{_selinux_store_path}/${_policytype}
%_file_context_file %{_sysconfdir}/selinux/${SELINUXTYPE}/contexts/files/file_contexts %_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 %{_selinux_store_policy_path}/rpmbooleans.custom
%_file_custom_defined_booleans_tmp %{_selinux_store_policy_path}/rpmbooleans.custom.tmp %_file_custom_defined_booleans_tmp %{_selinux_store_policy_path}/rpmbooleans.custom.tmp
@ -92,7 +92,7 @@ if %{_sbindir}/selinuxenabled; then \
_policytype="targeted" \ _policytype="targeted" \
fi \ fi \
if [ "${SELINUXTYPE}" = "${_policytype}" ]; then \ 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} \ [ -f %{_file_context_file_pre} ] || cp -f %{_file_context_file} %{_file_context_file_pre} \
fi \ fi \
fi \ fi \

6
selinux-policy.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 4 14:40:03 UTC 2023 - Johannes Segitz <jsegitz@suse.com>
- 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 <jsegitz@suse.com> Tue Sep 19 07:57:02 UTC 2023 - Johannes Segitz <jsegitz@suse.com>