From 5e33c4c882e0956336f51bcdefe70ba19d8d13af Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 28 2017 15:13:12 +0000 Subject: import container-selinux-2.19-2.1.el7 --- diff --git a/.container-selinux.metadata b/.container-selinux.metadata index 454468d..c55ecd9 100644 --- a/.container-selinux.metadata +++ b/.container-selinux.metadata @@ -1 +1 @@ -1bce714abef066a30d7f24209ae52e39eff18d0a SOURCES/container-selinux-e7096ce.tar.gz +8a7b53253c8d1616eb868edc8796da0bd4ec9db3 SOURCES/container-selinux-1f34237.tar.gz diff --git a/.gitignore b/.gitignore index 4a6dc1f..6de4e9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/container-selinux-e7096ce.tar.gz +SOURCES/container-selinux-1f34237.tar.gz diff --git a/SPECS/container-selinux.spec b/SPECS/container-selinux.spec index 5dc9ca3..d2f2a77 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 e7096ce79b0c00203b3cd233a0ad5fa784081eb7 +%global commit0 1f34237f9f8ece246bd3122a1d90f27379bdf687 %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.12 -Release: 2.git%{shortcommit0}%{?dist} +Version: 2.19 +Release: 2.1%{?dist} License: GPLv2 URL: %{git0} Summary: SELinux policies for container runtimes @@ -94,7 +94,7 @@ fi %postun if [ $1 -eq 0 ]; then -%{_sbindir}/semodule -X 200 -n -r %{modulenames} docker &> /dev/null || : +%{_sbindir}/semodule -n -r %{modulenames} docker &> /dev/null || : if %{_sbindir}/selinuxenabled ; then %{_sbindir}/load_policy %relabel_files @@ -109,23 +109,20 @@ 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 +* Wed Jun 14 2017 Lokesh Mandvekar - 2:2.19-2.1 +- update release tag to isolate from 7.3 -* 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 +* Wed Jun 14 2017 Dan Walsh - 2:2.19-1 +- Fix mcs transition problem on stdin/stdout/stderr +- Add labels for CRI-O +- Allow containers to use tunnel sockets -* Tue May 02 2017 Lokesh Mandvekar - 2:2.10-4.git567c3d2 -- Resolves: #1445226 -- add shortcommit id to release tag +* Tue Jun 06 2017 Lokesh Mandvekar - 2:2.15-1.1 +- Resolves: #1451289 +- rebase to v2.15 +- built @origin/RHEL-1.12 commit 583ca40 -* 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 +* Mon Mar 20 2017 Dan Walsh - 2:2.10-2.1 - Make sure we have a late enough version of policycoreutils * Mon Mar 6 2017 Dan Walsh - 2:2.10-1