diff --git a/.gitignore b/.gitignore index 417dc40f..b395e967 100644 --- a/.gitignore +++ b/.gitignore @@ -393,3 +393,4 @@ serefpolicy* /selinux-policy-da92bd2.tar.gz /selinux-policy-contrib-b7144a2.tar.gz /selinux-policy-cd63aff.tar.gz +/selinux-policy-contrib-e563a8d.tar.gz diff --git a/rpm.macros b/rpm.macros index 3eadcbf7..d86e7291 100644 --- a/rpm.macros +++ b/rpm.macros @@ -54,7 +54,7 @@ if [ -z "${_policytype}" ]; then \ _policytype="targeted" \ fi \ if [ "${SELINUXTYPE}" = "${_policytype}" ]; then \ - %{_sbindir}/semodule -n -s ${_policytype} -X %{!-p:200}%{-p*} -i %* \ + %{_sbindir}/semodule -n -s ${_policytype} -X %{!-p:200}%{-p*} -i %* || : \ %{_sbindir}/selinuxenabled && %{_sbindir}/load_policy || : \ fi \ %{nil} diff --git a/selinux-policy.spec b/selinux-policy.spec index ade1ae36..92982bd2 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -5,7 +5,7 @@ # github repo with selinux-policy contrib sources %global git1 https://github.com/fedora-selinux/selinux-policy-contrib -%global commit1 b7144a2bc612b9d65145ed485fe1531c064a9ce3 +%global commit1 e563a8d1d64f11841d6e5f7cca6ecddbdb9a0123 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %define distro redhat @@ -29,7 +29,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 3.14.4 -Release: 28%{?dist} +Release: 29%{?dist} License: GPLv2+ Source: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz Source29: %{git1}/archive/%{commit1}/%{name}-contrib-%{shortcommit1}.tar.gz @@ -787,6 +787,11 @@ exit 0 %endif %changelog +* Wed Aug 07 2019 Lukas Vrabec - 3.14.4-29 +- Allow dlm_controld_t domain setgid capability +- Fix SELinux modules not installing in chroots. +Resolves: rhbz#1665643 + * Tue Aug 06 2019 Lukas Vrabec - 3.14.4-28 - Allow systemd to create and bindmount dirs. BZ(1734831) diff --git a/sources b/sources index 435bf841..24c56cfa 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (selinux-policy-cd63aff.tar.gz) = a6b92f5800371c1726f0c8f386f3352f564c52c9ed4a5ecde09a6141fabc657ca44020c34a13c9cd592ec3411c462ced80d74ad77a8403dcad08eec3cdc02136 -SHA512 (selinux-policy-contrib-b7144a2.tar.gz) = 4f175b59918bc3aabc3ee8c9a38a875078d8f01bfcd5c4e48e4ffd2d80c311e5eb4766cc227f495f0363dfdd9c71bdb63c187c8b74c2b419eb6af85b95eac37d -SHA512 (container-selinux.tgz) = 97e2a34798b59816e8b50a01a4d086b94c14a2b77b5f3b4c638c06d0713bf8352ad4b068eefce1b71e6acd96039f761d68330aefaf56d235ac2e3d6204960dfb +SHA512 (selinux-policy-contrib-e563a8d.tar.gz) = 5eb6bdc884b13e94a7a0b91a8e496ffa1a731a87e1362ff571e748129d95f9abd8ed39ff9d1453e062a2a7e78ee36978ce0734fd3e58155b8147e7048ff4107e SHA512 (macro-expander) = 243ee49f1185b78ac47e56ca9a3f3592f8975fab1a2401c0fcc7f88217be614fe31805bacec602b728e7fcfc21dcc17d90e9a54ce87f3a0c97624d9ad885aea4 +SHA512 (container-selinux.tgz) = b7c4030cc1d3f07c6cfe9ab6cf1b50c571301531866a7e1d44061cff777230acf9bfadbe11929baf4f8a7da74a0ad0f46139fcb0d6039cf1435915f4aab59592