[kernel] r9060 - in dists/etch-security/linux-2.6/debian: . arch arch/arm arch/mips arch/mipsel arch/sparc modules patches/bugfix patches/bugfix/all/vserver patches/bugfix/mips patches/features patches/series
Dann Frazier
dannf at alioth.debian.org
Wed Jul 4 15:03:08 UTC 2007
Author: dannf
Date: Wed Jul 4 15:03:08 2007
New Revision: 9060
Log:
merge in 2.6.18.dfsg.1-13
Added:
dists/etch-security/linux-2.6/debian/patches/bugfix/all/vserver/cacct-overflow.patch
- copied unchanged from r9059, /releases/linux-2.6/2.6.18.dfsg.1-13/debian/patches/bugfix/all/vserver/cacct-overflow.patch
dists/etch-security/linux-2.6/debian/patches/bugfix/all/vserver/locks.patch
- copied unchanged from r9059, /releases/linux-2.6/2.6.18.dfsg.1-13/debian/patches/bugfix/all/vserver/locks.patch
dists/etch-security/linux-2.6/debian/patches/bugfix/all/vserver/net-mount-fix.patch
- copied unchanged from r9059, /releases/linux-2.6/2.6.18.dfsg.1-13/debian/patches/bugfix/all/vserver/net-mount-fix.patch
dists/etch-security/linux-2.6/debian/patches/bugfix/amd64-make-gart-ptes-uncacheable.patch
- copied unchanged from r9059, /releases/linux-2.6/2.6.18.dfsg.1-13/debian/patches/bugfix/amd64-make-gart-ptes-uncacheable.patch
dists/etch-security/linux-2.6/debian/patches/bugfix/fix-syscallX-uml.patch
- copied unchanged from r9059, /releases/linux-2.6/2.6.18.dfsg.1-13/debian/patches/bugfix/fix-syscallX-uml.patch
dists/etch-security/linux-2.6/debian/patches/bugfix/gdth_copy_cmd-oops-fix.patch
- copied unchanged from r9059, /releases/linux-2.6/2.6.18.dfsg.1-13/debian/patches/bugfix/gdth_copy_cmd-oops-fix.patch
dists/etch-security/linux-2.6/debian/patches/bugfix/ipv6-disallow-RH0-by-default.patch
- copied unchanged from r9059, /releases/linux-2.6/2.6.18.dfsg.1-13/debian/patches/bugfix/ipv6-disallow-RH0-by-default.patch
dists/etch-security/linux-2.6/debian/patches/bugfix/jmicron-generic-device-conflict.patch
- copied unchanged from r9059, /releases/linux-2.6/2.6.18.dfsg.1-13/debian/patches/bugfix/jmicron-generic-device-conflict.patch
dists/etch-security/linux-2.6/debian/patches/bugfix/listxattr-mem-corruption.patch
- copied unchanged from r9059, /releases/linux-2.6/2.6.18.dfsg.1-13/debian/patches/bugfix/listxattr-mem-corruption.patch
dists/etch-security/linux-2.6/debian/patches/bugfix/mips/tcp-checksum.patch
- copied unchanged from r9059, /releases/linux-2.6/2.6.18.dfsg.1-13/debian/patches/bugfix/mips/tcp-checksum.patch
dists/etch-security/linux-2.6/debian/patches/features/agp-i965.patch
- copied unchanged from r9059, /releases/linux-2.6/2.6.18.dfsg.1-13/debian/patches/features/agp-i965.patch
dists/etch-security/linux-2.6/debian/patches/series/13
- copied unchanged from r9059, /releases/linux-2.6/2.6.18.dfsg.1-13/debian/patches/series/13
dists/etch-security/linux-2.6/debian/patches/series/13-extra
- copied unchanged from r9059, /releases/linux-2.6/2.6.18.dfsg.1-13/debian/patches/series/13-extra
dists/etch-security/linux-2.6/debian/patches/series/13etch1
- copied unchanged from r9059, /dists/etch-security/linux-2.6/debian/patches/series/12etch3
Removed:
dists/etch-security/linux-2.6/debian/patches/series/12etch3
Modified:
dists/etch-security/linux-2.6/debian/arch/arm/config.versatile
dists/etch-security/linux-2.6/debian/arch/config
dists/etch-security/linux-2.6/debian/arch/defines
dists/etch-security/linux-2.6/debian/arch/mips/config.qemu
dists/etch-security/linux-2.6/debian/arch/mipsel/config.qemu
dists/etch-security/linux-2.6/debian/arch/sparc/config
dists/etch-security/linux-2.6/debian/changelog
dists/etch-security/linux-2.6/debian/modules/rules.include
Modified: dists/etch-security/linux-2.6/debian/arch/arm/config.versatile
==============================================================================
--- dists/etch-security/linux-2.6/debian/arch/arm/config.versatile (original)
+++ dists/etch-security/linux-2.6/debian/arch/arm/config.versatile Wed Jul 4 15:03:08 2007
@@ -219,7 +219,7 @@
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_FWMARK=y
CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
+# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
CONFIG_IP_ROUTE_MULTIPATH_RR=m
CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m
Modified: dists/etch-security/linux-2.6/debian/arch/config
==============================================================================
--- dists/etch-security/linux-2.6/debian/arch/config (original)
+++ dists/etch-security/linux-2.6/debian/arch/config Wed Jul 4 15:03:08 2007
@@ -100,7 +100,7 @@
# CONFIG_TCG_TPM is not set
CONFIG_TCG_ATMEL=m
CONFIG_TCG_NSC=m
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
+# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
CONFIG_6PACK=m
CONFIG_DVB_USB_DTT200U=m
CONFIG_DVB_USB_DIGITV=m
Modified: dists/etch-security/linux-2.6/debian/arch/defines
==============================================================================
--- dists/etch-security/linux-2.6/debian/arch/defines (original)
+++ dists/etch-security/linux-2.6/debian/arch/defines Wed Jul 4 15:03:08 2007
@@ -1,5 +1,5 @@
[abi]
-abiname: 4
+abiname: 5
[base]
arches:
Modified: dists/etch-security/linux-2.6/debian/arch/mips/config.qemu
==============================================================================
--- dists/etch-security/linux-2.6/debian/arch/mips/config.qemu (original)
+++ dists/etch-security/linux-2.6/debian/arch/mips/config.qemu Wed Jul 4 15:03:08 2007
@@ -265,7 +265,7 @@
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_FWMARK=y
CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
+# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
CONFIG_IP_ROUTE_MULTIPATH_RR=m
CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m
Modified: dists/etch-security/linux-2.6/debian/arch/mipsel/config.qemu
==============================================================================
--- dists/etch-security/linux-2.6/debian/arch/mipsel/config.qemu (original)
+++ dists/etch-security/linux-2.6/debian/arch/mipsel/config.qemu Wed Jul 4 15:03:08 2007
@@ -265,7 +265,7 @@
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_FWMARK=y
CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
+# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
CONFIG_IP_ROUTE_MULTIPATH_RR=m
CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m
Modified: dists/etch-security/linux-2.6/debian/arch/sparc/config
==============================================================================
--- dists/etch-security/linux-2.6/debian/arch/sparc/config (original)
+++ dists/etch-security/linux-2.6/debian/arch/sparc/config Wed Jul 4 15:03:08 2007
@@ -160,8 +160,7 @@
# CONFIG_ECONET is not set
# CONFIG_SND_BT87X is not set
CONFIG_NET_FC=y
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# Digital Video Broadcasting Devices
+CONFIG_SCSI_QLOGIC_1280=m
CONFIG_PARPORT_NOT_PC=y
# CONFIG_PHONE is not set
CONFIG_CODA_FS=m
Modified: dists/etch-security/linux-2.6/debian/changelog
==============================================================================
--- dists/etch-security/linux-2.6/debian/changelog (original)
+++ dists/etch-security/linux-2.6/debian/changelog Wed Jul 4 15:03:08 2007
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.18.dfsg.1-12etch3) stable-security; urgency=high
+linux-2.6 (2.6.18.dfsg.1-13etch1) stable-security; urgency=high
* bugfix/bluetooth-l2cap-hci-info-leaks.patch
[SECURITY] Fix information leaks in setsockopt() implementations
@@ -12,6 +12,46 @@
-- dann frazier <dannf at debian.org> Wed, 04 Jul 2007 08:57:36 -0600
+linux-2.6 (2.6.18.dfsg.1-13) stable; urgency=high
+
+ [ Bastian Blank ]
+ * [vserver] Fix overflow in network accounting. (closes: #412132)
+ * [vserver] Fix lock accounting. (closes: #417631)
+ * Bump ABI to 5.
+ * Make modules packages binnmuable.
+ * [sparc] Enable Qlogic QLA SCSI support. (closes: #417629)
+
+ [ dann frazier ]
+ * bugfix/listxattr-mem-corruption.patch
+ [SECURITY] Fix userspace corruption vulnerability caused by
+ incorrectly promoted return values in bad_inode_ops
+ This patch changes the kernel ABI.
+ See CVE-2006-5753
+ * bugfix/all/vserver/net-mount-fix.patch
+ Fix mounting of network filesystems with VX_BINARY_MOUNT caps
+ (closes: #418076)
+ * Disable broken CONFIG_IP_ROUTE_MULTIPATH_CACHED setting. (closes: #418344)
+ * bugfix/ipv6-disallow-RH0-by-default.patch
+ [SECURITY] Avoid a remote DoS (network amplification between two routers)
+ by disabling type0 IPv6 route headers by default. Can be re-enabled via
+ a sysctl interface. Thanks to Vlad Yasevich for porting help.
+ This patch changes the kernel ABI.
+ See CVE-2007-2242
+ * Fix an oops which potentially results in data corruption in the gdth driver.
+ (closes: #412092)
+ * bugfix/amd64-make-gart-ptes-uncacheable.patch
+ Fix silent data corruption using GART iommu (closes: #404148)
+
+ [ maximilian attems ]
+ * Backport support for i965 to agp too. (closes: #406111)
+ * Compile fix for UML CONFIG_MODE_TT=y. (closes: #412957)
+ * Fix ide-generic jmicron device conflict. (closes: #421281)
+
+ [ Martin Michlmayr ]
+ * Fix wrong checksum for split TCP packets on 64-bit MIPS. (closes: #421283)
+
+ -- dann frazier <dannf at debian.org> Mon, 21 May 2007 14:45:13 -0600
+
linux-2.6 (2.6.18.dfsg.1-12etch2) stable-security; urgency=high
* bugfix/nfnetlink_log-null-deref.patch
Modified: dists/etch-security/linux-2.6/debian/modules/rules.include
==============================================================================
--- dists/etch-security/linux-2.6/debian/modules/rules.include (original)
+++ dists/etch-security/linux-2.6/debian/modules/rules.include Wed Jul 4 15:03:08 2007
@@ -5,6 +5,8 @@
include $(__MODULES_DIR)rules.defs
+__BINNMU := $(shell dpkg-parsechangelog | sed -ne 's,^Version: .*\+b\(.*\)$$,\1,p')
+
BUILD_STAMP = $(STAMPS_DIR)/build-base
build: debian/control $(BUILD_STAMP)
@@ -36,8 +38,14 @@
GENCONTROL = $(__MODULES_DIR)gencontrol.py
debian/control debian/rules.gen: $(CONTROL_FILES)
if [ -f debian/control ] && [ -f debian/control.md5sum ] && [ -f debian/rules.gen ]; then \
- if md5sum $^ | diff - debian/control.md5sum > /dev/null; then true; else \
- $(MAKE) -f debian/rules debian/control-real; \
+ if [ "$(__BINNMU)" ]; then \
+ if ! grep -v debian/changelog debian/control.md5sum | md5sum --check - --status; then \
+ $(MAKE) -f debian/rules debian/control-real; \
+ fi \
+ else \
+ if ! md5sum --check debian/control.md5sum --status; then \
+ $(MAKE) -f debian/rules debian/control-real; \
+ fi \
fi \
else \
$(MAKE) -f debian/rules debian/control-real; \
More information about the Kernel-svn-changes
mailing list