From 16f59d4f1d152165f333d16b7372c5c29b225be8 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Mar 12 2010 19:23:41 +0000
Subject: - Update to upstream


---

diff --git a/.cvsignore b/.cvsignore
index 747509c..48909e0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -204,3 +204,4 @@ serefpolicy-3.7.9.tgz
 serefpolicy-3.7.11.tgz
 serefpolicy-3.7.12.tgz
 serefpolicy-3.7.13.tgz
+serefpolicy-3.7.14.tgz
diff --git a/nsadiff b/nsadiff
index e5d977a..824605c 100755
--- a/nsadiff
+++ b/nsadiff
@@ -1 +1 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.13 > /tmp/diff
+diff --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.14 > /tmp/diff
diff --git a/policy-F13.patch b/policy-F13.patch
index 8349857..7e5259c 100644
--- a/policy-F13.patch
+++ b/policy-F13.patch
@@ -6187,7 +6187,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
  /dev/usbscanner		-c	gen_context(system_u:object_r:scanner_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.7.14/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2010-03-05 10:46:32.000000000 -0500
-+++ serefpolicy-3.7.14/policy/modules/kernel/devices.if	2010-03-12 09:30:00.000000000 -0500
++++ serefpolicy-3.7.14/policy/modules/kernel/devices.if	2010-03-12 14:23:05.000000000 -0500
 @@ -934,6 +934,42 @@
  
  ########################################
@@ -6231,7 +6231,32 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/device
  ##	Delete all block device files.
  ## </summary>
  ## <param name="domain">
-@@ -3733,6 +3769,24 @@
+@@ -3440,6 +3476,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Associate a file to a sysfs filesystem.
++## </summary>
++## <param name="file_type">
++##	<summary>
++##	The type of the file to be associated to sysfs.
++##	</summary>
++## </param>
++#
++interface(`dev_associate_sysfs',`
++	gen_require(`
++		type sysfs_t;
++	')
++
++	allow $1 sysfs_t:filesystem associate;
++')
++
++########################################
++## <summary>
+ ##	Get the attributes of sysfs directories.
+ ## </summary>
+ ## <param name="domain">
+@@ -3733,6 +3787,24 @@
  
  ########################################
  ## <summary>
@@ -33233,6 +33258,14 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnet
 +	hal_dontaudit_rw_pipes(ifconfig_t)
 +	hal_dontaudit_rw_dgram_sockets(ifconfig_t)
 +')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-3.7.14/policy/modules/system/udev.fc
+--- nsaserefpolicy/policy/modules/system/udev.fc	2009-11-25 11:47:19.000000000 -0500
++++ serefpolicy-3.7.14/policy/modules/system/udev.fc	2010-03-12 14:18:08.000000000 -0500
+@@ -22,3 +22,4 @@
+ /usr/bin/udevinfo --	gen_context(system_u:object_r:udev_exec_t,s0)
+ 
+ /var/run/PackageKit/udev(/.*)? gen_context(system_u:object_r:udev_var_run_t,s0)
++/var/run/libgpod(/.*)?	        gen_context(system_u:object_r:udev_var_run_t,s0)    
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.if serefpolicy-3.7.14/policy/modules/system/udev.if
 --- nsaserefpolicy/policy/modules/system/udev.if	2010-03-03 23:26:37.000000000 -0500
 +++ serefpolicy-3.7.14/policy/modules/system/udev.if	2010-03-12 09:30:01.000000000 -0500
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 51e2878..4a5e436 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -19,8 +19,8 @@
 %define CHECKPOLICYVER 2.0.21-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.7.13
-Release: 4%{?dist}
+Version: 3.7.14
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -466,6 +466,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Mar 12 2010 Dan Walsh <dwalsh@redhat.com> 3.7.14-1
+- Update to upstream
+
 * Fri Mar 12 2010 Dan Walsh <dwalsh@redhat.com> 3.7.13-4
 - Allow users to dbus chat with xdm
 - Allow users to r/w wireless_device_t
diff --git a/sources b/sources
index cc980d3..6d1dbca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 4c7d323036f1662a06a7a4f2a7da57a5  config.tgz
-800869f7cdb1312ac08737385c8a5cba  serefpolicy-3.7.13.tgz
+fc77266b07a6869de67768fc03d2c7d8  serefpolicy-3.7.14.tgz