From be54b1d5ac637d793f4745dd8fc01bca7038628e Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon, 16 Jul 2018 12:16:01 -0400
Subject: [PATCH] Add labels for /var/lib/origin directory

Add container_file_t as a customizable_type

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 .gitignore             |  4 ++++
 container-selinux.spec | 14 +++++++++++---
 sources                |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8058813..a80c699 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,4 +56,8 @@
 /container-selinux-dfaf8fd.tar.gz
 /container-selinux-8ecc282.tar.gz
 /container-selinux-0407867.tar.gz
+<<<<<<< Updated upstream
 /container-selinux-042f7cf.tar.gz
+=======
+/container-selinux-25277c8.tar.gz
+>>>>>>> Stashed changes
diff --git a/container-selinux.spec b/container-selinux.spec
index 67b0b8a..14d6d71 100644
--- a/container-selinux.spec
+++ b/container-selinux.spec
@@ -3,7 +3,7 @@
 # container-selinux
 %global git0 https://github.com/projectatomic/container-selinux
 %if 0%{?fedora} || 0%{?rhel} > 7
-%global commit0 042f7cf69af273963d7965bb511f4ffa4049bca0
+%global commit0 25277c867c16433c505a22840bbe90e4902a1f69
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %else
 # use upstream's RHEL-1.12 branch for CentOS 7
@@ -36,8 +36,8 @@ Name: container-selinux
 %if 0%{?fedora} || 0%{?centos} || 0%{?rhel} > 7
 Epoch: 2
 %endif
-Version: 2.67
-Release: 3.dev.git%{shortcommit0}%{?dist}
+Version: 2.68
+Release: 1.git%{shortcommit0}%{?dist}
 License: GPLv2
 URL: %{git0}
 Summary: SELinux policies for container runtimes
@@ -62,6 +62,7 @@ Requires(post): policycoreutils-python-utils
 Requires(post): policycoreutils-python
 %endif
 Requires(post): libselinux-utils
+Requires(post): sed
 Obsoletes: %{name} <= 2:1.12.5-13
 Obsoletes: docker-selinux <= 2:1.12.4-28
 Provides: docker-selinux = %{epoch}:%{version}-%{release}
@@ -109,6 +110,9 @@ 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
@@ -127,6 +131,10 @@ fi
 %{_datadir}/selinux/*
 
 %changelog
+* Mon Jul 16 2018 Dan Walsh <dwalsh@fedoraproject.org> - 2.67-1
+- Add label for /var/lib/origin
+- Add customizable_file_t to customizable_types
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.67-3.dev.git042f7cf
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index b8647c5..5acc311 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (container-selinux-042f7cf.tar.gz) = 9a8bf256d574762a88ae8b8ff4634a51a202ce5b5e90187c3caf928827d4fb485719041da530f6fb42d6888eab24d2907d97dd85dfa0e4277e6f080e38dc78f7
+SHA512 (container-selinux-25277c8.tar.gz) = b75d2f255cde830eeea4b081528289fd005b51622c6a6d6336dca4cd97a86bd0ae2b34880110ca3e2b06a405e496f3b302130e98cb89d379bae9cc0a79c38366