From a91ae5eebb175aa9dac1205080fe67496dea1415 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 25 2017 16:01:37 +0000 Subject: import container-selinux-2.12-2.gite7096ce.el7 --- diff --git a/.container-selinux.metadata b/.container-selinux.metadata index ea41633..454468d 100644 --- a/.container-selinux.metadata +++ b/.container-selinux.metadata @@ -1 +1 @@ -5534a7174675f7eeaaae1728f6d6f9d399706ee0 SOURCES/container-selinux-7a17443.tar.gz +1bce714abef066a30d7f24209ae52e39eff18d0a SOURCES/container-selinux-e7096ce.tar.gz diff --git a/.gitignore b/.gitignore index 000c092..4a6dc1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/container-selinux-7a17443.tar.gz +SOURCES/container-selinux-e7096ce.tar.gz diff --git a/SPECS/container-selinux.spec b/SPECS/container-selinux.spec index 23bc98f..5dc9ca3 100644 --- a/SPECS/container-selinux.spec +++ b/SPECS/container-selinux.spec @@ -2,7 +2,7 @@ # container-selinux %global git0 https://github.com/projectatomic/%{name} -%global commit0 7a17443e9f13a6cb6c5ae565b49468070f9246dc +%global commit0 e7096ce79b0c00203b3cd233a0ad5fa784081eb7 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # container-selinux stuff (prefix with ds_ for version/release etc.) @@ -24,8 +24,8 @@ Name: container-selinux Epoch: 2 -Version: 2.10 -Release: 2%{?dist} +Version: 2.12 +Release: 2.git%{shortcommit0}%{?dist} License: GPLv2 URL: %{git0} Summary: SELinux policies for container runtimes @@ -94,7 +94,7 @@ fi %postun if [ $1 -eq 0 ]; then -%{_sbindir}/semodule -n -r %{modulenames} docker &> /dev/null || : +%{_sbindir}/semodule -X 200 -n -r %{modulenames} docker &> /dev/null || : if %{_sbindir}/selinuxenabled ; then %{_sbindir}/load_policy %relabel_files @@ -109,6 +109,22 @@ fi %{_datadir}/selinux/* %changelog +* Tue May 09 2017 Lokesh Mandvekar - 2:2.12.2.gite7096ce +- Resolves: #1427335 - remove module on uninstall at priority 200 +- From: Cai Qian + +* Tue May 09 2017 Lokesh Mandvekar - 2:2.12.1.gite7096ce +- use correct version number 2.12 (previous build listed the wrong version) +- Resolves: #1445226 +- built container-selinux RHEL-1.12 branch commit e7096ce + +* Tue May 02 2017 Lokesh Mandvekar - 2:2.10-4.git567c3d2 +- Resolves: #1445226 +- add shortcommit id to release tag + +* Tue May 02 2017 Lokesh Mandvekar - 2:2.10-3 +- bump release tag for 7.3.5 extras + * Mon Mar 20 2017 Dan Walsh - 2:2.10-2 - Make sure we have a late enough version of policycoreutils