- updated to 2.4.22

Changed files:
    kernel-alpha-smp.config -> 1.42
    kernel-alpha.config -> 1.43

diff --git a/kernel-alpha-smp.config b/kernel-alpha-smp.config
index 5e070c41bd8815fbe148be27bf97dd84106449c8..2a1e6aceb62b428d780d0215d03d1f783d457a0f 100644 (file)
--- a/kernel-alpha-smp.config
+++ b/kernel-alpha-smp.config
@@ -222,6 +222,7 @@ CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -418,6 +419,7 @@ CONFIG_IP6_NF_TARGET_IMQ=m
 CONFIG_KHTTPD=m
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m
 CONFIG_ATM_BR2684=m
@@ -709,6 +711,7 @@ CONFIG_IEEE1394_RAWIO=m
 CONFIG_IEEE1394_CMP=m
 CONFIG_IEEE1394_AMDTP=m
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
+CONFIG_IEEE1394_OUI_DB=y
 
 #
 # Network device support
@@ -785,6 +788,7 @@ CONFIG_AMD8111_ETH=m
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
+CONFIG_B44=m
 CONFIG_CS89x0=m
 CONFIG_TULIP=m
 CONFIG_TULIP_MWI=y
@@ -827,6 +831,7 @@ CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_DL2K=m
 CONFIG_E1000=m
+CONFIG_E1000_NAPI=y
 # CONFIG_MYRI_SBUS is not set
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
@@ -1036,6 +1041,7 @@ CONFIG_YAM=m
 CONFIG_ISDN=m
 CONFIG_ISDN_BOOL=y
 CONFIG_ISDN_PPP=y
+CONFIG_IPPP_FILTER=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
 CONFIG_ISDN_PPP_BSDCOMP=m
@@ -1439,6 +1445,7 @@ CONFIG_CODA_FS=m
 # CONFIG_INTERMEZZO_FS is not set
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
+CONFIG_NFS_DIRECTIO=y
 # CONFIG_ROOT_NFS is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
@@ -1734,6 +1741,7 @@ CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_CATC=m
+CONFIG_USB_AX8817X=m
 CONFIG_USB_CDCETHER=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_USS720=m
@@ -1780,6 +1788,7 @@ CONFIG_USB_AUERSWALD=m
 CONFIG_USB_TIGL=m
 CONFIG_USB_BRLVGER=m
 CONFIG_USB_LCD=m
+CONFIG_USB_SPEEDTOUCH=m
 
 #
 # Bluetooth support
@@ -1792,6 +1801,7 @@ CONFIG_BLUEZ_RFCOMM_TTY=y
 CONFIG_BLUEZ_BNEP=m
 CONFIG_BLUEZ_BNEP_MC_FILTER=y
 CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
+CONFIG_BLUEZ_CMTP=m
 
 #
 # Bluetooth device drivers
@@ -1803,6 +1813,7 @@ CONFIG_BLUEZ_HCIUART=m
 # CONFIG_BLUEZ_HCIUART_H4 is not set
 CONFIG_BLUEZ_HCIUART_BCSP=y
 CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
+CONFIG_BLUEZ_HCIBFUSB=m
 CONFIG_BLUEZ_HCIDTL1=m
 CONFIG_BLUEZ_HCIBT3C=m
 CONFIG_BLUEZ_HCIBLUECARD=m
@@ -1821,109 +1832,29 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_RWLOCK is not set
 # CONFIG_DEBUG_SEMAPHORE is not set
 
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_TEST=m
+
 #
 # Library routines
 #
+CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_QSORT=y
 
-#
-# Grsecurity
-#
-CONFIG_GRKERNSEC=y
-# CONFIG_GRKERNSEC_LOW is not set
-# CONFIG_GRKERNSEC_MID is not set
-# CONFIG_GRKERNSEC_HI is not set
-CONFIG_GRKERNSEC_CUSTOM=y
-
-#
-# Address Space Protection
-#
-CONFIG_GRKERNSEC_KMEM=y
-# CONFIG_GRKERNSEC_HIDESYM is not set
-
-#
-# Role Based Access Control Options
-#
-CONFIG_GRKERNSEC_ACL_HIDEKERN=y
-CONFIG_GRKERNSEC_ACL_MAXTRIES=3
-CONFIG_GRKERNSEC_ACL_TIMEOUT=30
-
-#
-# Filesystem Protections
-#
-CONFIG_GRKERNSEC_PROC=y
-# CONFIG_GRKERNSEC_PROC_USER is not set
-CONFIG_GRKERNSEC_PROC_USERGROUP=y
-CONFIG_GRKERNSEC_PROC_GID=17
-CONFIG_GRKERNSEC_PROC_ADD=y
-CONFIG_GRKERNSEC_LINK=y
-CONFIG_GRKERNSEC_FIFO=y
-CONFIG_GRKERNSEC_CHROOT=y
-CONFIG_GRKERNSEC_CHROOT_MOUNT=y
-CONFIG_GRKERNSEC_CHROOT_DOUBLE=y
-CONFIG_GRKERNSEC_CHROOT_PIVOT=y
-CONFIG_GRKERNSEC_CHROOT_CHDIR=y
-CONFIG_GRKERNSEC_CHROOT_CHMOD=y
-CONFIG_GRKERNSEC_CHROOT_FCHDIR=y
-CONFIG_GRKERNSEC_CHROOT_MKNOD=y
-# CONFIG_GRKERNSEC_CHROOT_SHMAT is not set
-CONFIG_GRKERNSEC_CHROOT_UNIX=y
-CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
-CONFIG_GRKERNSEC_CHROOT_NICE=y
-CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
-CONFIG_GRKERNSEC_CHROOT_CAPS=y
-
-#
-# Kernel Auditing
-#
-CONFIG_GRKERNSEC_AUDIT_GROUP=y
-CONFIG_GRKERNSEC_AUDIT_GID=1007
-CONFIG_GRKERNSEC_EXECLOG=y
-CONFIG_GRKERNSEC_RESLOG=y
-CONFIG_GRKERNSEC_CHROOT_EXECLOG=y
-CONFIG_GRKERNSEC_AUDIT_CHDIR=y
-CONFIG_GRKERNSEC_AUDIT_MOUNT=y
-CONFIG_GRKERNSEC_AUDIT_IPC=y
-CONFIG_GRKERNSEC_SIGNAL=y
-CONFIG_GRKERNSEC_FORKFAIL=y
-CONFIG_GRKERNSEC_TIME=y
-CONFIG_GRKERNSEC_PROC_IPADDR=y
-
-#
-# Executable Protections
-#
-CONFIG_GRKERNSEC_EXECVE=y
-CONFIG_GRKERNSEC_DMESG=y
-CONFIG_GRKERNSEC_RANDPID=y
-CONFIG_GRKERNSEC_TPE=y
-CONFIG_GRKERNSEC_TPE_ALL=y
-CONFIG_GRKERNSEC_TPE_GID=65500
-
-#
-# Network Protections
-#
-CONFIG_GRKERNSEC_RANDNET=y
-CONFIG_GRKERNSEC_RANDISN=y
-CONFIG_GRKERNSEC_RANDID=y
-CONFIG_GRKERNSEC_RANDSRC=y
-CONFIG_GRKERNSEC_RANDRPC=y
-CONFIG_GRKERNSEC_SOCKET=y
-CONFIG_GRKERNSEC_SOCKET_ALL=y
-CONFIG_GRKERNSEC_SOCKET_ALL_GID=1004
-CONFIG_GRKERNSEC_SOCKET_CLIENT=y
-CONFIG_GRKERNSEC_SOCKET_CLIENT_GID=1003
-CONFIG_GRKERNSEC_SOCKET_SERVER=y
-CONFIG_GRKERNSEC_SOCKET_SERVER_GID=1002
-
-#
-# Sysctl support
-#
-CONFIG_GRKERNSEC_SYSCTL=y
-
-#
-# Logging options
-#
-CONFIG_GRKERNSEC_FLOODTIME=30
-CONFIG_GRKERNSEC_FLOODBURST=4

diff --git a/kernel-alpha.config b/kernel-alpha.config
index 932e0aa2dbe03db062c03cbe31768a04f6d1fc09..86064dda12dfe1b17a7b0e4c840ce893858725b7 100644 (file)
--- a/kernel-alpha.config
+++ b/kernel-alpha.config
@@ -222,6 +222,7 @@ CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -418,6 +419,7 @@ CONFIG_IP6_NF_TARGET_IMQ=m
 CONFIG_KHTTPD=m
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m
 CONFIG_ATM_BR2684=m
@@ -709,6 +711,7 @@ CONFIG_IEEE1394_RAWIO=m
 CONFIG_IEEE1394_CMP=m
 CONFIG_IEEE1394_AMDTP=m
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
+CONFIG_IEEE1394_OUI_DB=y
 
 #
 # Network device support
@@ -785,6 +788,7 @@ CONFIG_AMD8111_ETH=m
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_AC3200=m
 CONFIG_APRICOT=m
+CONFIG_B44=m
 CONFIG_CS89x0=m
 CONFIG_TULIP=m
 CONFIG_TULIP_MWI=y
@@ -827,6 +831,7 @@ CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_DL2K=m
 CONFIG_E1000=m
+CONFIG_E1000_NAPI=y
 # CONFIG_MYRI_SBUS is not set
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
@@ -1036,6 +1041,7 @@ CONFIG_YAM=m
 CONFIG_ISDN=m
 CONFIG_ISDN_BOOL=y
 CONFIG_ISDN_PPP=y
+CONFIG_IPPP_FILTER=y
 CONFIG_ISDN_PPP_VJ=y
 CONFIG_ISDN_MPP=y
 CONFIG_ISDN_PPP_BSDCOMP=m
@@ -1439,6 +1445,7 @@ CONFIG_CODA_FS=m
 # CONFIG_INTERMEZZO_FS is not set
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
+CONFIG_NFS_DIRECTIO=y
 # CONFIG_ROOT_NFS is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
@@ -1734,6 +1741,7 @@ CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_CATC=m
+CONFIG_USB_AX8817X=m
 CONFIG_USB_CDCETHER=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_USS720=m
@@ -1780,6 +1788,7 @@ CONFIG_USB_AUERSWALD=m
 CONFIG_USB_TIGL=m
 CONFIG_USB_BRLVGER=m
 CONFIG_USB_LCD=m
+CONFIG_USB_SPEEDTOUCH=m
 
 #
 # Bluetooth support
@@ -1792,6 +1801,7 @@ CONFIG_BLUEZ_RFCOMM_TTY=y
 CONFIG_BLUEZ_BNEP=m
 CONFIG_BLUEZ_BNEP_MC_FILTER=y
 CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
+CONFIG_BLUEZ_CMTP=m
 
 #
 # Bluetooth device drivers
@@ -1803,6 +1813,7 @@ CONFIG_BLUEZ_HCIUART=m
 # CONFIG_BLUEZ_HCIUART_H4 is not set
 CONFIG_BLUEZ_HCIUART_BCSP=y
 CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
+CONFIG_BLUEZ_HCIBFUSB=m
 CONFIG_BLUEZ_HCIDTL1=m
 CONFIG_BLUEZ_HCIBT3C=m
 CONFIG_BLUEZ_HCIBLUECARD=m
@@ -1821,109 +1832,29 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_RWLOCK is not set
 # CONFIG_DEBUG_SEMAPHORE is not set
 
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_TEST=m
+
 #
 # Library routines
 #
+CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_QSORT=y
 
-#
-# Grsecurity
-#
-CONFIG_GRKERNSEC=y
-# CONFIG_GRKERNSEC_LOW is not set
-# CONFIG_GRKERNSEC_MID is not set
-# CONFIG_GRKERNSEC_HI is not set
-CONFIG_GRKERNSEC_CUSTOM=y
-
-#
-# Address Space Protection
-#
-CONFIG_GRKERNSEC_KMEM=y
-# CONFIG_GRKERNSEC_HIDESYM is not set
-
-#
-# Role Based Access Control Options
-#
-CONFIG_GRKERNSEC_ACL_HIDEKERN=y
-CONFIG_GRKERNSEC_ACL_MAXTRIES=3
-CONFIG_GRKERNSEC_ACL_TIMEOUT=30
-
-#
-# Filesystem Protections
-#
-CONFIG_GRKERNSEC_PROC=y
-# CONFIG_GRKERNSEC_PROC_USER is not set
-CONFIG_GRKERNSEC_PROC_USERGROUP=y
-CONFIG_GRKERNSEC_PROC_GID=17
-CONFIG_GRKERNSEC_PROC_ADD=y
-CONFIG_GRKERNSEC_LINK=y
-CONFIG_GRKERNSEC_FIFO=y
-CONFIG_GRKERNSEC_CHROOT=y
-CONFIG_GRKERNSEC_CHROOT_MOUNT=y
-CONFIG_GRKERNSEC_CHROOT_DOUBLE=y
-CONFIG_GRKERNSEC_CHROOT_PIVOT=y
-CONFIG_GRKERNSEC_CHROOT_CHDIR=y
-CONFIG_GRKERNSEC_CHROOT_CHMOD=y
-CONFIG_GRKERNSEC_CHROOT_FCHDIR=y
-CONFIG_GRKERNSEC_CHROOT_MKNOD=y
-# CONFIG_GRKERNSEC_CHROOT_SHMAT is not set
-CONFIG_GRKERNSEC_CHROOT_UNIX=y
-CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
-CONFIG_GRKERNSEC_CHROOT_NICE=y
-CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
-CONFIG_GRKERNSEC_CHROOT_CAPS=y
-
-#
-# Kernel Auditing
-#
-CONFIG_GRKERNSEC_AUDIT_GROUP=y
-CONFIG_GRKERNSEC_AUDIT_GID=1007
-CONFIG_GRKERNSEC_EXECLOG=y
-CONFIG_GRKERNSEC_RESLOG=y
-CONFIG_GRKERNSEC_CHROOT_EXECLOG=y
-CONFIG_GRKERNSEC_AUDIT_CHDIR=y
-CONFIG_GRKERNSEC_AUDIT_MOUNT=y
-CONFIG_GRKERNSEC_AUDIT_IPC=y
-CONFIG_GRKERNSEC_SIGNAL=y
-CONFIG_GRKERNSEC_FORKFAIL=y
-CONFIG_GRKERNSEC_TIME=y
-CONFIG_GRKERNSEC_PROC_IPADDR=y
-
-#
-# Executable Protections
-#
-CONFIG_GRKERNSEC_EXECVE=y
-CONFIG_GRKERNSEC_DMESG=y
-CONFIG_GRKERNSEC_RANDPID=y
-CONFIG_GRKERNSEC_TPE=y
-CONFIG_GRKERNSEC_TPE_ALL=y
-CONFIG_GRKERNSEC_TPE_GID=65500
-
-#
-# Network Protections
-#
-CONFIG_GRKERNSEC_RANDNET=y
-CONFIG_GRKERNSEC_RANDISN=y
-CONFIG_GRKERNSEC_RANDID=y
-CONFIG_GRKERNSEC_RANDSRC=y
-CONFIG_GRKERNSEC_RANDRPC=y
-CONFIG_GRKERNSEC_SOCKET=y
-CONFIG_GRKERNSEC_SOCKET_ALL=y
-CONFIG_GRKERNSEC_SOCKET_ALL_GID=1004
-CONFIG_GRKERNSEC_SOCKET_CLIENT=y
-CONFIG_GRKERNSEC_SOCKET_CLIENT_GID=1003
-CONFIG_GRKERNSEC_SOCKET_SERVER=y
-CONFIG_GRKERNSEC_SOCKET_SERVER_GID=1002
-
-#
-# Sysctl support
-#
-CONFIG_GRKERNSEC_SYSCTL=y
-
-#
-# Logging options
-#
-CONFIG_GRKERNSEC_FLOODTIME=30
-CONFIG_GRKERNSEC_FLOODBURST=4