From f993349d779178a6a686879a055e54fadf50e3da Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 27 Mar 2017 17:00:43 -0700
Subject: [PATCH] Put tomcat_t back in unconfined domains for now. BZ(1436434)

---
 policy-rawhide-contrib.patch | 13 +++++++++++--
 selinux-policy.spec          |  5 ++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/policy-rawhide-contrib.patch b/policy-rawhide-contrib.patch
index 7111dab0..f406fdca 100644
--- a/policy-rawhide-contrib.patch
+++ b/policy-rawhide-contrib.patch
@@ -110363,10 +110363,10 @@ index 0000000..e5cec8f
 +')
 diff --git a/tomcat.te b/tomcat.te
 new file mode 100644
-index 0000000..3bc263e
+index 0000000..5a263b2
 --- /dev/null
 +++ b/tomcat.te
-@@ -0,0 +1,60 @@
+@@ -0,0 +1,69 @@
 +policy_module(tomcat, 1.0.0)
 +
 +########################################
@@ -110381,6 +110381,15 @@ index 0000000..3bc263e
 +type tomcat_unit_file_t;
 +systemd_unit_file(tomcat_unit_file_t)
 +
++#######################################
++#
++# tomcat local policy
++#
++
++optional_policy(`
++	unconfined_domain(tomcat_t)
++')
++
 +########################################
 +#
 +# tomcat domain local policy
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 637f5e2b..3f746d76 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -19,7 +19,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.13.1
-Release: 247%{?dist}
+Release: 248%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -682,6 +682,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Mar 27 2017 Adam Williamson <awilliam@redhat.com> - 3.13.1-248
+- Put tomcat_t back in unconfined domains for now. BZ(1436434)
+
 * Tue Mar 21 2017 Lukas Vrabec  <lvrabec@redhat.com> - 3.13.1-247
 - Make fwupd_var_lib_t type mountpoint. BZ(1429341)
 - Remove tomcat_t domain from unconfined domains