diff --git a/.cvsignore b/.cvsignore index 7c484f7..6af5dd4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -194,3 +194,4 @@ serefpolicy-3.6.33.tgz serefpolicy-3.7.1.tgz serefpolicy-3.7.2.tgz serefpolicy-3.7.3.tgz +serefpolicy-3.7.4.tgz diff --git a/modules-minimum.conf b/modules-minimum.conf index 22ee2d8..09561ad 100644 --- a/modules-minimum.conf +++ b/modules-minimum.conf @@ -757,6 +757,13 @@ kdump = module kdumpgui = module # Layer: services +# Module: ksmtuned +# +# Kernel Samepage Merging (KSM) Tuning Daemon +# +ksmtuned = module + +# Layer: services # Module: kerberos # # MIT Kerberos admin and KDC @@ -1576,6 +1583,13 @@ unconfined = module # ulogd = module +# Layer: services +# Module: vhostmd +# +# vhostmd - A metrics gathering daemon +# +vhostmd = module + # Layer: apps # Module: wine # diff --git a/modules-targeted.conf b/modules-targeted.conf index 22ee2d8..09561ad 100644 --- a/modules-targeted.conf +++ b/modules-targeted.conf @@ -757,6 +757,13 @@ kdump = module kdumpgui = module # Layer: services +# Module: ksmtuned +# +# Kernel Samepage Merging (KSM) Tuning Daemon +# +ksmtuned = module + +# Layer: services # Module: kerberos # # MIT Kerberos admin and KDC @@ -1576,6 +1583,13 @@ unconfined = module # ulogd = module +# Layer: services +# Module: vhostmd +# +# vhostmd - A metrics gathering daemon +# +vhostmd = module + # Layer: apps # Module: wine # diff --git a/nsadiff b/nsadiff index 9404411..9ecc574 100755 --- a/nsadiff +++ b/nsadiff @@ -1 +1 @@ -diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.3 > /tmp/diff +diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy serefpolicy-3.7.4 > /tmp/diff diff --git a/policy-F13.patch b/policy-F13.patch index d6784bc..c2b3dd2 100644 --- a/policy-F13.patch +++ b/policy-F13.patch @@ -6116,7 +6116,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol #network_node(multicast, s0 - mls_systemhigh, ff00::, ff00::) diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-3.7.4/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2009-11-20 10:51:41.000000000 -0500 -+++ serefpolicy-3.7.4/policy/modules/kernel/devices.if 2009-12-05 05:54:24.000000000 -0500 ++++ serefpolicy-3.7.4/policy/modules/kernel/devices.if 2009-12-10 14:19:30.000000000 -0500 @@ -783,6 +783,24 @@ ######################################## @@ -6192,15 +6192,6 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol ## Read raw memory devices (e.g. /dev/mem). ## ## -@@ -3080,7 +3134,7 @@ - ## - ## - # --interface(`dev_read_sound_mixer',` -+interface(`dev_read_sound_mixr',` - gen_require(` - type device_t, sound_device_t; - ') diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-3.7.4/policy/modules/kernel/domain.if --- nsaserefpolicy/policy/modules/kernel/domain.if 2009-07-14 14:19:57.000000000 -0400 +++ serefpolicy-3.7.4/policy/modules/kernel/domain.if 2009-12-04 12:33:34.000000000 -0500 diff --git a/selinux-policy.spec b/selinux-policy.spec index 27c7f2a..27b5304 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -19,7 +19,7 @@ %define CHECKPOLICYVER 2.0.16-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 3.7.3 +Version: 3.7.4 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -449,6 +449,9 @@ exit 0 %endif %changelog +* Fri Dec 4 2009 Dan Walsh 3.7.4-1 +- Update to upstream release + * Mon Nov 16 2009 Dan Walsh 3.7.3-1 - Add asterisk policy back in - Update to upstream release 2.20091117 diff --git a/sources b/sources index ddfc333..26cd0ca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 3651679c4b12a31d2ba5f4305bba5540 config.tgz -ae593cb93bcd26546be99064d16b372a serefpolicy-3.7.3.tgz +c9aaca580877d56fe5d13dd814f58efa serefpolicy-3.7.4.tgz