- Update to upstream

.cvsignore

@@ -216,3 +216,4 @@ serefpolicy-3.8.3.tgz
 serefpolicy-3.8.4.tgz
 serefpolicy-3.8.5.tgz
 serefpolicy-3.8.6.tgz
+serefpolicy-3.8.7.tgz

modules-minimum.conf

@@ -532,13 +532,6 @@ git = module
 # 
 gpm = module
 
-# Layer: apps
-# Module: ethereal
-#
-# Ethereal packet capture tool.
-# 
-ethereal = module
-
 # Layer: services
 # Module: fail2ban
 #
@@ -1743,11 +1736,18 @@ vhostmd = module
 wine = module
 
 # Layer: apps
-# Module: telepathy_sofiasip
+# Module: wireshark
 #
-# telepathy-sofiasip -  Telepathy connection manager for SIP
+# wireshark executable
 # 
-telepathysofiasip = module
+wireshark = module
+
+# Layer: apps
+# Module: telepathy
+#
+# telepathy - Policy for Telepathy framework
+# 
+telepathy = module
 
 # Layer: admin
 # Module: tzdata

modules-mls.conf

@@ -504,13 +504,6 @@ gpsd = module
 # 
 gpm = module
 
-# Layer: apps
-# Module: ethereal
-#
-# Ethereal packet capture tool.
-# 
-ethereal = module
-
 # Layer: services
 # Module: fail2ban
 #
@@ -1566,6 +1559,13 @@ ulogd = module
 # 
 wine = module
 
+# Layer: apps
+# Module: wireshark
+#
+# wireshark executable
+# 
+wireshark = module
+
 # Layer: admin
 # Module: tzdata
 #
@@ -1806,11 +1806,11 @@ portreserve = module
 rpcbind = module
 
 # Layer: apps
-# Module: telepathy_sofiasip
+# Module: telepathy
 #
-# telepathy-sofiasip -  Telepathy connection manager for SIP
+# telepathy - Policy for Telepathy framework
 # 
-telepathysofiasip = module
+telepathy = module
 
 # Layer: apps
 # Module: vmware

modules-targeted.conf

@@ -532,13 +532,6 @@ git = module
 # 
 gpm = module
 
-# Layer: apps
-# Module: ethereal
-#
-# Ethereal packet capture tool.
-# 
-ethereal = module
-
 # Layer: services
 # Module: fail2ban
 #
@@ -1743,11 +1736,18 @@ vhostmd = module
 wine = module
 
 # Layer: apps
-# Module: telepathy_sofiasip
+# Module: wireshark
 #
-# telepathy-sofiasip -  Telepathy connection manager for SIP
+# wireshark executable
 # 
-telepathysofiasip = module
+wireshark = module
+
+# Layer: apps
+# Module: telepathy
+#
+# telepathy - Policy for Telepathy framework
+# 
+telepathy = module
 
 # Layer: admin
 # Module: tzdata

nsadiff

@@ -1 +1 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.8.6 > /tmp/diff
+diff --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.8.7 > /tmp/diff

selinux-policy.spec

@@ -19,8 +19,8 @@
 %define CHECKPOLICYVER 2.0.21-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 3.8.6
-Release: 3%{?dist}
+Version: 3.8.7
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -331,7 +331,7 @@ if [ $1 -eq 1 ]; then
    %loadpolicy targeted $packages
    restorecon -R /root /var/log /var/run /var/lib 2> /dev/null
 else
-   semodule -n -s targeted -r moilscanner -r mailscanner -r gamin -r audio_entropy -r iscsid -r polkit_auth -r polkit -r rtkit_daemon -r ModemManager 2>/dev/null
+   semodule -n -s targeted -r moilscanner mailscanner gamin audio_entropy iscsid polkit_auth polkit rtkit_daemon ModemManager telepathysofiasip ethereal 2>/dev/null
    %loadpolicy targeted $packages
    %relabel targeted
 fi
@@ -450,7 +450,7 @@ SELinux Reference policy mls base module.
 %saveFileContext mls
 
 %post mls 
-semodule -n -s mls -r mailscanner -r polkit -r ModemManager 2>/dev/null
+semodule -n -s mls -r mailscanner polkit ModemManager telepathysofiasip ethereal 2>/dev/null
 packages=`cat /usr/share/selinux/mls/modules.lst`
 %loadpolicy mls $packages
 
@@ -469,6 +469,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Jul 14 2010 Dan Walsh <dwalsh@redhat.com> 3.8.7-1
+- Update to upstream
+
 * Mon Jul 12 2010 Dan Walsh <dwalsh@redhat.com> 3.8.6-3
 - Add boolean to turn off port forwarding in sshd.
 

sources

@@ -1,2 +1,2 @@
 4c7d323036f1662a06a7a4f2a7da57a5  config.tgz
-5fa7e359d8016e05ebb27e9b4ec74584  serefpolicy-3.8.6.tgz
+d50240e814f78bdcb7c4e49829f0b18d  serefpolicy-3.8.7.tgz