From d9676a6ada72e360066a797689de9a5d68cb92a8 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Jul 06 2009 21:16:26 +0000
Subject: - Update to upstream


---

diff --git a/.cvsignore b/.cvsignore
index f4b9392..7399076 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -175,3 +175,5 @@ serefpolicy-3.6.17.tgz
 serefpolicy-3.6.18.tgz
 serefpolicy-3.6.19.tgz
 serefpolicy-3.6.20.tgz
+serefpolicy-3.6.21.tgz
+setroubleshoot-2.2.11.tar.gz
diff --git a/nsadiff b/nsadiff
index 7b823ab..95dcad2 100755
--- a/nsadiff
+++ b/nsadiff
@@ -1 +1 @@
-diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.20 > /tmp/diff
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.6.21 > /tmp/diff
diff --git a/policy-F12.patch b/policy-F12.patch
index bda3b83..2707bbb 100644
--- a/policy-F12.patch
+++ b/policy-F12.patch
@@ -5812,7 +5812,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  type lvm_control_t;
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.6.21/policy/modules/kernel/domain.if
 --- nsaserefpolicy/policy/modules/kernel/domain.if	2009-06-12 09:08:48.000000000 -0400
-+++ serefpolicy-3.6.21/policy/modules/kernel/domain.if	2009-07-06 14:01:55.000000000 -0400
++++ serefpolicy-3.6.21/policy/modules/kernel/domain.if	2009-07-06 17:16:04.000000000 -0400
 @@ -44,34 +44,6 @@
  interface(`domain_type',`
  	# start with basic domain
@@ -5952,7 +5952,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +#
 +interface(`domain_unconfined_signal',`
 +	gen_require(`
-+		type unconfined_domain_type;
++		attribute unconfined_domain_type;
 +	')
 +
 +	allow $1 unconfined_domain_type:process signal;
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 373ff7b..ae6e4af 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -19,8 +19,8 @@
 %define CHECKPOLICYVER 2.0.16-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.6.20
-Release: 2%{?dist}
+Version: 3.6.21
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -473,6 +473,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Jul 1 2009 Dan Walsh <dwalsh@redhat.com> 3.6.21-1
+- Update to upstream
+
 * Tue Jun 30 2009 Dan Walsh <dwalsh@redhat.com> 3.6.20-2
 - Add rules for rtkit-daemon
 
diff --git a/sources b/sources
index 752346e..f9f40ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d347e58dd29c66f67f18f946f44bd828  serefpolicy-3.6.20.tgz
+25f48f8897109e205e666999c7cb64a1  serefpolicy-3.6.21.tgz