rpms/kernel/devel config-generic, 1.315, 1.316 kernel.spec, 1.1710, 1.1711

[Eric Paris]

Author: eparis

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26426

Modified Files:
	config-generic kernel.spec 
Log Message:
* Tue Aug 11 2009 Eric Paris <eparis at redhat.com>
- Enable config IMA



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -r1.315 -r1.316
--- config-generic	31 Jul 2009 01:00:04 -0000	1.315
+++ config-generic	11 Aug 2009 21:55:35 -0000	1.316
@@ -3987,7 +3987,10 @@ CONFIG_FCOE_FNIC=m
 
 CONFIG_NOP_USB_XCEIV=m
 
-# CONFIG_IMA is not set
+CONFIG_IMA=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
+CONFIG_IMA_AUDIT=y
+CONFIG_IMA_LSM_RULES=y
 
 # CONFIG_PAGE_POISONING is not set
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1710
retrieving revision 1.1711
diff -u -p -r1.1710 -r1.1711
--- kernel.spec	11 Aug 2009 05:49:53 -0000	1.1710
+++ kernel.spec	11 Aug 2009 21:55:35 -0000	1.1711
@@ -1980,6 +1980,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 11 2009 Eric Paris <eparis at redhat.com>
+- Enable config IMA
+
 * Tue Aug 11 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: various cleanups and fixes + more sanity checking in dma paths