r1562 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches: . series
Joshua Kwan
joshk@haydn.debian.org
Sun, 05 Sep 2004 15:27:31 -0600
Author: joshk
Date: 2004-09-05 15:27:20 -0600 (Sun, 05 Sep 2004)
New Revision: 1562
Added:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/086_ver_linux_ld.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/087_mkdep_xargs.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/088_dont_use_infobox.diff
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/000_panic_vsnprintf.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/001_optimise_size.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/002_alpha_time.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/003_kbuild_fixes.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/004_386_emu.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/005_bigphysarea.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/006_acpi_default_off.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/007_drmP_no_cmpxchg.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/020_cpqphp_proc_cond.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/024_isofs_fixes.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/030_pegasus_lockup.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/043_ipsec.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6
Log:
final round of annotations
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/000_panic_vsnprintf.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/000_panic_vsnprintf.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/000_panic_vsnprintf.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -1,8 +1,29 @@
-# http://lkml.org/lkml/2002/6/24/142
-# http://www.ultramonkey.org/bugs/cve/CAN-2004-0394.shtml
+# origin: CAN-2004-0394
+# cset: 1.1458.3.10
+# inclusion: n/a (projected: 2.4.28-pre3)
+# description: fix possible buffer overflow in panic()
+# revision date: 2004-09-05
---- ./kernel/panic.c.orig 2002-11-29 08:53:15.000000000 +0900
-+++ ./kernel/panic.c 2004-06-11 14:46:27.000000000 +0900
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/08/12 18:45:04-03:00 chrisw@osdl.org
+# [PATCH] fix possible buffer overflow in panic()
+#
+# Minor issue here with the static buffer in 2.4 kernel's panic() function.
+# This has already been fixed in 2.6.
+#
+# [PATCH] fix possible buffer overflow in panic()
+#
+# ===== kernel/panic.c 1.12 vs edited =====
+#
+# kernel/panic.c
+# 2004/04/15 07:33:32-03:00 chrisw@osdl.org +1 -1
+# fix possible buffer overflow in panic()
+#
+diff -Nru a/kernel/panic.c b/kernel/panic.c
+--- a/kernel/panic.c 2004-09-05 02:07:39 -07:00
++++ b/kernel/panic.c 2004-09-05 02:07:39 -07:00
@@ -59,7 +59,7 @@
bust_spinlocks(1);
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/001_optimise_size.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/001_optimise_size.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/001_optimise_size.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -1,5 +1,8 @@
-# Adds CONFIG_OPTIMISE_SIZE, which allows you to specify kernel compilation
-# using -Os or default -O2.
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: allow compilation using -Os over -O2
+# revision date: 2004-09-05
--- kernel-source-2.4.27-2.4.27/Documentation/Configure.help~ 2004-08-10 23:53:40.000000000 -0700
+++ kernel-source-2.4.27-2.4.27/Documentation/Configure.help 2004-08-10 23:54:32.000000000 -0700
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/002_alpha_time.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/002_alpha_time.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/002_alpha_time.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -1,3 +1,9 @@
+# origin: Debian, #233096
+# cset: n/a
+# inclusion: not submitted
+# description: tighten sanity in time_init to 250PPM
+# revision date: 2004-09-05
+
diff -urN kernel-source-2.4.26/arch/alpha/kernel/time.c kernel-source-2.4.26-1/arch/alpha/kernel/time.c
--- kernel-source-2.4.26/arch/alpha/kernel/time.c 2003-06-14 00:51:29.000000000 +1000
+++ kernel-source-2.4.26-1/arch/alpha/kernel/time.c 2004-03-29 06:36:34.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/003_kbuild_fixes.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/003_kbuild_fixes.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/003_kbuild_fixes.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: superseded by 086-088
+# description: misc kbuild fixes
+# revision date: 2004-09-05
+
diff -urN kernel-source-2.4.26/scripts/Menuconfig kernel-source-2.4.26-1/scripts/Menuconfig
--- kernel-source-2.4.26/scripts/Menuconfig 2002-08-03 10:39:46.000000000 +1000
+++ kernel-source-2.4.26-1/scripts/Menuconfig 2003-02-22 14:08:24.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/004_386_emu.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/004_386_emu.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/004_386_emu.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -1,3 +1,9 @@
+# origin: Willy Tarreau
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: 486 emulation for 386 patch
+# revision date: 2004-09-05
+
--- kernel-source-2.4.26/Documentation/Configure.help 2004-04-14 23:05:24.000000000 +1000
+++ kernel-source-2.4.26-1/Documentation/Configure.help 2004-04-17 14:23:30.000000000 +1000
@@ -4780,6 +4802,38 @@
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/005_bigphysarea.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/005_bigphysarea.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/005_bigphysarea.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -1,3 +1,9 @@
+# origin: http://www.polyware.nl/~middelin/hob-v4l.html (Debian, #144849)
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: Big Physical Area patch
+# revision date: 2004-09-05
+
--- a/Documentation/Configure.help 2004-04-14 23:05:24.000000000 +1000
+++ b/Documentation/Configure.help 2004-04-17 14:23:30.000000000 +1000
@@ -320,6 +320,14 @@
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/006_acpi_default_off.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/006_acpi_default_off.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/006_acpi_default_off.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: add an option to disable ACPI by default
+# revision date: 2004-09-05
+
--- a/Documentation/Configure.help 2004-04-14 23:05:24.000000000 +1000
+++ b/Documentation/Configure.help 2004-04-17 14:23:30.000000000 +1000
@@ -20029,6 +20195,11 @@
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/007_drmP_no_cmpxchg.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/007_drmP_no_cmpxchg.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/007_drmP_no_cmpxchg.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: remove extra definition of cmpxchg in drmP.h
+# revision date: 2004-09-05
+
diff -urN kernel-source-2.4.26-1/drivers/char/drm-4.0/drmP.h kernel-source-2.4.26-2/drivers/char/drm-4.0/drmP.h
--- kernel-source-2.4.26-1/drivers/char/drm-4.0/drmP.h 2004-02-21 14:47:05.000000000 +1100
+++ kernel-source-2.4.26-2/drivers/char/drm-4.0/drmP.h 2004-04-24 16:11:31.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/020_cpqphp_proc_cond.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/020_cpqphp_proc_cond.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/020_cpqphp_proc_cond.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: don't build cpqphp_proc.o if !PROC_FS
+# revision date: 2004-09-05
+
diff -urN kernel-source-2.4.26/drivers/hotplug/Makefile kernel-source-2.4.26-1/drivers/hotplug/Makefile
--- kernel-source-2.4.26/drivers/hotplug/Makefile 2003-08-25 21:44:41.000000000 +1000
+++ kernel-source-2.4.26-1/drivers/hotplug/Makefile 2004-04-17 08:17:42.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/024_isofs_fixes.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/024_isofs_fixes.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/024_isofs_fixes.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert, many bugs)
+# cset: n/a
+# inclusion: superseded by 076-078
+# description: misc. isofs fixes
+# revision date: 2004-09-05
+
diff -urN kernel-source-2.4.26/fs/isofs/dir.c kernel-source-2.4.26-1/fs/isofs/dir.c
--- kernel-source-2.4.26/fs/isofs/dir.c 2002-02-26 06:38:08.000000000 +1100
+++ kernel-source-2.4.26-1/fs/isofs/dir.c 2002-04-13 21:45:40.000000000 +1000
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/030_pegasus_lockup.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/030_pegasus_lockup.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/030_pegasus_lockup.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: fix pegasus_set_multicast lockup
+# revision date: 2004-09-05
+
diff -urN kernel-source-2.4.26/drivers/usb/pegasus.c kernel-source-2.4.26-1/drivers/usb/pegasus.c
--- kernel-source-2.4.26/drivers/usb/pegasus.c 2004-02-19 00:36:31.000000000 +1100
+++ kernel-source-2.4.26-1/drivers/usb/pegasus.c 2004-02-22 20:28:27.000000000 +1100
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/043_ipsec.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/043_ipsec.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/043_ipsec.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -1,3 +1,9 @@
+# origin: kernel-patch-ipsec (herbert)
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: IPsec patch
+# revision date: 2004-09-05
+
diff -urN linux-2.4.27/Documentation/Configure.help linux-2.4.27+debian/Documentation/Configure.help
--- linux-2.4.27/Documentation/Configure.help 2004-08-12 01:22:31.059800008 +0200
+++ linux-2.4.27+debian/Documentation/Configure.help 2004-08-12 00:59:55.739989620 +0200
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/086_ver_linux_ld.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/086_ver_linux_ld.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/086_ver_linux_ld.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -0,0 +1,18 @@
+# origin: Debian (joshk)
+# cset: n/a
+# inclusion: not submitted
+# description: support GNU ld output in ver_linux
+# revision date: 2004-09-05
+
+--- a/scripts/ver_linux 2004-09-05 01:31:23.000000000 -0700
++++ b/scripts/ver_linux 2004-09-05 01:31:47.000000000 -0700
+@@ -22,7 +22,8 @@
+ '/GNU Make/{print "Gnu make ",$NF}'
+
+ ld -v 2>&1 | awk -F\) '{print $1}' | awk \
+- '/BFD/{print "binutils ",$NF}'
++ '/BFD/{print "binutils ",$NF}
++ /^GNU/{print "binutils ",$4}'
+
+ fdformat --version | awk -F\- '{print "util-linux ", $NF}'
+
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/087_mkdep_xargs.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/087_mkdep_xargs.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/087_mkdep_xargs.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -0,0 +1,18 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: prevent potential command line overflows with xargs
+# revision date: 2004-09-05
+
+diff -urN kernel-source-2.4.26/Makefile kernel-source-2.4.26-1/Makefile
+--- kernel-source-2.4.26/Makefile 2004-04-14 23:05:41.000000000 +1000
++++ kernel-source-2.4.26-1/Makefile 2004-04-17 14:23:30.000000000 +1000
+@@ -500,7 +505,7 @@
+ ifdef CONFIG_MODVERSIONS
+ $(MAKE) update-modverfile
+ endif
+- scripts/mkdep -- `find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
++ find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print | xargs scripts/mkdep -- > .hdepend
+ scripts/mkdep -- init/*.c > .depend
+
+ ifdef CONFIG_MODVERSIONS
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/088_dont_use_infobox.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/088_dont_use_infobox.diff 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/088_dont_use_infobox.diff 2004-09-05 21:27:20 UTC (rev 1562)
@@ -0,0 +1,63 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: use msgbox (with OK button) instead of infobox + sleep
+# revision date: 2004-09-05
+
+diff -urN kernel-source-2.4.26/scripts/Menuconfig kernel-source-2.4.26-1/scripts/Menuconfig
+--- kernel-source-2.4.26/scripts/Menuconfig 2002-08-03 10:39:46.000000000 +1000
++++ kernel-source-2.4.26-1/scripts/Menuconfig 2003-02-22 14:08:24.000000000 +1100
+@@ -490,10 +490,9 @@
+ case "$2" in
+ y) echo -en "\007"
+ ${DIALOG} --backtitle "$backtitle" \
+- --infobox "\
++ --msgbox "\
+ This feature depends on another which has been configured as a module. \
+-As a result, this feature will be built as a module." 4 70
+- sleep 5
++As a result, this feature will be built as a module." 6 70
+ eval $1=m ;;
+ m) eval $1=m ;;
+ c) eval x=\$$1
+@@ -557,8 +556,7 @@
+ eval $2=\"$3\"
+ echo -en "\007"
+ ${DIALOG} --backtitle "$backtitle" \
+- --infobox "You have made an invalid entry." 3 43
+- sleep 2
++ --msgbox "You have made an invalid entry." 5 43
+ fi
+
+ break
+@@ -590,8 +588,7 @@
+ eval $2=\"$3\"
+ echo -en "\007"
+ ${DIALOG} --backtitle "$backtitle" \
+- --infobox "You have made an invalid entry." 3 43
+- sleep 2
++ --msgbox "You have made an invalid entry." 5 43
+ fi
+
+ break
+@@ -957,8 +954,7 @@
+ else
+ echo -ne "\007"
+ $DIALOG --backtitle "$backtitle" \
+- --infobox "File does not exist!" 3 38
+- sleep 2
++ --msgbox "File does not exist!" 5 38
+ fi
+ else
+ cat <<EOM >help.out
+@@ -1021,8 +1017,7 @@
+ else
+ echo -ne "\007"
+ $DIALOG --backtitle "$backtitle" \
+- --infobox "Can't create file! Probably a nonexistent directory." 3 60
+- sleep 2
++ --msgbox "Can't create file! Probably a nonexistent directory." 5 60
+ fi
+ else
+ cat <<EOM >help.out
+
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6 2004-09-05 18:55:04 UTC (rev 1561)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6 2004-09-05 21:27:20 UTC (rev 1562)
@@ -13,3 +13,7 @@
+ 084_ea_acl-2.diff
- 019_cpqarray_init.diff
+ 085_cpqarray_init-2.diff
+- 003_kbuild_fixes.diff
++ 086_ver_linux_ld.diff
++ 087_mkdep_xargs.diff
++ 088_dont_use_infobox.diff