syslinux: Update to 6.03

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/x86_64/syslinux b/config/rootfiles/common/x86_64/syslinux
index 89cf5c844921b5230a663d6518381db95779498b..a41049f21a0c5916dfd8cb9b659bd38c710c18b7 100644 (file)
--- a/config/rootfiles/common/x86_64/syslinux
+++ b/config/rootfiles/common/x86_64/syslinux
@@ -14,7 +14,9 @@ usr/bin/isohybrid
 #usr/bin/syslinux2ansi
 #usr/man/man1/extlinux.1
 #usr/man/man1/gethostip.1
+#usr/man/man1/isohybrid.1
 #usr/man/man1/lss16toppm.1
+#usr/man/man1/memdiskfind.1
 #usr/man/man1/ppmtolss16.1
 #usr/man/man1/syslinux.1
 #usr/man/man1/syslinux2ansi.1
@@ -25,6 +27,7 @@ usr/bin/isohybrid
 #usr/share/syslinux/cat.c32
 #usr/share/syslinux/chain.c32
 #usr/share/syslinux/cmd.c32
+#usr/share/syslinux/cmenu.c32
 #usr/share/syslinux/com32
 #usr/share/syslinux/com32/com32.ld
 #usr/share/syslinux/com32/include
@@ -36,7 +39,21 @@ usr/bin/isohybrid
 #usr/share/syslinux/com32/include/bitsize/stdint.h
 #usr/share/syslinux/com32/include/bitsize/stdintconst.h
 #usr/share/syslinux/com32/include/bitsize/stdintlimits.h
+#usr/share/syslinux/com32/include/bitsize32
+#usr/share/syslinux/com32/include/bitsize32/limits.h
+#usr/share/syslinux/com32/include/bitsize32/stddef.h
+#usr/share/syslinux/com32/include/bitsize32/stdint.h
+#usr/share/syslinux/com32/include/bitsize32/stdintconst.h
+#usr/share/syslinux/com32/include/bitsize32/stdintlimits.h
+#usr/share/syslinux/com32/include/bitsize64
+#usr/share/syslinux/com32/include/bitsize64/limits.h
+#usr/share/syslinux/com32/include/bitsize64/stddef.h
+#usr/share/syslinux/com32/include/bitsize64/stdint.h
+#usr/share/syslinux/com32/include/bitsize64/stdintconst.h
+#usr/share/syslinux/com32/include/bitsize64/stdintlimits.h
 #usr/share/syslinux/com32/include/bufprintf.h
+#usr/share/syslinux/com32/include/byteswap.h
+#usr/share/syslinux/com32/include/cli.h
 #usr/share/syslinux/com32/include/colortbl.h
 #usr/share/syslinux/com32/include/com32.h
 #usr/share/syslinux/com32/include/console.h
@@ -101,6 +118,8 @@ usr/bin/isohybrid
 #usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h
 #usr/share/syslinux/com32/include/gplinclude/zzjson
 #usr/share/syslinux/com32/include/gplinclude/zzjson/zzjson.h
+#usr/share/syslinux/com32/include/hw
+#usr/share/syslinux/com32/include/hw/vga.h
 #usr/share/syslinux/com32/include/ilog2.h
 #usr/share/syslinux/com32/include/inttypes.h
 #usr/share/syslinux/com32/include/klibc
@@ -109,16 +128,25 @@ usr/bin/isohybrid
 #usr/share/syslinux/com32/include/klibc/diverr.h
 #usr/share/syslinux/com32/include/klibc/endian.h
 #usr/share/syslinux/com32/include/klibc/extern.h
+#usr/share/syslinux/com32/include/klibc/i386
+#usr/share/syslinux/com32/include/klibc/i386/archsetjmp.h
 #usr/share/syslinux/com32/include/klibc/sysconfig.h
+#usr/share/syslinux/com32/include/klibc/x86_64
+#usr/share/syslinux/com32/include/klibc/x86_64/archsetjmp.h
 #usr/share/syslinux/com32/include/libansi.h
 #usr/share/syslinux/com32/include/limits.h
+#usr/share/syslinux/com32/include/linux
+#usr/share/syslinux/com32/include/linux/list.h
 #usr/share/syslinux/com32/include/math.h
+#usr/share/syslinux/com32/include/menu.h
 #usr/share/syslinux/com32/include/minmax.h
 #usr/share/syslinux/com32/include/netinet
 #usr/share/syslinux/com32/include/netinet/in.h
 #usr/share/syslinux/com32/include/png.h
 #usr/share/syslinux/com32/include/pngconf.h
+#usr/share/syslinux/com32/include/refstr.h
 #usr/share/syslinux/com32/include/setjmp.h
+#usr/share/syslinux/com32/include/sort.h
 #usr/share/syslinux/com32/include/stdarg.h
 #usr/share/syslinux/com32/include/stdbool.h
 #usr/share/syslinux/com32/include/stddef.h
@@ -134,14 +162,24 @@ usr/bin/isohybrid
 #usr/share/syslinux/com32/include/sys/elf32.h
 #usr/share/syslinux/com32/include/sys/elf64.h
 #usr/share/syslinux/com32/include/sys/elfcommon.h
+#usr/share/syslinux/com32/include/sys/exec.h
 #usr/share/syslinux/com32/include/sys/fpu.h
 #usr/share/syslinux/com32/include/sys/gpxe.h
+#usr/share/syslinux/com32/include/sys/i386
+#usr/share/syslinux/com32/include/sys/i386/bitops.h
+#usr/share/syslinux/com32/include/sys/i386/cpu.h
+#usr/share/syslinux/com32/include/sys/i386/module.h
 #usr/share/syslinux/com32/include/sys/io.h
+#usr/share/syslinux/com32/include/sys/module.h
 #usr/share/syslinux/com32/include/sys/pci.h
 #usr/share/syslinux/com32/include/sys/stat.h
 #usr/share/syslinux/com32/include/sys/time.h
 #usr/share/syslinux/com32/include/sys/times.h
 #usr/share/syslinux/com32/include/sys/types.h
+#usr/share/syslinux/com32/include/sys/x86_64
+#usr/share/syslinux/com32/include/sys/x86_64/bitops.h
+#usr/share/syslinux/com32/include/sys/x86_64/cpu.h
+#usr/share/syslinux/com32/include/sys/x86_64/module.h
 #usr/share/syslinux/com32/include/syslinux
 #usr/share/syslinux/com32/include/syslinux/adv.h
 #usr/share/syslinux/com32/include/syslinux/advconst.h
@@ -150,8 +188,9 @@ usr/bin/isohybrid
 #usr/share/syslinux/com32/include/syslinux/bootpm.h
 #usr/share/syslinux/com32/include/syslinux/bootrm.h
 #usr/share/syslinux/com32/include/syslinux/config.h
+#usr/share/syslinux/com32/include/syslinux/debug.h
 #usr/share/syslinux/com32/include/syslinux/disk.h
-#usr/share/syslinux/com32/include/syslinux/features.h
+#usr/share/syslinux/com32/include/syslinux/firmware.h
 #usr/share/syslinux/com32/include/syslinux/idle.h
 #usr/share/syslinux/com32/include/syslinux/io.h
 #usr/share/syslinux/com32/include/syslinux/keyboard.h
@@ -164,6 +203,8 @@ usr/bin/isohybrid
 #usr/share/syslinux/com32/include/syslinux/pxe_api.h
 #usr/share/syslinux/com32/include/syslinux/reboot.h
 #usr/share/syslinux/com32/include/syslinux/resolve.h
+#usr/share/syslinux/com32/include/syslinux/sysappend.h
+#usr/share/syslinux/com32/include/syslinux/version.h
 #usr/share/syslinux/com32/include/syslinux/vesacon.h
 #usr/share/syslinux/com32/include/syslinux/video.h
 #usr/share/syslinux/com32/include/syslinux/zio.h
@@ -172,24 +213,88 @@ usr/bin/isohybrid
 #usr/share/syslinux/com32/include/unistd.h
 #usr/share/syslinux/com32/include/zconf.h
 #usr/share/syslinux/com32/include/zlib.h
-#usr/share/syslinux/com32/libcom32.a
-#usr/share/syslinux/com32/libcom32gpl.a
 #usr/share/syslinux/com32/libcom32upload.a
-#usr/share/syslinux/com32/libutil_com.a
+#usr/share/syslinux/com32/libgpl.c32
 #usr/share/syslinux/com32/libutil_lnx.a
 #usr/share/syslinux/config.c32
+#usr/share/syslinux/cptime.c32
+#usr/share/syslinux/cpu.c32
 #usr/share/syslinux/cpuid.c32
 #usr/share/syslinux/cpuidtest.c32
+#usr/share/syslinux/debug.c32
+#usr/share/syslinux/dhcp.c32
 #usr/share/syslinux/diag
 #usr/share/syslinux/diag/geodsp1s.img.xz
 #usr/share/syslinux/diag/geodspms.img.xz
 #usr/share/syslinux/diag/handoff.bin
 #usr/share/syslinux/disk.c32
+#usr/share/syslinux/dmi.c32
 #usr/share/syslinux/dmitest.c32
 #usr/share/syslinux/dosutil
 #usr/share/syslinux/dosutil/copybs.com
 #usr/share/syslinux/dosutil/eltorito.sys
 #usr/share/syslinux/dosutil/mdiskchk.com
+#usr/share/syslinux/efi64
+#usr/share/syslinux/efi64/cat.c32
+#usr/share/syslinux/efi64/chain.c32
+#usr/share/syslinux/efi64/cmd.c32
+#usr/share/syslinux/efi64/cmenu.c32
+#usr/share/syslinux/efi64/config.c32
+#usr/share/syslinux/efi64/cptime.c32
+#usr/share/syslinux/efi64/cpu.c32
+#usr/share/syslinux/efi64/cpuid.c32
+#usr/share/syslinux/efi64/cpuidtest.c32
+#usr/share/syslinux/efi64/debug.c32
+#usr/share/syslinux/efi64/dhcp.c32
+#usr/share/syslinux/efi64/disk.c32
+#usr/share/syslinux/efi64/dmi.c32
+#usr/share/syslinux/efi64/dmitest.c32
+#usr/share/syslinux/efi64/elf.c32
+#usr/share/syslinux/efi64/ethersel.c32
+#usr/share/syslinux/efi64/gfxboot.c32
+#usr/share/syslinux/efi64/gpxecmd.c32
+#usr/share/syslinux/efi64/hdt.c32
+#usr/share/syslinux/efi64/hexdump.c32
+#usr/share/syslinux/efi64/host.c32
+#usr/share/syslinux/efi64/ifcpu.c32
+#usr/share/syslinux/efi64/ifcpu64.c32
+#usr/share/syslinux/efi64/ifmemdsk.c32
+#usr/share/syslinux/efi64/ifplop.c32
+#usr/share/syslinux/efi64/kbdmap.c32
+#usr/share/syslinux/efi64/kontron_wdt.c32
+#usr/share/syslinux/efi64/ldlinux.e64
+#usr/share/syslinux/efi64/lfs.c32
+#usr/share/syslinux/efi64/libcom32.c32
+#usr/share/syslinux/efi64/libgpl.c32
+#usr/share/syslinux/efi64/liblua.c32
+#usr/share/syslinux/efi64/libmenu.c32
+#usr/share/syslinux/efi64/libutil.c32
+#usr/share/syslinux/efi64/linux.c32
+#usr/share/syslinux/efi64/ls.c32
+#usr/share/syslinux/efi64/lua.c32
+#usr/share/syslinux/efi64/mboot.c32
+#usr/share/syslinux/efi64/meminfo.c32
+#usr/share/syslinux/efi64/menu.c32
+#usr/share/syslinux/efi64/pci.c32
+#usr/share/syslinux/efi64/pcitest.c32
+#usr/share/syslinux/efi64/pmload.c32
+#usr/share/syslinux/efi64/poweroff.c32
+#usr/share/syslinux/efi64/prdhcp.c32
+#usr/share/syslinux/efi64/pwd.c32
+#usr/share/syslinux/efi64/pxechn.c32
+#usr/share/syslinux/efi64/reboot.c32
+#usr/share/syslinux/efi64/rosh.c32
+#usr/share/syslinux/efi64/sanboot.c32
+#usr/share/syslinux/efi64/sdi.c32
+#usr/share/syslinux/efi64/sysdump.c32
+#usr/share/syslinux/efi64/syslinux.c32
+#usr/share/syslinux/efi64/syslinux.efi
+#usr/share/syslinux/efi64/vesa.c32
+#usr/share/syslinux/efi64/vesainfo.c32
+#usr/share/syslinux/efi64/vesamenu.c32
+#usr/share/syslinux/efi64/vpdtest.c32
+#usr/share/syslinux/efi64/whichsys.c32
+#usr/share/syslinux/efi64/zzjson.c32
 #usr/share/syslinux/elf.c32
 #usr/share/syslinux/ethersel.c32
 #usr/share/syslinux/gfxboot.c32
@@ -200,12 +305,12 @@ usr/bin/isohybrid
 #usr/share/syslinux/gpxelinux.0
 #usr/share/syslinux/gpxelinuxk.0
 #usr/share/syslinux/hdt.c32
+#usr/share/syslinux/hexdump.c32
 #usr/share/syslinux/host.c32
 #usr/share/syslinux/ifcpu.c32
 #usr/share/syslinux/ifcpu64.c32
 #usr/share/syslinux/ifmemdsk.c32
 #usr/share/syslinux/ifplop.c32
-#usr/share/syslinux/int18.com
 #usr/share/syslinux/isohdpfx.bin
 #usr/share/syslinux/isohdpfx_c.bin
 #usr/share/syslinux/isohdpfx_f.bin
@@ -216,7 +321,15 @@ usr/bin/isohybrid
 #usr/share/syslinux/isolinux.bin
 #usr/share/syslinux/kbdmap.c32
 #usr/share/syslinux/kontron_wdt.c32
+#usr/share/syslinux/ldlinux.c32
+#usr/share/syslinux/lfs.c32
+#usr/share/syslinux/libcom32.c32
+#usr/share/syslinux/libgpl.c32
+#usr/share/syslinux/liblua.c32
+#usr/share/syslinux/libmenu.c32
+#usr/share/syslinux/libutil.c32
 #usr/share/syslinux/linux.c32
+#usr/share/syslinux/lpxelinux.0
 #usr/share/syslinux/ls.c32
 #usr/share/syslinux/lua.c32
 #usr/share/syslinux/mboot.c32
@@ -224,15 +337,14 @@ usr/bin/isohybrid
 #usr/share/syslinux/mbr_c.bin
 #usr/share/syslinux/mbr_f.bin
 #usr/share/syslinux/memdisk
-#usr/share/syslinux/memdump.com
 #usr/share/syslinux/meminfo.c32
 #usr/share/syslinux/menu.c32
+#usr/share/syslinux/pci.c32
 #usr/share/syslinux/pcitest.c32
 #usr/share/syslinux/pmload.c32
-#usr/share/syslinux/poweroff.com
+#usr/share/syslinux/poweroff.c32
 #usr/share/syslinux/prdhcp.c32
 #usr/share/syslinux/pwd.c32
-#usr/share/syslinux/pxechain.com
 #usr/share/syslinux/pxechn.c32
 #usr/share/syslinux/pxelinux.0
 #usr/share/syslinux/reboot.c32
@@ -240,10 +352,9 @@ usr/bin/isohybrid
 #usr/share/syslinux/sanboot.c32
 #usr/share/syslinux/sdi.c32
 #usr/share/syslinux/sysdump.c32
+#usr/share/syslinux/syslinux.c32
 #usr/share/syslinux/syslinux.com
-#usr/share/syslinux/syslinux.exe
-#usr/share/syslinux/syslinux64.exe
-#usr/share/syslinux/ver.com
+#usr/share/syslinux/vesa.c32
 #usr/share/syslinux/vesainfo.c32
 #usr/share/syslinux/vesamenu.c32
 #usr/share/syslinux/vpdtest.c32

diff --git a/lfs/syslinux b/lfs/syslinux
index 00a8415d0f39f47cfe2519eb6ce4688c82514f87..c67df3dcb1e2def75b25186c03b4fe0327023d73 100644 (file)
--- a/lfs/syslinux
+++ b/lfs/syslinux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.06
+VER        = 6.03
 
 THISAPP    = syslinux-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -33,6 +33,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 i586
 
+# Clear compiler flags (mainly hardening)
+CFLAGS     =
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -41,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 77d33140860621cd850c3a7ab0ebb7d6
+$(DL_FILE)_MD5 = 92a253df9211e9c20172796ecf388f13
 
 install : $(TARGET)
 
@@ -71,6 +74,18 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make install
+
+       # Build
+       cd $(DIR_APP) && make bios $(MAKETUNING)
+ifeq "$(MACHINE)" "x86_64"
+       cd $(DIR_APP) && make efi64 $(MAKETUNING)
+endif
+
+       # Install
+       cd $(DIR_APP) && make bios install
+ifeq "$(MACHINE)" "x86_64"
+       cd $(DIR_APP) && make efi64 install
+endif
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)