From 8d3fc995d828c673e9e7535cac397ddee95ee0ee Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Thu, 12 Mar 2015 15:20:16 +0000
Subject: [PATCH] Update policies to be compatible with RHEL7

---
 roles/distgit/files/upload_cgi.pp | Bin 65035 -> 64835 bytes
 roles/distgit/files/upload_cgi.te |  14 ++++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/roles/distgit/files/upload_cgi.pp b/roles/distgit/files/upload_cgi.pp
index 2b472f7aab7528d7644f8748686e26673455c161..870267272e687467412dc8b8c3d06e39d6748c26 100644
GIT binary patch
delta 244
zcmeDF!+iJ`vrzy4nxBje3=B*_ECR$^o=y~UWHHn;aG1>4FT62JOk0Z$D4dd6oS2l8
z3SzPXacUlj#{y)r195g{P7a98v3ZqtI}a-_kjXpQ%%YYDBnaYx6l~sX;mfqyz<Mgv
zBx?nM^vsg@;^d;tf|B@>+=BR$%|~tJ92g}h3)DML?za+|Jim@(vU8os<n8sTn|IWU
zb29$le4)dGkx_o~#4d@=hF#NGCa>?40AqhEfyn~>4x5AfSFvuEom$B#A^@}!!-B49
Gjp+c27EEXW

delta 269
zcmX^7i@Ey`vrzy4nxBje3=B*_ECR$e&n5~vvKZ(YI81iz6W*95rme*R6i&%3PE5*4
zWdkzVfjBh}#A5-nSb;b@GbabcX4||<yPb!X2gu}^Y-UlrdB24()8vJ=3Ie4CIr)hx
z@yY3#@g=zh@g<vitfw+<zGy4wz$iWWL+x@#j>(SJ!jt*yd04|4!WaZ5E7aS=#W+|&
z)-p{NXmpwUr!HmlpE_|)=D+_LC*SK;ocz9yXL5cW@8*CG9>&Q!ol=|2I;XOLMfGht
gCR^9>Y?kj6V-pnsnt<*Irp;PYS{OH<n_8L<0Bbx`l>h($

diff --git a/roles/distgit/files/upload_cgi.te b/roles/distgit/files/upload_cgi.te
index f58050d1dc..bd87580806 100644
--- a/roles/distgit/files/upload_cgi.te
+++ b/roles/distgit/files/upload_cgi.te
@@ -1,11 +1,13 @@
-policy_module(upload_cgi,1.0.0)
+policy_module(upload_cgi,1.1.0)
 
 
-gen_require(` type httpd_git_script_t ; ')
-type upload_cgi_tmp_t;
-files_tmp_file(upload_cgi_tmp_t);
-allow httpd_git_script_t upload_cgi_tmp_t:file manage_file_perms;
-files_tmp_filetrans(httpd_git_script_t, upload_cgi_tmp_t, file);
+require {
+	type httpd_git_script_t;
+	type git_script_tmp_t;
+}
+
+files_tmp_file(git_script_tmp_t)
+allow httpd_git_script_t git_script_tmp_t:file manage_file_perms;
 
 
 # Do not audit attempts to read the process state (/proc/pid) of all domains.