diff --git a/.gitignore b/.gitignore index be9348ee..40632318 100644 --- a/.gitignore +++ b/.gitignore @@ -314,3 +314,5 @@ serefpolicy* /selinux-policy-contrib-ff6d7f4.tar.gz /selinux-policy-contrib-fdc0a2e.tar.gz /selinux-policy-493101e.tar.gz +/selinux-policy-contrib-765b73a.tar.gz +/selinux-policy-8bcb254.tar.gz diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf index 5480f0b7..3c8b5669 100644 --- a/modules-targeted-contrib.conf +++ b/modules-targeted-contrib.conf @@ -2601,13 +2601,6 @@ sbd = module # tlp = module -# Layer: contrib -# Module: ejabberd -# -# ejabberd -# -ejabberd = module - # Layer: contrib # Module: conntrackd # diff --git a/selinux-policy.spec b/selinux-policy.spec index 6f13a051..0b9804d4 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -1,11 +1,11 @@ # github repo with selinux-policy base sources %global git0 https://github.com/fedora-selinux/selinux-policy -%global commit0 493101e12381cd5fc03ef5d5b28ea59f5ea77e36 +%global commit0 8bcb254ccc7d4db69198f130eb064eb834df055f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # github repo with selinux-policy contrib sources %global git1 https://github.com/fedora-selinux/selinux-policy-contrib -%global commit1 fdc0a2e0c507704fdfb15644cdbab41532411df2 +%global commit1 765b73a30143dd95a99f1f41a7a5a6511ebcf12a %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.3 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Base Source: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz @@ -709,6 +709,9 @@ exit 0 %endif %changelog +* Sat Oct 13 2018 Lukas Vrabec - 3.14.3-8 +- ejabberd SELinux module removed, it's shipped by ejabberd-selinux package + * Sat Oct 13 2018 Lukas Vrabec - 3.14.3-7 - Update rpm macros for selinux policy from sources repository: https://github.com/fedora-selinux/selinux-policy-macros diff --git a/sources b/sources index 70d68a63..3bd7a105 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (selinux-policy-contrib-fdc0a2e.tar.gz) = bbbb57b3dfb3c77a2e90d959cb53cd7f52bbbbaa07558b2e5123b6b0bef87f78c6e37055d73fba0b133df2765ee58ab831a33f24681264b76f9f06ebf0b5d73a -SHA512 (selinux-policy-493101e.tar.gz) = 95b717c0bca648ce05125576bfcd92adac1c4090c79f229afbe282875459c0b4914b980cf1fab2734f464936fac4920172e77029fbd563b3d7937dd6b1ed8884 -SHA512 (container-selinux.tgz) = cceb382dec43ab17cef09a5bd063253f934fc7b8ded7a377ab68db03d5a91da5480552a1e9f5f3fd6ee4a0afdb60aead697b51ee733d1a95e79fc2b08c2bed7c +SHA512 (selinux-policy-contrib-765b73a.tar.gz) = 496ecbc450f3eeb95ec40aa9fb98a663c65c293a40494f001d21193f382f6b5fa77594e0d89bdc77187a273f0a5c6a11087ca66938fbd8bd3ee1b0d5900b40ed +SHA512 (selinux-policy-8bcb254.tar.gz) = 8e839d3c17b911397167f9cbe871c41c3263dec98563804ee25f73fa6f6af63fbf4b2830dde9b54132838c8cde543209ad9c7df9e1c3b1618dd84a663a07f0e2 +SHA512 (container-selinux.tgz) = 24ffe763a027b53ec5b6636edddf65797bbb5ac2914869aebc04d451c6ac6012ea83822ec9d127cce71af16b4268f6c25ef351b922fcea9e4345f5845669bece