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

Accepting request 825946 from home:kukuk:selinux

Browse Source 
- macros.selinux-policy: move rpm-state directory to /run and
  make sure it exists

OBS-URL: https://build.opensuse.org/request/show/825946
OBS-URL: https://build.opensuse.org/package/show/security:SELinux/selinux-policy?expand=0&rev=80
This commit is contained in:
Marcus Meissner 2020-08-20 10:56:43 +00:00 committed by Git OBS Bridge
parent 44bfe07756
commit 6410182343
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
macros.selinux-policy
View File

@ -16,6 +16,10 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
## Changes done for openSUSE/SUSE:
## - move /var/lib/rpm-state to /run/rpm-state and create that directory
##
# RPM macros for packages installing SELinux modules # RPM macros for packages installing SELinux modules
%_selinux_policy_version SELINUXPOLICYVERSION %_selinux_policy_version SELINUXPOLICYVERSION
@ -24,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 %{_localstatedir}/lib/rpm-state/file_contexts.pre %_file_context_file_pre /run/rpm-state/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
@ -88,6 +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 \
[ -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 @@
-------------------------------------------------------------------
Tue Aug 11 14:25:58 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
- macros.selinux-policy: move rpm-state directory to /run and
make sure it exists
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 5 11:29:05 UTC 2020 - Thorsten Kukuk <kukuk@suse.com> Wed Aug 5 11:29:05 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>