From 9c6e2a8afbdd140ce56dba7cd06a51dc0f0a7493 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 16 2018 15:45:29 +0000 Subject: import container-selinux-2.68-1.el7 --- diff --git a/.container-selinux.metadata b/.container-selinux.metadata index bc4f7a1..32c6b7a 100644 --- a/.container-selinux.metadata +++ b/.container-selinux.metadata @@ -1 +1 @@ -2549409a31dfae4c65b28bf6169a88037917598d SOURCES/container-selinux-dfb449b.tar.gz +355f0da45919fcb1faaff58acfc1149bbfc6cb97 SOURCES/container-selinux-b470fa2.tar.gz diff --git a/.gitignore b/.gitignore index 28fd921..9b37480 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/container-selinux-dfb449b.tar.gz +SOURCES/container-selinux-b470fa2.tar.gz diff --git a/SPECS/container-selinux.spec b/SPECS/container-selinux.spec index 7a45e15..2c63312 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 dfb449b771ca4977bb7d5fb6cd7be3cfc14d6fca +%global commit0 b470fa275ac57bfa2a82e3526291881dfcab6e44 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # container-selinux stuff (prefix with ds_ for version/release etc.) @@ -24,7 +24,7 @@ Name: container-selinux Epoch: 2 -Version: 2.66 +Version: 2.68 Release: 1%{?dist} License: GPLv2 URL: %{git0} @@ -47,6 +47,7 @@ Requires(post): policycoreutils-python-utils Requires(post): policycoreutils-python %endif Requires(post): libselinux-utils +Requires(post): sed Obsoletes: %{name} <= 2:1.12.5-14 Obsoletes: docker-selinux <= 2:1.12.4-28 Provides: docker-selinux = %{epoch}:%{version}-%{release} @@ -91,6 +92,8 @@ if %{_sbindir}/selinuxenabled ; then restorecon -R %{_sharedstatedir}/docker &> /dev/null || : fi fi +. %{_sysconfdir}/selinux/config +sed -e "\|container_file_t|h; \${x;s|container_file_t||;{g;t};a\\" -e "container_file_t" -e "}" -i /etc/selinux/${SELINUXTYPE}/contexts/customizable_types %postun if [ $1 -eq 0 ]; then @@ -109,6 +112,13 @@ fi %{_datadir}/selinux/* %changelog +* Mon Jul 16 2018 Dan Walsh - 2.68-1 +- Add label for /var/lib/origin +- Add customizable_file_t to customizable_types + +* Sun Jul 15 2018 Dan Walsh - 2.67-1 +- Add policy for container_logreader_t + * Thu Jun 14 2018 Dan Walsh - 2.66-1 - Allow dnsmasq to dbus chat with spc_t