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*R3=AR+3=CVIP84!vG1N0~n9SHOyfI5mTZ@f>fgvTc
zI58<F6~ts^U|>ki1MyfG7#P?Y7#OlMb8<jzj?JsI+j&@d85kINC!1N+@_+<EJdlFT
zn=O2qHXB$^WtwEIAdsF}5?`ELlvz*`Uy@r8U$XhAt(*g+<Ya+*=gIw6B9rIWaZGlu
z^O(H7K6UesdT~z1|C=v#crY@`PoCH%vDvU|8q4JMeG*{oZzV8Upx<G0aQ`aS&9YM~
R8ASvb7#J`t=$h7;4giW4OlSZA

delta 269
zcmX^7i@Ey`vrzy4nxBje3=B*R3=AR+3=B2TCJH&S80Z-|Om^%O-k2q(t;NB>z>tzz
zoS2l8%ErLJz|O$HkeUbLu`n<&ure?(WM}5&fY@xCS82ENu<|f4Fz`$^v#8y?-@=z^
z@<Lk$fzpDU{KS;_<n+w=lH7v$lFdBUQ<*kjw3TyUl%D*db~z)*WJhb^$^7*^tl<n{
z3<8rC>h0lT9IPN~nI;P~x=j94m$La!oj51+-~Wu0@AWE9eqYBkIlqo~b3g|V<7Ayq
ssm*1bQ(3^G`nDXCt?PI;%lC<~i3%_<FrYhvX|vXp7RJrzrk17y0Bbx`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.