- final config update.

Changed files:
    kernel-abi.config -> 1.4
    kernel-grsec.config -> 1.16
    kernel-ia32-smp.config -> 1.16
    kernel-ia32.config -> 1.16

diff --git a/kernel-abi.config b/kernel-abi.config
index e3e12bf1e6e7a17aedbfc42ae2e6f1ca3c74bdda..cba2094dac53f67be262165d1b42a63c09659721 100644 (file)
--- a/kernel-abi.config
+++ b/kernel-abi.config
@@ -2,7 +2,10 @@
 # Binary emulation of other systems
 #
 CONFIG_ABI=m
-# CONFIG_ABI_SVR4 is not set
+CONFIG_ABI_SVR4=m
+# CONFIG_ABI_IBCS_SCO is not set
+# CONFIG_ABI_IBCS_ISC is not set
+# CONFIG_ABI_IBCS_WYSE is not set
 # CONFIG_ABI_XENIX is not set
 CONFIG_ABI_UW7=m
 CONFIG_ABI_SOLARIS=m

diff --git a/kernel-grsec.config b/kernel-grsec.config
index 10b2d54d7cbcde9a4c39040b825306deb4b355e0..090ce231b56682031b18c622df7018b19c537d47 100644 (file)
--- a/kernel-grsec.config
+++ b/kernel-grsec.config
@@ -14,7 +14,7 @@ CONFIG_GRKERNSEC_STACK_GCC=y
 # Access Control Lists
 #
 # CONFIG_OBV_PROC is not set
-
+# CONFIG_GRKERNSEC_ACL is not set
 #
 # Filesystem Protections
 #
@@ -26,6 +26,14 @@ CONFIG_GRKERNSEC_LINK=y
 CONFIG_GRKERNSEC_FIFO=y
 CONFIG_GRKERNSEC_FD=y
 CONFIG_GRKERNSEC_CHROOT=y
+CONFIG_GRKERNSEC_CHROOT_SIG=y
+CONFIG_GRKERNSEC_CHROOT_MOUNT=y
+CONFIG_GRKERNSEC_CHROOT_DOUBLE=y
+CONFIG_GRKERNSEC_CHROOT_CHDIR=y
+CONFIG_GRKERNSEC_CHROOT_CHMOD=y
+CONFIG_GRKERNSEC_CHROOT_MKNOD=y
+CONFIG_GRKERNSEC_CHROOT_PTRACE=y
+CONFIG_GRKERNSEC_CHROOT_NICE=y
 CONFIG_GRKERNSEC_CHROOT_EXECLOG=y
 CONFIG_GRKERNSEC_CHROOT_CAPS=y
 CONFIG_GRKERNSEC_KBMAP=y
@@ -44,6 +52,11 @@ CONFIG_GRKERNSEC_TIME=y
 #
 CONFIG_GRKERNSEC_EXECVE=y
 CONFIG_GRKERNSEC_RANDPID=y
+CONFIG_GRKERNSEC_IPC=y
+CONFIG_GRKERNSEC_TTYROOT=y
+CONFIG_GRKERNSEC_TTYROOT_PHYS=y
+CONFIG_GRKERNSEC_TTYROOT_SERIAL=y
+CONFIG_GRKERNSEC_TTYROOT_PSEUDO=y
 CONFIG_GRKERNSEC_FORKBOMB=y
 CONFIG_GRKERNSEC_FORKBOMB_GID=65504
 CONFIG_GRKERNSEC_FORKBOMB_SEC=40

diff --git a/kernel-ia32-smp.config b/kernel-ia32-smp.config
index 02075cef614fe05c1814e794468556d89c4ee91c..aa4a88945b89608a13767c12edc42d0c6e8e9a0a 100644 (file)
--- a/kernel-ia32-smp.config
+++ b/kernel-ia32-smp.config
@@ -1014,6 +1014,7 @@ CONFIG_DE_AOC=y
 # CONFIG_HISAX_NO_KEYPAD is not set
 CONFIG_HISAX_1TR6=y
 CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_TELESPCI=y
@@ -1045,6 +1046,7 @@ CONFIG_HISAX_HFC_SX=y
 CONFIG_HISAX_SEDLBAUER_CS=m
 CONFIG_HISAX_ELSA_CS=m
 CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
 
 #
 # Active ISDN cards
@@ -1242,6 +1244,7 @@ CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_I810=m
 CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
 
 #
 # PCMCIA character devices

diff --git a/kernel-ia32.config b/kernel-ia32.config
index ffd10c13c67e6f7432abbce8999ffcb4d3665c67..f253eb93f4941bee6fa8cf0c6753c7087fa621b3 100644 (file)
--- a/kernel-ia32.config
+++ b/kernel-ia32.config
@@ -425,7 +425,7 @@ CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
-#CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 CONFIG_BLK_DEV_CMD680=y
@@ -436,7 +436,7 @@ CONFIG_IDEPCI_SHARE_IRQ=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_BLK_DEV_ADMA=y
 CONFIG_BLK_DEV_OFFBOARD=y
-#CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 # CONFIG_IDEDMA_PCI_AUTO is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_PCI_WIP is not set
@@ -1012,6 +1012,7 @@ CONFIG_DE_AOC=y
 # CONFIG_HISAX_NO_KEYPAD is not set
 CONFIG_HISAX_1TR6=y
 CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_TELESPCI=y
@@ -1043,6 +1044,7 @@ CONFIG_HISAX_HFC_SX=y
 CONFIG_HISAX_SEDLBAUER_CS=m
 CONFIG_HISAX_ELSA_CS=m
 CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
 
 #
 # Active ISDN cards
@@ -1240,6 +1242,7 @@ CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_I810=m
 CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
 
 #
 # PCMCIA character devices