please unblock syslinux 3.31-3
Hi,
Could you please unblock syslinux 3.31-3 ? It fixes a bug in which
64-bit support auto-detection leads to undefined results (#410729).
This time the patch was not only tested succesfuly, but also reviewed and
checked against the specs (see the bug log for details).
debdiff attached.
Thanks
--
Robert Millan
My spam trap is honeypot@aybabtu.com. Note: this address is only intended
for spam harvesters. Writing to it will get you added to my black list.
diff -u syslinux-3.31/debian/changelog syslinux-3.31/debian/changelog
--- syslinux-3.31/debian/changelog
+++ syslinux-3.31/debian/changelog
@@ -1,3 +1,10 @@
+syslinux (3.31-3) unstable; urgency=medium
+
+ * Added patch from Robert Millan <rmh@aybabtu.com> to fix
+ 02-64bit-autodetection.dpatch (Closes: #410729).
+
+ -- Daniel Baumann <daniel@debian.org> Tue, 13 Feb 2007 23:17:00 +0100
+
syslinux (3.31-2) unstable; urgency=medium
* Including all *.c32 modules (Closes: #391152).
diff -u syslinux-3.31/debian/patches/02-64bit-autodetection.dpatch syslinux-3.31/debian/patches/02-64bit-autodetection.dpatch
--- syslinux-3.31/debian/patches/02-64bit-autodetection.dpatch
+++ syslinux-3.31/debian/patches/02-64bit-autodetection.dpatch
@@ -8,7 +8,7 @@
diff -Naur syslinux-3.31.orig/cpuinit.inc syslinux-3.31/cpuinit.inc
--- syslinux-3.31.orig/cpuinit.inc 2006-09-26 04:52:22.000000000 +0000
-+++ syslinux-3.31/cpuinit.inc 2007-02-04 16:02:26.000000000 +0000
++++ syslinux-3.31/cpuinit.inc 2007-02-14 08:49:31.000000000 +0000
@@ -48,12 +48,10 @@
rep movsd
@@ -24,7 +24,7 @@
pushfd ; Save the good flags
pushfd
pop eax
-@@ -69,6 +67,47 @@
+@@ -69,6 +67,37 @@
;
; 386 - Looks like we better blot out the WBINVD instruction
;
@@ -50,19 +50,9 @@
+ xor eax,ebx
+ jz is_32bit
+;
-+; Now check for the 64-bit flag in the CPU features byte ($0000_0001, edx)
-+; This is bit 30 for Intel CPUs, and bit 29 for AMD CPUs
++; Now check for the 64-bit flag (bit 29) in the CPU extended features byte ($8000_0001, edx)
+;
-+ mov eax, 00000000h ; Find last Intel cpuid #
-+ cpuid
-+ cmp eax, 00000000h
-+ je test_amd
-+ mov eax, 00000001h ; Read Intel CPU flags
-+ cpuid
-+ bt edx, 30 ; 64-bit if bit 30 is set
-+ jc is_64bit
-+
-+test_amd: mov eax, 80000000h ; Find last AMD cpuid #
++ mov eax, 80000000h ; Find last AMD cpuid #
+ cpuid
+ cmp eax, 80000000h
+ jbe is_32bit
@@ -75,7 +65,7 @@
+is_32bit:
diff -Naur syslinux-3.31.orig/keywords syslinux-3.31/keywords
--- syslinux-3.31.orig/keywords 2006-09-26 04:52:22.000000000 +0000
-+++ syslinux-3.31/keywords 2007-02-04 16:02:26.000000000 +0000
++++ syslinux-3.31/keywords 2007-02-14 08:49:23.000000000 +0000
@@ -1,6 +1,7 @@
menu
append
@@ -86,7 +76,7 @@
implicit
diff -Naur syslinux-3.31.orig/keywords.inc syslinux-3.31/keywords.inc
--- syslinux-3.31.orig/keywords.inc 2006-09-26 04:52:22.000000000 +0000
-+++ syslinux-3.31/keywords.inc 2007-02-04 16:02:26.000000000 +0000
++++ syslinux-3.31/keywords.inc 2007-02-14 08:49:23.000000000 +0000
@@ -46,6 +46,7 @@
keyword menu, pc_comment
keyword append, pc_append
@@ -97,7 +87,7 @@
keyword implicit, pc_setint16, AllowImplicit
diff -Naur syslinux-3.31.orig/kwdhash.gen syslinux-3.31/kwdhash.gen
--- syslinux-3.31.orig/kwdhash.gen 2006-09-26 04:52:27.000000000 +0000
-+++ syslinux-3.31/kwdhash.gen 2007-02-04 16:02:26.000000000 +0000
++++ syslinux-3.31/kwdhash.gen 2007-02-14 08:49:23.000000000 +0000
@@ -1,6 +1,7 @@
hash_menu equ 0x003719b5
hash_append equ 0xc53999a4
@@ -108,7 +98,7 @@
hash_implicit equ 0xa6f50207
diff -Naur syslinux-3.31.orig/parseconfig.inc syslinux-3.31/parseconfig.inc
--- syslinux-3.31.orig/parseconfig.inc 2006-09-26 04:52:22.000000000 +0000
-+++ syslinux-3.31/parseconfig.inc 2007-02-04 16:02:26.000000000 +0000
++++ syslinux-3.31/parseconfig.inc 2007-02-14 08:49:23.000000000 +0000
@@ -20,7 +20,20 @@
;
; "default" command
Reply to: