From c5c64c16d770362a0d5b7cd4704da437a9b97bd9 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 19 Aug 2005 17:19:53 +0000 Subject: [PATCH 01/19] debian/templates/post-install.in: Make xargs to not call ln if no file is available. svn path=/branches/dist/sid/kernel/linux-2.6/; revision=3990 --- debian/templates/post-install.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/templates/post-install.in b/debian/templates/post-install.in index a1175e9d8..35f640991 100644 --- a/debian/templates/post-install.in +++ b/debian/templates/post-install.in @@ -88,10 +88,10 @@ ln -sf asm-${arch} $dir/include/asm find include/asm-$arch -mindepth 1 -maxdepth 1 \ \( -type f -a ! -links 2 -o ! -type f \) \ -printf "../../../linux-headers-$prefix/%p\n" | - xargs ln -s --target-directory=$dir/include/asm-$arch + xargs --no-run-if-empty ln -s --target-directory=$dir/include/asm-$arch find include/asm-$arch -mindepth 1 -maxdepth 1 \ -type f -links 2 | - xargs ln -f --target-directory=$dir/include/asm-$arch + xargs --no-run-if-empty ln -f --target-directory=$dir/include/asm-$arch for i in include/asm-* do case ${i#include/asm-} in From eb149a555d9bfe863afcd116a0eb2339e0311cd2 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 21 Aug 2005 14:44:50 +0000 Subject: [PATCH 02/19] * debian/arch/alpha/config, debian/arch/amd64/config, debian/arch/arm/config.ixp4xx, debian/arch/i386/config, debian/arch/powerpc/config: Make ATM modular. * debian/changelog: Update. svn path=/branches/dist/sid/kernel/linux-2.6/; revision=3999 --- debian/arch/alpha/config | 4 ++-- debian/arch/amd64/config | 4 ++-- debian/arch/arm/config.ixp4xx | 4 ++-- debian/arch/i386/config | 4 ++-- debian/arch/powerpc/config | 6 +++--- debian/changelog | 6 +++++- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 7c707cc3f..7fffef3fa 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -508,8 +508,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -CONFIG_ATM=y -CONFIG_ATM_CLIP=y +CONFIG_ATM=m +CONFIG_ATM_CLIP=m # CONFIG_ATM_CLIP_NO_ICMP is not set CONFIG_ATM_LANE=m CONFIG_ATM_MPOA=m diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 6e661be18..a5f937d09 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -528,8 +528,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -CONFIG_ATM=y -CONFIG_ATM_CLIP=y +CONFIG_ATM=m +CONFIG_ATM_CLIP=m # CONFIG_ATM_CLIP_NO_ICMP is not set CONFIG_ATM_LANE=m CONFIG_ATM_MPOA=m diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 0f48459aa..bd46125d8 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -544,8 +544,8 @@ CONFIG_XFRM=y # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set -CONFIG_ATM=y -CONFIG_ATM_CLIP=y +CONFIG_ATM=m +CONFIG_ATM_CLIP=m # CONFIG_ATM_CLIP_NO_ICMP is not set CONFIG_ATM_LANE=m CONFIG_ATM_MPOA=m diff --git a/debian/arch/i386/config b/debian/arch/i386/config index bb62b0293..ff13cee46 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -624,8 +624,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -CONFIG_ATM=y -CONFIG_ATM_CLIP=y +CONFIG_ATM=m +CONFIG_ATM_CLIP=m # CONFIG_ATM_CLIP_NO_ICMP is not set CONFIG_ATM_LANE=m CONFIG_ATM_MPOA=m diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index d907ddad4..f717fedde 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -389,7 +389,7 @@ CONFIG_IP_SCTP=m CONFIG_SCTP_HMAC_MD5=y CONFIG_ATM=m CONFIG_ATM_CLIP=m -CONFIG_ATM_CLIP_NO_ICMP=y +# CONFIG_ATM_CLIP_NO_ICMP is not set CONFIG_ATM_LANE=m CONFIG_ATM_MPOA=m CONFIG_ATM_BR2684=m @@ -656,7 +656,7 @@ CONFIG_ATM_ENI=m # CONFIG_ATM_ENI_TUNE_BURST is not set CONFIG_ATM_FIRESTREAM=m CONFIG_ATM_ZATM=m -CONFIG_ATM_ZATM_DEBUG=y +# CONFIG_ATM_ZATM_DEBUG is not set CONFIG_ATM_NICSTAR=m CONFIG_ATM_NICSTAR_USE_SUNI=y CONFIG_ATM_NICSTAR_USE_IDT77105=y @@ -673,7 +673,7 @@ CONFIG_ATM_IA=m CONFIG_ATM_FORE200E_MAYBE=m CONFIG_ATM_FORE200E_PCA=y CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y -CONFIG_ATM_FORE200E_USE_TASKLET=y +# CONFIG_ATM_FORE200E_USE_TASKLET is not set CONFIG_ATM_FORE200E_TX_RETRY=16 CONFIG_ATM_FORE200E_DEBUG=0 CONFIG_ATM_FORE200E=m diff --git a/debian/changelog b/debian/changelog index c28a274bc..ca88b6b90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low + * Change ATM and Classical-IP-over-ATM to be modular, instead of being + statically included. + (closes: #323143) (Andres Salomon, Bastian Blank) + * [powerpc] - Added pmac-sound sanity check patch. - Added preliminary apus patch, not applied though. - -- Bastian Blank Fri, 19 Aug 2005 14:39:16 +0200 + -- Bastian Blank Sat, 20 Aug 2005 11:57:45 +0200 linux-2.6 (2.6.12-5) unstable; urgency=low From b8a3feeff35838929d9123f61d041bd5fd4172f1 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 21 Aug 2005 14:50:45 +0000 Subject: [PATCH 03/19] r3998: horms | 2005-08-21 03:56:09 +0200 * - Unset CC_OPTIMIZE_FOR_SIZE in i386 config, it breaks iproute's (and other netlink users) ability to set routes. (closes: #322723) svn path=/branches/dist/sid/kernel/linux-2.6/; revision=4000 --- debian/arch/i386/config.386 | 2 +- debian/changelog | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/arch/i386/config.386 b/debian/arch/i386/config.386 index e84e81c35..74c096b72 100644 --- a/debian/arch/i386/config.386 +++ b/debian/arch/i386/config.386 @@ -1,4 +1,4 @@ -CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_M386=y # CONFIG_M686 is not set # CONFIG_MK7 is not set diff --git a/debian/changelog b/debian/changelog index ca88b6b90..3ec69b486 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low - Added pmac-sound sanity check patch. - Added preliminary apus patch, not applied though. + * Unset CC_OPTIMIZE_FOR_SIZE in i386 config, + it breaks iproute's (and other netlink users) ability + to set routes. (closes: #322723) (Simon Horman) + -- Bastian Blank Sat, 20 Aug 2005 11:57:45 +0200 linux-2.6 (2.6.12-5) unstable; urgency=low From 972e9ea021b88d876918bf97d196786d48ce8137 Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Mon, 29 Aug 2005 05:01:41 +0000 Subject: [PATCH 05/19] Disambiguate hppa kernels, 32 => parisc, 64 => parisc64. svn path=/trunk/kernel/linux-2.6/; revision=4059 --- debian/arch/hppa/{config.32 => config.parisc} | 0 .../hppa/{config.32-smp => config.parisc-smp} | 0 debian/arch/hppa/{config.64 => config.parisc64} | 0 .../hppa/{config.64-smp => config.parisc64-smp} | 0 debian/arch/hppa/defines | 16 ++++++++-------- 5 files changed, 8 insertions(+), 8 deletions(-) rename debian/arch/hppa/{config.32 => config.parisc} (100%) rename debian/arch/hppa/{config.32-smp => config.parisc-smp} (100%) rename debian/arch/hppa/{config.64 => config.parisc64} (100%) rename debian/arch/hppa/{config.64-smp => config.parisc64-smp} (100%) diff --git a/debian/arch/hppa/config.32 b/debian/arch/hppa/config.parisc similarity index 100% rename from debian/arch/hppa/config.32 rename to debian/arch/hppa/config.parisc diff --git a/debian/arch/hppa/config.32-smp b/debian/arch/hppa/config.parisc-smp similarity index 100% rename from debian/arch/hppa/config.32-smp rename to debian/arch/hppa/config.parisc-smp diff --git a/debian/arch/hppa/config.64 b/debian/arch/hppa/config.parisc64 similarity index 100% rename from debian/arch/hppa/config.64 rename to debian/arch/hppa/config.parisc64 diff --git a/debian/arch/hppa/config.64-smp b/debian/arch/hppa/config.parisc64-smp similarity index 100% rename from debian/arch/hppa/config.64-smp rename to debian/arch/hppa/config.parisc64-smp diff --git a/debian/arch/hppa/defines b/debian/arch/hppa/defines index 3343e2eab..8376e4b00 100644 --- a/debian/arch/hppa/defines +++ b/debian/arch/hppa/defines @@ -1,20 +1,20 @@ [base] flavours: - 32 - 32-smp - 64 - 64-smp + parisc + parisc-smp + parisc64 + parisc64-smp suggests: palo -[32] +[parisc] class: 32-bit PA-RISC -[32-smp] +[parisc-smp] class: multi-processor 32-bit PA-RISC -[64] +[parisc64] class: 64-bit PA-RISC -[64-smp] +[parisc64-smp] class: multi-processor 64-bit PA-RISC From fdfe435b6b760e97217458e967f1373b09268d5d Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Tue, 30 Aug 2005 08:23:23 +0000 Subject: [PATCH 06/19] * zlib deflateBound() patch added as part of the 2.6.12.5 patch in 2.6.12-3 now has a CAN number. See CAN-2005-2457 svn path=/branches/dist/sid/kernel/linux-2.6/; revision=4069 --- debian/arch/alpha/config | 6 ------ debian/arch/amd64/config | 6 ------ debian/arch/arm/config.footbridge | 1 - debian/arch/arm/config.ixp4xx | 1 - debian/arch/arm/config.rpc | 2 -- debian/arch/config | 3 +++ debian/arch/hppa/config | 3 --- debian/arch/hppa/config.parisc | 3 --- debian/arch/hppa/config.parisc-smp | 3 --- debian/arch/hppa/config.parisc64 | 3 --- debian/arch/hppa/config.parisc64-smp | 3 --- debian/arch/i386/config | 6 ------ debian/arch/ia64/config | 5 ----- debian/arch/m68k/config | 4 ---- debian/arch/m68k/config.amiga | 4 ---- debian/arch/m68k/config.atari | 4 ---- debian/arch/m68k/config.bvme6000 | 4 ---- debian/arch/m68k/config.hp | 4 ---- debian/arch/m68k/config.mac | 4 ---- debian/arch/m68k/config.mvme147 | 4 ---- debian/arch/m68k/config.mvme16x | 4 ---- debian/arch/m68k/config.q40 | 4 ---- debian/arch/m68k/config.sun3 | 4 ---- debian/arch/powerpc/config | 5 ----- debian/arch/powerpc/config.powerpc64 | 1 - debian/arch/s390/config | 2 -- debian/arch/sparc/config | 2 -- debian/arch/sparc/config.sparc64 | 1 - debian/arch/sparc/config.sparc64-smp | 1 - debian/changelog | 5 ++++- 30 files changed, 7 insertions(+), 95 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 7fffef3fa..8b1484f48 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -267,7 +267,6 @@ CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y @@ -298,7 +297,6 @@ CONFIG_SCSI_IN2000=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m @@ -1611,7 +1609,6 @@ CONFIG_USB_SERIAL_XIRCOM=m CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_EZUSB=y -# CONFIG_USB_EMI26 is not set CONFIG_USB_AUERSWALD=m CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m @@ -1695,9 +1692,6 @@ CONFIG_DEVPTS_FS_SECURITY=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set CONFIG_AFFS_FS=m -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index a5f937d09..be9efbf4e 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -313,7 +313,6 @@ CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y @@ -339,7 +338,6 @@ CONFIG_AIC79XX_REG_PRETTY_PRINT=y CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m @@ -1251,7 +1249,6 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set CONFIG_FB_VGA16=m -CONFIG_FB_VESA=m CONFIG_VIDEO_SELECT=y CONFIG_FB_HGA=m # CONFIG_FB_HGA_ACCEL is not set @@ -1625,9 +1622,6 @@ CONFIG_TMPFS_SECURITY=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set CONFIG_AFFS_FS=m -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index ff8554607..ff31f2c04 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -1120,7 +1120,6 @@ CONFIG_RAMFS=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set # CONFIG_AFFS_FS is not set -# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index bd46125d8..5e9c3d358 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -1052,7 +1052,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index 46c220598..f5a0dd0ca 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -266,7 +266,6 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=y -# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -795,7 +794,6 @@ CONFIG_RAMFS=y CONFIG_ADFS_FS=y # CONFIG_ADFS_FS_RW is not set # CONFIG_AFFS_FS is not set -# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/config b/debian/arch/config index 9b67a168e..524f83dfd 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -178,3 +178,6 @@ CONFIG_TCG_ATMEL=m CONFIG_TCG_NSC=m # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set CONFIG_6PACK=m +CONFIG_SCSI_QLA2XXX=m +# CONFIG_USB_EMI26 is not set +# CONFIG_FB_VESA is not set diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index cefa35044..5eb7c9f21 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -275,7 +275,6 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -308,7 +307,6 @@ CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_DPT_I2O is not set # CONFIG_SCSI_IN2000 is not set # CONFIG_MEGARAID_NEWGEN is not set -CONFIG_MEGARAID_LEGACY=m # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set @@ -1434,7 +1432,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/hppa/config.parisc b/debian/arch/hppa/config.parisc index cefa35044..5eb7c9f21 100644 --- a/debian/arch/hppa/config.parisc +++ b/debian/arch/hppa/config.parisc @@ -275,7 +275,6 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -308,7 +307,6 @@ CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_DPT_I2O is not set # CONFIG_SCSI_IN2000 is not set # CONFIG_MEGARAID_NEWGEN is not set -CONFIG_MEGARAID_LEGACY=m # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set @@ -1434,7 +1432,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/hppa/config.parisc-smp b/debian/arch/hppa/config.parisc-smp index d0751ba3f..92c1618fb 100644 --- a/debian/arch/hppa/config.parisc-smp +++ b/debian/arch/hppa/config.parisc-smp @@ -279,7 +279,6 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -312,7 +311,6 @@ CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_DPT_I2O is not set # CONFIG_SCSI_IN2000 is not set # CONFIG_MEGARAID_NEWGEN is not set -CONFIG_MEGARAID_LEGACY=m # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set @@ -1436,7 +1434,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/hppa/config.parisc64 b/debian/arch/hppa/config.parisc64 index e45b4ac52..e87720466 100644 --- a/debian/arch/hppa/config.parisc64 +++ b/debian/arch/hppa/config.parisc64 @@ -278,7 +278,6 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -309,7 +308,6 @@ CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_AIC79XX is not set # CONFIG_SCSI_IN2000 is not set # CONFIG_MEGARAID_NEWGEN is not set -CONFIG_MEGARAID_LEGACY=m # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set @@ -1430,7 +1428,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/hppa/config.parisc64-smp b/debian/arch/hppa/config.parisc64-smp index 684dd9925..7caf7f4e1 100644 --- a/debian/arch/hppa/config.parisc64-smp +++ b/debian/arch/hppa/config.parisc64-smp @@ -282,7 +282,6 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -313,7 +312,6 @@ CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_AIC79XX is not set # CONFIG_SCSI_IN2000 is not set # CONFIG_MEGARAID_NEWGEN is not set -CONFIG_MEGARAID_LEGACY=m # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set @@ -1432,7 +1430,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/i386/config b/debian/arch/i386/config index ff13cee46..d4469b30f 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -371,7 +371,6 @@ CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y @@ -403,7 +402,6 @@ CONFIG_SCSI_IN2000=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m @@ -1454,7 +1452,6 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set CONFIG_FB_VGA16=m -CONFIG_FB_VESA=m CONFIG_VIDEO_SELECT=y CONFIG_FB_HGA=m # CONFIG_FB_HGA_ACCEL is not set @@ -1876,9 +1873,6 @@ CONFIG_TMPFS_SECURITY=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set CONFIG_AFFS_FS=m -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index a13a3e665..8acf9180c 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -258,7 +258,6 @@ CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y @@ -284,7 +283,6 @@ CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y CONFIG_SCSI_SATA_AHCI=m # CONFIG_SCSI_SATA_SVW is not set @@ -1340,9 +1338,6 @@ CONFIG_TMPFS_SECURITY=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set CONFIG_AFFS_FS=m -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config index 6d584ef64..7b9e6f0f3 100644 --- a/debian/arch/m68k/config +++ b/debian/arch/m68k/config @@ -205,7 +205,6 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m -# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -846,9 +845,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=y -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.amiga b/debian/arch/m68k/config.amiga index 6d584ef64..7b9e6f0f3 100644 --- a/debian/arch/m68k/config.amiga +++ b/debian/arch/m68k/config.amiga @@ -205,7 +205,6 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m -# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -846,9 +845,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=y -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.atari b/debian/arch/m68k/config.atari index b943bdee7..a1782b558 100644 --- a/debian/arch/m68k/config.atari +++ b/debian/arch/m68k/config.atari @@ -194,7 +194,6 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m -# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -744,9 +743,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.bvme6000 b/debian/arch/m68k/config.bvme6000 index 12dfa0b91..f3c92b1da 100644 --- a/debian/arch/m68k/config.bvme6000 +++ b/debian/arch/m68k/config.bvme6000 @@ -164,7 +164,6 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m -# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -689,9 +688,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.hp b/debian/arch/m68k/config.hp index 517a68db1..827831abb 100644 --- a/debian/arch/m68k/config.hp +++ b/debian/arch/m68k/config.hp @@ -164,7 +164,6 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m -# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -680,9 +679,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.mac b/debian/arch/m68k/config.mac index df6d5027d..1d3c16bd1 100644 --- a/debian/arch/m68k/config.mac +++ b/debian/arch/m68k/config.mac @@ -188,7 +188,6 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m -# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -754,9 +753,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=y CONFIG_HFSPLUS_FS=y # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.mvme147 b/debian/arch/m68k/config.mvme147 index 462d60969..1cda5bb3e 100644 --- a/debian/arch/m68k/config.mvme147 +++ b/debian/arch/m68k/config.mvme147 @@ -163,7 +163,6 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m -# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -707,9 +706,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.mvme16x b/debian/arch/m68k/config.mvme16x index b5367e67b..c813a66db 100644 --- a/debian/arch/m68k/config.mvme16x +++ b/debian/arch/m68k/config.mvme16x @@ -164,7 +164,6 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m -# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -712,9 +711,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.q40 b/debian/arch/m68k/config.q40 index 27fea8c8e..24a7622d4 100644 --- a/debian/arch/m68k/config.q40 +++ b/debian/arch/m68k/config.q40 @@ -191,7 +191,6 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m -# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -771,9 +770,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.sun3 b/debian/arch/m68k/config.sun3 index dabdc9313..358a118c7 100644 --- a/debian/arch/m68k/config.sun3 +++ b/debian/arch/m68k/config.sun3 @@ -151,7 +151,6 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m -# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -693,9 +692,6 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index f717fedde..bb5780319 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -195,7 +195,6 @@ CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set CONFIG_SCSI_LOGGING=y @@ -222,7 +221,6 @@ CONFIG_SCSI_DPT_I2O=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m -# CONFIG_MEGARAID_LEGACY is not set CONFIG_SCSI_SATA=y CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m @@ -1321,9 +1319,6 @@ CONFIG_TMPFS_SECURITY=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set CONFIG_AFFS_FS=m -CONFIG_ASFS_FS=m -CONFIG_ASFS_DEFAULT_CODEPAGE="" -CONFIG_ASFS_RW=y CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m diff --git a/debian/arch/powerpc/config.powerpc64 b/debian/arch/powerpc/config.powerpc64 index b141a2d12..9f8380309 100644 --- a/debian/arch/powerpc/config.powerpc64 +++ b/debian/arch/powerpc/config.powerpc64 @@ -30,7 +30,6 @@ CONFIG_KEYS_COMPAT=y # CONFIG_KPROBES is not set CONFIG_LOCK_KERNEL=y CONFIG_LPARCFG=m -CONFIG_MEGARAID_LEGACY=m CONFIG_MPIC_BROKEN_U3=y CONFIG_NR_CPUS=32 CONFIG_NUMA=y diff --git a/debian/arch/s390/config b/debian/arch/s390/config index 685f2eea1..41961deff 100644 --- a/debian/arch/s390/config +++ b/debian/arch/s390/config @@ -47,7 +47,6 @@ CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set -# CONFIG_CHR_DEV_SCH is not set CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y @@ -231,7 +230,6 @@ CONFIG_QFMT_V2=y # CONFIG_TMPFS_XATTR is not set # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set -# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/sparc/config b/debian/arch/sparc/config index f12b585a2..6a393e006 100644 --- a/debian/arch/sparc/config +++ b/debian/arch/sparc/config @@ -84,7 +84,6 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_ATA_OVER_ETH=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SCH=m # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set CONFIG_SCSI_SPI_ATTRS=m @@ -366,7 +365,6 @@ CONFIG_TMPFS_XATTR=y CONFIG_TMPFS_SECURITY=y # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m -# CONFIG_ASFS_FS is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m diff --git a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64 index cce7fb46f..320832e62 100644 --- a/debian/arch/sparc/config.sparc64 +++ b/debian/arch/sparc/config.sparc64 @@ -123,7 +123,6 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set -CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_DMX3191D=m CONFIG_SCSI_INITIO=m CONFIG_SCSI_PPA=m diff --git a/debian/arch/sparc/config.sparc64-smp b/debian/arch/sparc/config.sparc64-smp index 9fe74a9cb..8db22f327 100644 --- a/debian/arch/sparc/config.sparc64-smp +++ b/debian/arch/sparc/config.sparc64-smp @@ -126,7 +126,6 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set -CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_DMX3191D=m CONFIG_SCSI_INITIO=m CONFIG_SCSI_PPA=m diff --git a/debian/changelog b/debian/changelog index fe803ae4c..1b3399e69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,11 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low * net-sockglue-cap.patch [Security] Restrict socket policy loading to CAP_NET_ADMIN. See CAN-2005-2555. + * zlib deflateBound() patch added as part of the 2.6.12.5 patch in + 2.6.12-3 now has a CAN number. + See CAN-2005-2457 - -- Simon Horman Mon, 22 Aug 2005 15:04:40 +0900 + -- Simon Horman Tue, 30 Aug 2005 17:21:24 +0900 linux-2.6 (2.6.12-5) unstable; urgency=low From 58de4c5a3945f9182882c5404273a8db16adf21e Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Tue, 30 Aug 2005 08:25:25 +0000 Subject: [PATCH 07/19] Reverted accidental commit svn path=/branches/dist/sid/kernel/linux-2.6/; revision=4070 --- debian/arch/alpha/config | 6 ++++++ debian/arch/amd64/config | 6 ++++++ debian/arch/arm/config.footbridge | 1 + debian/arch/arm/config.ixp4xx | 1 + debian/arch/arm/config.rpc | 2 ++ debian/arch/config | 3 --- debian/arch/hppa/config | 3 +++ debian/arch/hppa/config.parisc | 3 +++ debian/arch/hppa/config.parisc-smp | 3 +++ debian/arch/hppa/config.parisc64 | 3 +++ debian/arch/hppa/config.parisc64-smp | 3 +++ debian/arch/i386/config | 6 ++++++ debian/arch/ia64/config | 5 +++++ debian/arch/m68k/config | 4 ++++ debian/arch/m68k/config.amiga | 4 ++++ debian/arch/m68k/config.atari | 4 ++++ debian/arch/m68k/config.bvme6000 | 4 ++++ debian/arch/m68k/config.hp | 4 ++++ debian/arch/m68k/config.mac | 4 ++++ debian/arch/m68k/config.mvme147 | 4 ++++ debian/arch/m68k/config.mvme16x | 4 ++++ debian/arch/m68k/config.q40 | 4 ++++ debian/arch/m68k/config.sun3 | 4 ++++ debian/arch/powerpc/config | 5 +++++ debian/arch/powerpc/config.powerpc64 | 1 + debian/arch/s390/config | 2 ++ debian/arch/sparc/config | 2 ++ debian/arch/sparc/config.sparc64 | 1 + debian/arch/sparc/config.sparc64-smp | 1 + 29 files changed, 94 insertions(+), 3 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 8b1484f48..7fffef3fa 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -267,6 +267,7 @@ CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y @@ -297,6 +298,7 @@ CONFIG_SCSI_IN2000=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m @@ -1609,6 +1611,7 @@ CONFIG_USB_SERIAL_XIRCOM=m CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_EZUSB=y +# CONFIG_USB_EMI26 is not set CONFIG_USB_AUERSWALD=m CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m @@ -1692,6 +1695,9 @@ CONFIG_DEVPTS_FS_SECURITY=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set CONFIG_AFFS_FS=m +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index be9efbf4e..a5f937d09 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -313,6 +313,7 @@ CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y @@ -338,6 +339,7 @@ CONFIG_AIC79XX_REG_PRETTY_PRINT=y CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m @@ -1249,6 +1251,7 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set CONFIG_FB_VGA16=m +CONFIG_FB_VESA=m CONFIG_VIDEO_SELECT=y CONFIG_FB_HGA=m # CONFIG_FB_HGA_ACCEL is not set @@ -1622,6 +1625,9 @@ CONFIG_TMPFS_SECURITY=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set CONFIG_AFFS_FS=m +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index ff31f2c04..ff8554607 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -1120,6 +1120,7 @@ CONFIG_RAMFS=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set # CONFIG_AFFS_FS is not set +# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 5e9c3d358..bd46125d8 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -1052,6 +1052,7 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index f5a0dd0ca..46c220598 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -266,6 +266,7 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -794,6 +795,7 @@ CONFIG_RAMFS=y CONFIG_ADFS_FS=y # CONFIG_ADFS_FS_RW is not set # CONFIG_AFFS_FS is not set +# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/config b/debian/arch/config index 524f83dfd..9b67a168e 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -178,6 +178,3 @@ CONFIG_TCG_ATMEL=m CONFIG_TCG_NSC=m # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set CONFIG_6PACK=m -CONFIG_SCSI_QLA2XXX=m -# CONFIG_USB_EMI26 is not set -# CONFIG_FB_VESA is not set diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index 5eb7c9f21..cefa35044 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -275,6 +275,7 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -307,6 +308,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_DPT_I2O is not set # CONFIG_SCSI_IN2000 is not set # CONFIG_MEGARAID_NEWGEN is not set +CONFIG_MEGARAID_LEGACY=m # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set @@ -1432,6 +1434,7 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/hppa/config.parisc b/debian/arch/hppa/config.parisc index 5eb7c9f21..cefa35044 100644 --- a/debian/arch/hppa/config.parisc +++ b/debian/arch/hppa/config.parisc @@ -275,6 +275,7 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -307,6 +308,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_DPT_I2O is not set # CONFIG_SCSI_IN2000 is not set # CONFIG_MEGARAID_NEWGEN is not set +CONFIG_MEGARAID_LEGACY=m # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set @@ -1432,6 +1434,7 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/hppa/config.parisc-smp b/debian/arch/hppa/config.parisc-smp index 92c1618fb..d0751ba3f 100644 --- a/debian/arch/hppa/config.parisc-smp +++ b/debian/arch/hppa/config.parisc-smp @@ -279,6 +279,7 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -311,6 +312,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_DPT_I2O is not set # CONFIG_SCSI_IN2000 is not set # CONFIG_MEGARAID_NEWGEN is not set +CONFIG_MEGARAID_LEGACY=m # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set @@ -1434,6 +1436,7 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/hppa/config.parisc64 b/debian/arch/hppa/config.parisc64 index e87720466..e45b4ac52 100644 --- a/debian/arch/hppa/config.parisc64 +++ b/debian/arch/hppa/config.parisc64 @@ -278,6 +278,7 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -308,6 +309,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_AIC79XX is not set # CONFIG_SCSI_IN2000 is not set # CONFIG_MEGARAID_NEWGEN is not set +CONFIG_MEGARAID_LEGACY=m # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set @@ -1428,6 +1430,7 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/hppa/config.parisc64-smp b/debian/arch/hppa/config.parisc64-smp index 7caf7f4e1..684dd9925 100644 --- a/debian/arch/hppa/config.parisc64-smp +++ b/debian/arch/hppa/config.parisc64-smp @@ -282,6 +282,7 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -312,6 +313,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_AIC79XX is not set # CONFIG_SCSI_IN2000 is not set # CONFIG_MEGARAID_NEWGEN is not set +CONFIG_MEGARAID_LEGACY=m # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set @@ -1430,6 +1432,7 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/i386/config b/debian/arch/i386/config index d4469b30f..ff13cee46 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -371,6 +371,7 @@ CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y @@ -402,6 +403,7 @@ CONFIG_SCSI_IN2000=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m @@ -1452,6 +1454,7 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set CONFIG_FB_VGA16=m +CONFIG_FB_VESA=m CONFIG_VIDEO_SELECT=y CONFIG_FB_HGA=m # CONFIG_FB_HGA_ACCEL is not set @@ -1873,6 +1876,9 @@ CONFIG_TMPFS_SECURITY=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set CONFIG_AFFS_FS=m +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index 8acf9180c..a13a3e665 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -258,6 +258,7 @@ CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y @@ -283,6 +284,7 @@ CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_SATA=y CONFIG_SCSI_SATA_AHCI=m # CONFIG_SCSI_SATA_SVW is not set @@ -1338,6 +1340,9 @@ CONFIG_TMPFS_SECURITY=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set CONFIG_AFFS_FS=m +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config index 7b9e6f0f3..6d584ef64 100644 --- a/debian/arch/m68k/config +++ b/debian/arch/m68k/config @@ -205,6 +205,7 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -845,6 +846,9 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=y +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.amiga b/debian/arch/m68k/config.amiga index 7b9e6f0f3..6d584ef64 100644 --- a/debian/arch/m68k/config.amiga +++ b/debian/arch/m68k/config.amiga @@ -205,6 +205,7 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -845,6 +846,9 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=y +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.atari b/debian/arch/m68k/config.atari index a1782b558..b943bdee7 100644 --- a/debian/arch/m68k/config.atari +++ b/debian/arch/m68k/config.atari @@ -194,6 +194,7 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -743,6 +744,9 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.bvme6000 b/debian/arch/m68k/config.bvme6000 index f3c92b1da..12dfa0b91 100644 --- a/debian/arch/m68k/config.bvme6000 +++ b/debian/arch/m68k/config.bvme6000 @@ -164,6 +164,7 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -688,6 +689,9 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.hp b/debian/arch/m68k/config.hp index 827831abb..517a68db1 100644 --- a/debian/arch/m68k/config.hp +++ b/debian/arch/m68k/config.hp @@ -164,6 +164,7 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -679,6 +680,9 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.mac b/debian/arch/m68k/config.mac index 1d3c16bd1..df6d5027d 100644 --- a/debian/arch/m68k/config.mac +++ b/debian/arch/m68k/config.mac @@ -188,6 +188,7 @@ CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -753,6 +754,9 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=y CONFIG_HFSPLUS_FS=y # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.mvme147 b/debian/arch/m68k/config.mvme147 index 1cda5bb3e..462d60969 100644 --- a/debian/arch/m68k/config.mvme147 +++ b/debian/arch/m68k/config.mvme147 @@ -163,6 +163,7 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -706,6 +707,9 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.mvme16x b/debian/arch/m68k/config.mvme16x index c813a66db..b5367e67b 100644 --- a/debian/arch/m68k/config.mvme16x +++ b/debian/arch/m68k/config.mvme16x @@ -164,6 +164,7 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -711,6 +712,9 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.q40 b/debian/arch/m68k/config.q40 index 24a7622d4..27fea8c8e 100644 --- a/debian/arch/m68k/config.q40 +++ b/debian/arch/m68k/config.q40 @@ -191,6 +191,7 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -770,6 +771,9 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/m68k/config.sun3 b/debian/arch/m68k/config.sun3 index 358a118c7..dabdc9313 100644 --- a/debian/arch/m68k/config.sun3 +++ b/debian/arch/m68k/config.sun3 @@ -151,6 +151,7 @@ CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -692,6 +693,9 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +# CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index bb5780319..f717fedde 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -195,6 +195,7 @@ CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SCH=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set CONFIG_SCSI_LOGGING=y @@ -221,6 +222,7 @@ CONFIG_SCSI_DPT_I2O=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m +# CONFIG_MEGARAID_LEGACY is not set CONFIG_SCSI_SATA=y CONFIG_SCSI_SATA_AHCI=m CONFIG_SCSI_SATA_SVW=m @@ -1319,6 +1321,9 @@ CONFIG_TMPFS_SECURITY=y CONFIG_ADFS_FS=m # CONFIG_ADFS_FS_RW is not set CONFIG_AFFS_FS=m +CONFIG_ASFS_FS=m +CONFIG_ASFS_DEFAULT_CODEPAGE="" +CONFIG_ASFS_RW=y CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m diff --git a/debian/arch/powerpc/config.powerpc64 b/debian/arch/powerpc/config.powerpc64 index 9f8380309..b141a2d12 100644 --- a/debian/arch/powerpc/config.powerpc64 +++ b/debian/arch/powerpc/config.powerpc64 @@ -30,6 +30,7 @@ CONFIG_KEYS_COMPAT=y # CONFIG_KPROBES is not set CONFIG_LOCK_KERNEL=y CONFIG_LPARCFG=m +CONFIG_MEGARAID_LEGACY=m CONFIG_MPIC_BROKEN_U3=y CONFIG_NR_CPUS=32 CONFIG_NUMA=y diff --git a/debian/arch/s390/config b/debian/arch/s390/config index 41961deff..685f2eea1 100644 --- a/debian/arch/s390/config +++ b/debian/arch/s390/config @@ -47,6 +47,7 @@ CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=m # CONFIG_BLK_DEV_SR_VENDOR is not set +# CONFIG_CHR_DEV_SCH is not set CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y @@ -230,6 +231,7 @@ CONFIG_QFMT_V2=y # CONFIG_TMPFS_XATTR is not set # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/debian/arch/sparc/config b/debian/arch/sparc/config index 6a393e006..f12b585a2 100644 --- a/debian/arch/sparc/config +++ b/debian/arch/sparc/config @@ -84,6 +84,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_ATA_OVER_ETH=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SCH=m # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set CONFIG_SCSI_SPI_ATTRS=m @@ -365,6 +366,7 @@ CONFIG_TMPFS_XATTR=y CONFIG_TMPFS_SECURITY=y # CONFIG_ADFS_FS is not set CONFIG_AFFS_FS=m +# CONFIG_ASFS_FS is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m diff --git a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64 index 320832e62..cce7fb46f 100644 --- a/debian/arch/sparc/config.sparc64 +++ b/debian/arch/sparc/config.sparc64 @@ -123,6 +123,7 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set +CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_DMX3191D=m CONFIG_SCSI_INITIO=m CONFIG_SCSI_PPA=m diff --git a/debian/arch/sparc/config.sparc64-smp b/debian/arch/sparc/config.sparc64-smp index 8db22f327..9fe74a9cb 100644 --- a/debian/arch/sparc/config.sparc64-smp +++ b/debian/arch/sparc/config.sparc64-smp @@ -126,6 +126,7 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set +CONFIG_MEGARAID_LEGACY=m CONFIG_SCSI_DMX3191D=m CONFIG_SCSI_INITIO=m CONFIG_SCSI_PPA=m From a648089742af4c0ff633f740941801d4848310d7 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Tue, 30 Aug 2005 10:26:04 +0000 Subject: [PATCH 08/19] Annotate log with committers names svn path=/branches/dist/sid/kernel/linux-2.6/; revision=4074 --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1b3399e69..b05044623 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,18 +5,20 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low statically included. (closes: #323143) (Andres Salomon, Bastian Blank) + [ Sven Luther ] * [powerpc] - Added pmac-sound sanity check patch. - Added preliminary apus patch, not applied though. + [ Simon Horman ] * Unset CC_OPTIMIZE_FOR_SIZE in i386 config, it breaks iproute's (and other netlink users) ability to set routes. (closes: #322723) (Simon Horman) - [ Simon Horman ] * net-sockglue-cap.patch [Security] Restrict socket policy loading to CAP_NET_ADMIN. See CAN-2005-2555. + * zlib deflateBound() patch added as part of the 2.6.12.5 patch in 2.6.12-3 now has a CAN number. See CAN-2005-2457 From 840fe3583ee17e6a645824126bf0a03cfec2f89b Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Wed, 31 Aug 2005 09:14:49 +0000 Subject: [PATCH 09/19] * Added 2.6.12.6 - [Security] Restrict socket policy loading to CAP_NET_ADMIN. See CAN-2005-2555. - [Maybe-Security: Can remote traffic trigger this] Fix DST leak in icmp_push_reply() - [Maybe-Security: Seems like a local DoS] NPTL signal delivery deadlock fix - fix gl_skb/skb type error in genelink driver in usbnet - [Maybe-Security: Seems like a local DoS] fix a memory leak in devices seq_file implementation - [Maybe-Security: Seems like a local DoS] Fix SKB leak in ip6_input_finish() svn path=/branches/dist/sid/kernel/linux-2.6/; revision=4084 --- debian/changelog | 17 ++- debian/patches-debian/2.6.12.6.patch | 152 ++++++++++++++++++++++++++ debian/patches-debian/series/2.6.12-6 | 2 +- 3 files changed, 168 insertions(+), 3 deletions(-) create mode 100644 debian/patches-debian/2.6.12.6.patch diff --git a/debian/changelog b/debian/changelog index b05044623..c23393f0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,11 +19,24 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low [Security] Restrict socket policy loading to CAP_NET_ADMIN. See CAN-2005-2555. - * zlib deflateBound() patch added as part of the 2.6.12.5 patch in + * zlib deflateBound() patch added as part of the 2.6.12.5 patch in 2.6.12-3 now has a CAN number. See CAN-2005-2457 - -- Simon Horman Tue, 30 Aug 2005 17:21:24 +0900 + * Added 2.6.12.6 + - [Security] Restrict socket policy loading to CAP_NET_ADMIN. + See CAN-2005-2555. + - [Maybe-Security: Can remote traffic trigger this] + Fix DST leak in icmp_push_reply() + - [Maybe-Security: Seems like a local DoS] + NPTL signal delivery deadlock fix + - fix gl_skb/skb type error in genelink driver in usbnet + - [Maybe-Security: Seems like a local DoS] + fix a memory leak in devices seq_file implementation + - [Maybe-Security: Seems like a local DoS] + Fix SKB leak in ip6_input_finish() + + -- Simon Horman Wed, 31 Aug 2005 18:13:58 +0900 linux-2.6 (2.6.12-5) unstable; urgency=low diff --git a/debian/patches-debian/2.6.12.6.patch b/debian/patches-debian/2.6.12.6.patch new file mode 100644 index 000000000..1cceae3a9 --- /dev/null +++ b/debian/patches-debian/2.6.12.6.patch @@ -0,0 +1,152 @@ +diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c +--- a/drivers/scsi/sg.c ++++ b/drivers/scsi/sg.c +@@ -2969,23 +2969,22 @@ static void * dev_seq_start(struct seq_f + { + struct sg_proc_deviter * it = kmalloc(sizeof(*it), GFP_KERNEL); + ++ s->private = it; + if (! it) + return NULL; ++ + if (NULL == sg_dev_arr) +- goto err1; ++ return NULL; + it->index = *pos; + it->max = sg_last_dev(); + if (it->index >= it->max) +- goto err1; ++ return NULL; + return it; +-err1: +- kfree(it); +- return NULL; + } + + static void * dev_seq_next(struct seq_file *s, void *v, loff_t *pos) + { +- struct sg_proc_deviter * it = (struct sg_proc_deviter *) v; ++ struct sg_proc_deviter * it = s->private; + + *pos = ++it->index; + return (it->index < it->max) ? it : NULL; +@@ -2993,7 +2992,9 @@ static void * dev_seq_next(struct seq_fi + + static void dev_seq_stop(struct seq_file *s, void *v) + { +- kfree (v); ++ struct sg_proc_deviter * it = s->private; ++ ++ kfree (it); + } + + static int sg_proc_open_dev(struct inode *inode, struct file *file) +diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c +--- a/drivers/usb/net/usbnet.c ++++ b/drivers/usb/net/usbnet.c +@@ -1922,7 +1922,7 @@ static int genelink_rx_fixup (struct usb + + // copy the packet data to the new skb + memcpy(skb_put(gl_skb, size), packet->packet_data, size); +- skb_return (dev, skb); ++ skb_return (dev, gl_skb); + } + + // advance to the next packet +diff --git a/kernel/signal.c b/kernel/signal.c +--- a/kernel/signal.c ++++ b/kernel/signal.c +@@ -686,7 +686,7 @@ static void handle_stop_signal(int sig, + { + struct task_struct *t; + +- if (p->flags & SIGNAL_GROUP_EXIT) ++ if (p->signal->flags & SIGNAL_GROUP_EXIT) + /* + * The process is in the middle of dying already. + */ +diff --git a/lib/zlib_inflate/inftrees.c b/lib/zlib_inflate/inftrees.c +--- a/lib/zlib_inflate/inftrees.c ++++ b/lib/zlib_inflate/inftrees.c +@@ -141,7 +141,7 @@ static int huft_build( + { + *t = NULL; + *m = 0; +- return Z_DATA_ERROR; ++ return Z_OK; + } + + +diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c +--- a/net/ipv4/icmp.c ++++ b/net/ipv4/icmp.c +@@ -349,12 +349,12 @@ static void icmp_push_reply(struct icmp_ + { + struct sk_buff *skb; + +- ip_append_data(icmp_socket->sk, icmp_glue_bits, icmp_param, +- icmp_param->data_len+icmp_param->head_len, +- icmp_param->head_len, +- ipc, rt, MSG_DONTWAIT); +- +- if ((skb = skb_peek(&icmp_socket->sk->sk_write_queue)) != NULL) { ++ if (ip_append_data(icmp_socket->sk, icmp_glue_bits, icmp_param, ++ icmp_param->data_len+icmp_param->head_len, ++ icmp_param->head_len, ++ ipc, rt, MSG_DONTWAIT) < 0) ++ ip_flush_pending_frames(icmp_socket->sk); ++ else if ((skb = skb_peek(&icmp_socket->sk->sk_write_queue)) != NULL) { + struct icmphdr *icmph = skb->h.icmph; + unsigned int csum = 0; + struct sk_buff *skb1; +diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c +--- a/net/ipv4/ip_sockglue.c ++++ b/net/ipv4/ip_sockglue.c +@@ -848,6 +848,9 @@ mc_msf_out: + + case IP_IPSEC_POLICY: + case IP_XFRM_POLICY: ++ err = -EPERM; ++ if (!capable(CAP_NET_ADMIN)) ++ break; + err = xfrm_user_policy(sk, optname, optval, optlen); + break; + +diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c +--- a/net/ipv6/ip6_input.c ++++ b/net/ipv6/ip6_input.c +@@ -198,12 +198,13 @@ resubmit: + if (!raw_sk) { + if (xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) { + IP6_INC_STATS_BH(IPSTATS_MIB_INUNKNOWNPROTOS); +- icmpv6_param_prob(skb, ICMPV6_UNK_NEXTHDR, nhoff); ++ icmpv6_send(skb, ICMPV6_PARAMPROB, ++ ICMPV6_UNK_NEXTHDR, nhoff, ++ skb->dev); + } +- } else { ++ } else + IP6_INC_STATS_BH(IPSTATS_MIB_INDELIVERS); +- kfree_skb(skb); +- } ++ kfree_skb(skb); + } + rcu_read_unlock(); + return 0; +diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c +--- a/net/ipv6/ipv6_sockglue.c ++++ b/net/ipv6/ipv6_sockglue.c +@@ -503,6 +503,9 @@ done: + break; + case IPV6_IPSEC_POLICY: + case IPV6_XFRM_POLICY: ++ retv = -EPERM; ++ if (!capable(CAP_NET_ADMIN)) ++ break; + retv = xfrm_user_policy(sk, optname, optval, optlen); + break; + +- +To unsubscribe from this list: send the line "unsubscribe linux-kernel-announce" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/debian/patches-debian/series/2.6.12-6 b/debian/patches-debian/series/2.6.12-6 index 1a28aad9a..628ddbc23 100644 --- a/debian/patches-debian/series/2.6.12-6 +++ b/debian/patches-debian/series/2.6.12-6 @@ -1 +1 @@ -+ net-sockglue-cap.patch ++ 2.6.12.6.patch From fc80cfed80f1974e14366b1bc53be1fec8705165 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 1 Sep 2005 08:02:59 +0000 Subject: [PATCH 10/19] * amd64-insert_vm_struct-leak.patch [Security] TASK_SIZE fixes for compatibility mode processes See CAN-2005-2617 svn path=/dists/sid/linux-2.6/; revision=4120 --- debian/changelog | 6 ++- .../amd64-insert_vm_struct-leak.patch | 42 +++++++++++++++++++ debian/patches-debian/series/2.6.12-6 | 1 + 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100755 debian/patches-debian/amd64-insert_vm_struct-leak.patch diff --git a/debian/changelog b/debian/changelog index c23393f0f..a2d0b158c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,7 +36,11 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low - [Maybe-Security: Seems like a local DoS] Fix SKB leak in ip6_input_finish() - -- Simon Horman Wed, 31 Aug 2005 18:13:58 +0900 + * amd64-insert_vm_struct-leak.patch + [Security] TASK_SIZE fixes for compatibility mode processes + See CAN-2005-2617 + + -- Simon Horman Thu, 1 Sep 2005 17:00:27 +0900 linux-2.6 (2.6.12-5) unstable; urgency=low diff --git a/debian/patches-debian/amd64-insert_vm_struct-leak.patch b/debian/patches-debian/amd64-insert_vm_struct-leak.patch new file mode 100755 index 000000000..ea4c6534d --- /dev/null +++ b/debian/patches-debian/amd64-insert_vm_struct-leak.patch @@ -0,0 +1,42 @@ +From: Siddha, Suresh B +Date: Sat, 16 Jul 2005 02:17:44 +0000 (-0700) +Subject: [PATCH] x86_64: TASK_SIZE fixes for compatibility mode processes +X-Git-Tag: v2.6.13-rc4 +X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=9fb1759a3102c26cd8f64254a7c3e532782c2bb8 + + [PATCH] x86_64: TASK_SIZE fixes for compatibility mode processes + + A malicious 32bit app can have an elf section at 0xffffe000. During + exec of this app, we will have a memory leak as insert_vm_struct() is + not checking for return value in syscall32_setup_pages() and thus not + freeing the vma allocated for the vsyscall page. + + Check the return value and free the vma incase of failure. + + Signed-off-by: Suresh Siddha + Signed-off-by: Linus Torvalds +--- + +--- a/arch/x86_64/ia32/syscall32.c ++++ b/arch/x86_64/ia32/syscall32.c +@@ -57,6 +57,7 @@ int syscall32_setup_pages(struct linux_b + int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT; + struct vm_area_struct *vma; + struct mm_struct *mm = current->mm; ++ int ret; + + vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); + if (!vma) +@@ -78,7 +79,11 @@ int syscall32_setup_pages(struct linux_b + vma->vm_mm = mm; + + down_write(&mm->mmap_sem); +- insert_vm_struct(mm, vma); ++ if ((ret = insert_vm_struct(mm, vma))) { ++ up_write(&mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, vma); ++ return ret; ++ } + mm->total_vm += npages; + up_write(&mm->mmap_sem); + return 0; diff --git a/debian/patches-debian/series/2.6.12-6 b/debian/patches-debian/series/2.6.12-6 index 628ddbc23..40dda97f3 100644 --- a/debian/patches-debian/series/2.6.12-6 +++ b/debian/patches-debian/series/2.6.12-6 @@ -1 +1,2 @@ + 2.6.12.6.patch ++ amd64-insert_vm_struct-leak.patch From 929ce1d9db29bf33ed24e1d801f43a885dc0a735 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 1 Sep 2005 08:03:40 +0000 Subject: [PATCH 11/19] tidy up changelog a little bit svn path=/dists/sid/linux-2.6/; revision=4121 --- debian/changelog | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a2d0b158c..438bdd1b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low - [ Bastian Blank ] + [ Andres Salomon, Bastian Blank ] * Change ATM and Classical-IP-over-ATM to be modular, instead of being statically included. - (closes: #323143) (Andres Salomon, Bastian Blank) + (closes: #323143) [ Sven Luther ] * [powerpc] @@ -13,7 +13,7 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low [ Simon Horman ] * Unset CC_OPTIMIZE_FOR_SIZE in i386 config, it breaks iproute's (and other netlink users) ability - to set routes. (closes: #322723) (Simon Horman) + to set routes. (closes: #322723) * net-sockglue-cap.patch [Security] Restrict socket policy loading to CAP_NET_ADMIN. @@ -39,8 +39,9 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low * amd64-insert_vm_struct-leak.patch [Security] TASK_SIZE fixes for compatibility mode processes See CAN-2005-2617 + * - -- Simon Horman Thu, 1 Sep 2005 17:00:27 +0900 + -- Simon Horman Thu, 1 Sep 2005 17:02:35 +0900 linux-2.6 (2.6.12-5) unstable; urgency=low From 2e1747ab4b824327e5793640e8c9bd51c7629b2a Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Tue, 6 Sep 2005 06:37:25 +0000 Subject: [PATCH 12/19] update changelog, reformatting to new conventions; drop unusued sockglue patch (included in 2.6.12.6) svn path=/dists/sid/linux-2.6/; revision=4127 --- debian/changelog | 46 +++++++------------- debian/patches-debian/net-sockglue-cap.patch | 39 ----------------- 2 files changed, 16 insertions(+), 69 deletions(-) delete mode 100644 debian/patches-debian/net-sockglue-cap.patch diff --git a/debian/changelog b/debian/changelog index 438bdd1b3..2d453d21a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,44 +2,30 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low [ Andres Salomon, Bastian Blank ] * Change ATM and Classical-IP-over-ATM to be modular, instead of being - statically included. - (closes: #323143) + statically included. (closes: #323143) [ Sven Luther ] - * [powerpc] - - Added pmac-sound sanity check patch. - - Added preliminary apus patch, not applied though. + * [powerpc] powerpc-pmac-sound-check.patch: Added pmac-sound sanity check. + * [powerpc] powerpc-apus.patch: + Added preliminary apus patch to package, not applied to kernel tree yet. [ Simon Horman ] * Unset CC_OPTIMIZE_FOR_SIZE in i386 config, it breaks iproute's (and other netlink users) ability to set routes. (closes: #322723) - - * net-sockglue-cap.patch - [Security] Restrict socket policy loading to CAP_NET_ADMIN. - See CAN-2005-2555. - - * zlib deflateBound() patch added as part of the 2.6.12.5 patch in - 2.6.12-3 now has a CAN number. - See CAN-2005-2457 - * Added 2.6.12.6 - - [Security] Restrict socket policy loading to CAP_NET_ADMIN. - See CAN-2005-2555. - - [Maybe-Security: Can remote traffic trigger this] - Fix DST leak in icmp_push_reply() - - [Maybe-Security: Seems like a local DoS] - NPTL signal delivery deadlock fix + - [SECURITY: CAN-2005-2555] Restrict socket policy loading to + CAP_NET_ADMIN. + - [SECURITY] Fix DST leak in icmp_push_reply(). Possible remote + DoS? + - [SECURITY] NPTL signal delivery deadlock fix; possible local + DoS. - fix gl_skb/skb type error in genelink driver in usbnet - - [Maybe-Security: Seems like a local DoS] - fix a memory leak in devices seq_file implementation - - [Maybe-Security: Seems like a local DoS] - Fix SKB leak in ip6_input_finish() - - * amd64-insert_vm_struct-leak.patch - [Security] TASK_SIZE fixes for compatibility mode processes - See CAN-2005-2617 - * + - [SECURITY] fix a memory leak in devices seq_file implementation; + local DoS. + - [SECURITY] Fix SKB leak in ip6_input_finish(); local DoS. + * [SECURITY: CAN-2005-2617] amd64-insert_vm_struct-leak.patch + TASK_SIZE fixes for compatibility mode processes. -- Simon Horman Thu, 1 Sep 2005 17:02:35 +0900 @@ -110,7 +96,7 @@ linux-2.6 (2.6.12-3) unstable; urgency=low - [security] Zlib fixes See CAN-2005-2458, CAN-2005-2459 http://sources.redhat.com/ml/bug-gnu-utils/1999-06/msg00183.html http://bugs.gentoo.org/show_bug.cgi - - Add zlib deflateBound() + - [security] Add zlib deflateBound(). See CAN-2005-2457 - [security] Fix error during session join. See CAN-2005-2098 - [security] Fix keyring destructor. See CAN-2005-2099 - Module per-cpu alignment cannot always be met diff --git a/debian/patches-debian/net-sockglue-cap.patch b/debian/patches-debian/net-sockglue-cap.patch deleted file mode 100644 index a37e9a8cb..000000000 --- a/debian/patches-debian/net-sockglue-cap.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Herbert Xu -Date: Sat, 6 Aug 2005 13:33:15 +0000 (-0700) -Subject: [IPSEC]: Restrict socket policy loading to CAP_NET_ADMIN. -X-Git-Tag: v2.6.13-rc6 -X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=6fc0b4a7a73a81e74d0004732df358f4f9975be2 - - [IPSEC]: Restrict socket policy loading to CAP_NET_ADMIN. - - The interface needs much redesigning if we wish to allow - normal users to do this in some way. - - Signed-off-by: Herbert Xu - Signed-off-by: David S. Miller ---- - ---- a/net/ipv4/ip_sockglue.c -+++ b/net/ipv4/ip_sockglue.c -@@ -848,6 +848,9 @@ mc_msf_out: - - case IP_IPSEC_POLICY: - case IP_XFRM_POLICY: -+ err = -EPERM; -+ if (!capable(CAP_NET_ADMIN)) -+ break; - err = xfrm_user_policy(sk, optname, optval, optlen); - break; - ---- a/net/ipv6/ipv6_sockglue.c -+++ b/net/ipv6/ipv6_sockglue.c -@@ -504,6 +504,9 @@ done: - break; - case IPV6_IPSEC_POLICY: - case IPV6_XFRM_POLICY: -+ retv = -EPERM; -+ if (!capable(CAP_NET_ADMIN)) -+ break; - retv = xfrm_user_policy(sk, optname, optval, optlen); - break; - From 1046a20511cfa63db8d2bb288e2d9ffda5dd8b60 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Tue, 6 Sep 2005 06:38:39 +0000 Subject: [PATCH 13/19] nuke amd64-insert_vm_struct-leak.patch, it was already added in 2.6.12.4. svn path=/dists/sid/linux-2.6/; revision=4128 --- debian/changelog | 4 +- .../amd64-insert_vm_struct-leak.patch | 42 ------------------- debian/patches-debian/series/2.6.12-6 | 1 - 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100755 debian/patches-debian/amd64-insert_vm_struct-leak.patch diff --git a/debian/changelog b/debian/changelog index 2d453d21a..4ba032069 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,8 +24,6 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low - [SECURITY] fix a memory leak in devices seq_file implementation; local DoS. - [SECURITY] Fix SKB leak in ip6_input_finish(); local DoS. - * [SECURITY: CAN-2005-2617] amd64-insert_vm_struct-leak.patch - TASK_SIZE fixes for compatibility mode processes. -- Simon Horman Thu, 1 Sep 2005 17:02:35 +0900 @@ -144,7 +142,7 @@ linux-2.6 (2.6.12-2) unstable; urgency=low - Fix potential memory corruption in NAT code (aka memory NAT) - Fix deadlock in ip6_queue - Fix signedness issues in net/core/filter.c - - x86_64 memleak from malicious 32bit elf program + - x86_64 memleak from malicious 32bit elf program (CAN-2005-2617) - rocket.c: Fix ldisc ref count handling - kbuild: build TAGS problem with O= diff --git a/debian/patches-debian/amd64-insert_vm_struct-leak.patch b/debian/patches-debian/amd64-insert_vm_struct-leak.patch deleted file mode 100755 index ea4c6534d..000000000 --- a/debian/patches-debian/amd64-insert_vm_struct-leak.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Siddha, Suresh B -Date: Sat, 16 Jul 2005 02:17:44 +0000 (-0700) -Subject: [PATCH] x86_64: TASK_SIZE fixes for compatibility mode processes -X-Git-Tag: v2.6.13-rc4 -X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=9fb1759a3102c26cd8f64254a7c3e532782c2bb8 - - [PATCH] x86_64: TASK_SIZE fixes for compatibility mode processes - - A malicious 32bit app can have an elf section at 0xffffe000. During - exec of this app, we will have a memory leak as insert_vm_struct() is - not checking for return value in syscall32_setup_pages() and thus not - freeing the vma allocated for the vsyscall page. - - Check the return value and free the vma incase of failure. - - Signed-off-by: Suresh Siddha - Signed-off-by: Linus Torvalds ---- - ---- a/arch/x86_64/ia32/syscall32.c -+++ b/arch/x86_64/ia32/syscall32.c -@@ -57,6 +57,7 @@ int syscall32_setup_pages(struct linux_b - int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT; - struct vm_area_struct *vma; - struct mm_struct *mm = current->mm; -+ int ret; - - vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); - if (!vma) -@@ -78,7 +79,11 @@ int syscall32_setup_pages(struct linux_b - vma->vm_mm = mm; - - down_write(&mm->mmap_sem); -- insert_vm_struct(mm, vma); -+ if ((ret = insert_vm_struct(mm, vma))) { -+ up_write(&mm->mmap_sem); -+ kmem_cache_free(vm_area_cachep, vma); -+ return ret; -+ } - mm->total_vm += npages; - up_write(&mm->mmap_sem); - return 0; diff --git a/debian/patches-debian/series/2.6.12-6 b/debian/patches-debian/series/2.6.12-6 index 40dda97f3..628ddbc23 100644 --- a/debian/patches-debian/series/2.6.12-6 +++ b/debian/patches-debian/series/2.6.12-6 @@ -1,2 +1 @@ + 2.6.12.6.patch -+ amd64-insert_vm_struct-leak.patch From e6eea8dc47e90e5a5df3910edf94092dab47cded Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Tue, 6 Sep 2005 06:39:26 +0000 Subject: [PATCH 14/19] ensure gencontrol.py is executable before attempting to execute it. svn path=/dists/sid/linux-2.6/; revision=4129 --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 0b01d8c8a..353dc2fab 100755 --- a/debian/rules +++ b/debian/rules @@ -71,6 +71,7 @@ debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES) fi debian/control-real: debian/bin/gencontrol.py $(CONTROL_FILES) + chmod +x $< $< md5sum $^ > debian/control.md5sum @echo From fdcf062acf42876c793ee2b011aef73fe07a9196 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Tue, 6 Sep 2005 08:00:17 +0000 Subject: [PATCH 15/19] * [hppa] disable discontiguous memory support for 32bit hppa images, so they build. svn path=/dists/sid/linux-2.6/; revision=4133 --- debian/arch/hppa/config.parisc | 1 + debian/arch/hppa/config.parisc-smp | 1 + debian/changelog | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/debian/arch/hppa/config.parisc b/debian/arch/hppa/config.parisc index cefa35044..cd57f71b9 100644 --- a/debian/arch/hppa/config.parisc +++ b/debian/arch/hppa/config.parisc @@ -1602,3 +1602,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +# CONFIG_DISCONTIGMEM is not set diff --git a/debian/arch/hppa/config.parisc-smp b/debian/arch/hppa/config.parisc-smp index d0751ba3f..3b97091df 100644 --- a/debian/arch/hppa/config.parisc-smp +++ b/debian/arch/hppa/config.parisc-smp @@ -1605,3 +1605,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +# CONFIG_DISCONTIGMEM is not set diff --git a/debian/changelog b/debian/changelog index 4ba032069..f977947d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,10 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low local DoS. - [SECURITY] Fix SKB leak in ip6_input_finish(); local DoS. + [ Andres Salomon ] + * [hppa] disable discontiguous memory support for 32bit hppa images, so + they build. + -- Simon Horman Thu, 1 Sep 2005 17:02:35 +0900 linux-2.6 (2.6.12-5) unstable; urgency=low From 95bd160151cd08444c281a0dbfc4cbe1cb0e87dc Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Tue, 6 Sep 2005 08:05:09 +0000 Subject: [PATCH 16/19] oops, that should apparently be enabled svn path=/dists/sid/linux-2.6/; revision=4134 --- debian/arch/hppa/config.parisc | 2 +- debian/arch/hppa/config.parisc-smp | 2 +- debian/changelog | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/arch/hppa/config.parisc b/debian/arch/hppa/config.parisc index cd57f71b9..a7d219678 100644 --- a/debian/arch/hppa/config.parisc +++ b/debian/arch/hppa/config.parisc @@ -1602,4 +1602,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m -# CONFIG_DISCONTIGMEM is not set +CONFIG_DISCONTIGMEM=y diff --git a/debian/arch/hppa/config.parisc-smp b/debian/arch/hppa/config.parisc-smp index 3b97091df..d02c21bb1 100644 --- a/debian/arch/hppa/config.parisc-smp +++ b/debian/arch/hppa/config.parisc-smp @@ -1605,4 +1605,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m -# CONFIG_DISCONTIGMEM is not set +CONFIG_DISCONTIGMEM=y diff --git a/debian/changelog b/debian/changelog index f977947d9..cda3d0901 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,7 +26,7 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low - [SECURITY] Fix SKB leak in ip6_input_finish(); local DoS. [ Andres Salomon ] - * [hppa] disable discontiguous memory support for 32bit hppa images, so + * [hppa] enable discontiguous memory support for 32bit hppa images, so they build. -- Simon Horman Thu, 1 Sep 2005 17:02:35 +0900 From 0a1b18a3aa960f2d7d625eb307ea1c38f3640a45 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Tue, 6 Sep 2005 18:02:27 +0000 Subject: [PATCH 17/19] prepare release 2.6.12-6 svn path=/dists/sid/linux-2.6/; revision=4135 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cda3d0901..62ea89d12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-2.6 (2.6.12-6) UNRELEASED; urgency=low +linux-2.6 (2.6.12-6) unstable; urgency=high [ Andres Salomon, Bastian Blank ] * Change ATM and Classical-IP-over-ATM to be modular, instead of being @@ -29,7 +29,7 @@ linux-2.6 (2.6.12-6) UNRELEASED; urgency=low * [hppa] enable discontiguous memory support for 32bit hppa images, so they build. - -- Simon Horman Thu, 1 Sep 2005 17:02:35 +0900 + -- Andres Salomon Tue, 06 Sep 2005 10:14:35 -0400 linux-2.6 (2.6.12-5) unstable; urgency=low From 526aae9a25f2eabbd9f39bb9a5f750eb00b0b56d Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Fri, 9 Sep 2005 02:41:19 +0000 Subject: [PATCH 18/19] Annotate CAN-2005-2800 svn path=/dists/sid/linux-2.6/; revision=4146 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 62ea89d12..6ddfd5b5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +linux-2.6 (2.6.12-7) UNRELEASED; urgency=low + + [ Simon Horman ] + * [SECURITY] THe seq_file memory leak fix included in 2.6.12-6 + as part of upstream's 2.6.12.6 patchset is now CAN-2005-2800. + + -- Simon Horman Fri, 9 Sep 2005 11:38:06 +0900 + linux-2.6 (2.6.12-6) unstable; urgency=high [ Andres Salomon, Bastian Blank ] From 928767db0ff5bdf470febc073db89d248f78d477 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Wed, 14 Sep 2005 16:55:08 +0000 Subject: [PATCH 19/19] * module-unify-per-cpu-data.patch: Unifies per cpu data handling for UP and SMP builds. This fixes a bug detected on ia64 whose symptom was unloadable modules in UP builds. (closes: #325070) svn path=/dists/sid/linux-2.6/; revision=4200 --- debian/changelog | 7 +- .../module-unify-per-cpu-data.patch | 131 ++++++++++++++++++ debian/patches-debian/series/2.6.12-6 | 1 + 3 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 debian/patches-debian/module-unify-per-cpu-data.patch diff --git a/debian/changelog b/debian/changelog index 6ddfd5b5f..5e5bfada3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,12 @@ linux-2.6 (2.6.12-7) UNRELEASED; urgency=low * [SECURITY] THe seq_file memory leak fix included in 2.6.12-6 as part of upstream's 2.6.12.6 patchset is now CAN-2005-2800. - -- Simon Horman Fri, 9 Sep 2005 11:38:06 +0900 + [ dann frazier ] + * module-unify-per-cpu-data.patch: Unifies per cpu data handling for UP + and SMP builds. This fixes a bug detected on ia64 whose symptom was + unloadable modules in UP builds. (closes: #325070) + + -- dann frazier Tue, 13 Sep 2005 18:02:36 -0600 linux-2.6 (2.6.12-6) unstable; urgency=high diff --git a/debian/patches-debian/module-unify-per-cpu-data.patch b/debian/patches-debian/module-unify-per-cpu-data.patch new file mode 100644 index 000000000..8d805d337 --- /dev/null +++ b/debian/patches-debian/module-unify-per-cpu-data.patch @@ -0,0 +1,131 @@ +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Description: Make UP & SMP kernels treat module per-cpu data the same +## DP: Description: See the patch header for more details. +## DP: Patch author: Peter Chubb +## DP: Upstream status: submitted +## + +From: Peter Chubb +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Message-ID: <17174.35525.283392.703723@berry.gelato.unsw.EDU.AU> +Date: Thu, 1 Sep 2005 14:59:49 +1000 +To: linux-ia64@vger.kernel.org, tony.luck@intel.com, dmosberger@gmail.com +Cc: linux-kernel@vger.kernel.org +In-Reply-To: +References: + + + <17172.54563.329758.846131@wombat.chubb.wattle.id.au> +X-Mailer: VM 7.19 under 21.4 (patch 17) "Jumbo Shrimp" XEmacs Lucid +Comments: Hyperbole mail buttons accepted, v04.18. +X-Face: + GgFg(Z>fx((4\32hvXq<)|jndSniCH~~$D)Ka:P@e@JR1P%Vr}EwUdfwf-4j\rUs#JR{'h# + !]])6%Jh~b$VA|ALhnpPiHu[-x~@<"@Iv&|%R)Fq[[,(&Z'O)Q)xCqe1\M[F8#9l8~}#u$S$Rm`S9% + \'T@`:&8>Sb*c5d'=eDYI&GF`+t[LfDH="MP5rwOO]w>ALi7'=QJHz&y&C&TE_3j! +X-SA-Exim-Connect-IP: 203.143.160.117 +X-SA-Exim-Mail-From: peterc@gelato.unsw.edu.au +Subject: RE: ip_contrack refuses to load if built UP as a module on IA64 +X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on + lemon.gelato.unsw.edu.au +X-Spam-Level: +X-Spam-Status: No, score=-2.3 required=5.0 tests=ALL_TRUSTED,AWL + autolearn=ham version=3.0.4 +X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:39:27 +0000) +X-SA-Exim-Scanned: Yes (on lemon.gelato.unsw.edu.au) +Sender: linux-ia64-owner@vger.kernel.org +Precedence: bulk +X-Mailing-List: linux-ia64@vger.kernel.org +X-PMX-Version: 5.0.3.165339, Antispam-Engine: 2.1.0.0, Antispam-Data: + 2005.8.31.39 +X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at ldl.fc.hp.com +X-Evolution-Source: imap://dannf@linux.fc.hp.com/ +Content-Transfer-Encoding: 8bit + + + +This patch makes UP and SMP do the same thing as far as module per-cpu +data go. + +Unfortunately it affects core code. + +To repeat the problem: + IA64 keeps per-cpu data in a small data area that is referenced by a + 22-bit offset, for both UP and SMP cases. If a module defines + per-cpu data, it too will end up in the small-data area. But the + module loader at present special-cases the UP treatment of per-cpu + data, assumes that it is in the GP-relative data area, and does + nothing (for SMP it allocates space, and copies initialised data + items into it) + + The effect is that modules defining per-cpu data fail to load if + they're built UP, because of an impossible relocation. + + The appended patch makes the treatment of per-cpu data uniform + between UP and SMP cases. For most architectures, the per-cpu data + section will be empty for UP, and so the per-cpu setup code will not + be invoked. + +Signed-off-by: Peter Chubb + +diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c +--- a/arch/ia64/kernel/module.c ++++ b/arch/ia64/kernel/module.c +@@ -951,4 +951,10 @@ percpu_modcopy (void *pcpudst, const voi + if (cpu_possible(i)) + memcpy(pcpudst + __per_cpu_offset[i], src, size); + } ++#else ++void ++percpu_modcopy (void *pcpudst, const void *src, unsigned long size) ++{ ++ memcpy(pcpudst, src, size); ++} + #endif /* CONFIG_SMP */ +diff --git a/kernel/module.c b/kernel/module.c +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -209,7 +209,6 @@ static struct module *find_module(const + return NULL; + } + +-#ifdef CONFIG_SMP + /* Number of blocks used and allocated. */ + static unsigned int pcpu_num_used, pcpu_num_allocated; + /* Size of each block. -ve means used. */ +@@ -352,29 +351,7 @@ static int percpu_modinit(void) + return 0; + } + __initcall(percpu_modinit); +-#else /* ... !CONFIG_SMP */ +-static inline void *percpu_modalloc(unsigned long size, unsigned long align, +- const char *name) +-{ +- return NULL; +-} +-static inline void percpu_modfree(void *pcpuptr) +-{ +- BUG(); +-} +-static inline unsigned int find_pcpusec(Elf_Ehdr *hdr, +- Elf_Shdr *sechdrs, +- const char *secstrings) +-{ +- return 0; +-} +-static inline void percpu_modcopy(void *pcpudst, const void *src, +- unsigned long size) +-{ +- /* pcpusec should be 0, and size of that section should be 0. */ +- BUG_ON(size != 0); +-} +-#endif /* CONFIG_SMP */ ++ + + #ifdef CONFIG_MODULE_UNLOAD + #define MODINFO_ATTR(field) \ +- +To unsubscribe from this list: send the line "unsubscribe linux-ia64" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/debian/patches-debian/series/2.6.12-6 b/debian/patches-debian/series/2.6.12-6 index 628ddbc23..c4f966724 100644 --- a/debian/patches-debian/series/2.6.12-6 +++ b/debian/patches-debian/series/2.6.12-6 @@ -1 +1,2 @@ + 2.6.12.6.patch ++ module-unify-per-cpu-data.patch