Maj syslinux#3.84-1

4 files changed, 40 insertions, 97 deletions

diff --git a/extra/syslinux/.footprint b/extra/syslinux/.footprint
index e25f3987c..0b1043b38 100644
--- a/extra/syslinux/.footprint
+++ b/extra/syslinux/.footprint
@@ -9,18 +9,19 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/md5pass
 -rwxr-xr-x	root/root	usr/bin/mkdiskimage
 -rwxr-xr-x	root/root	usr/bin/ppmtolss16
+-rwxr-xr-x	root/root	usr/bin/pxelinux-options
 -rwxr-xr-x	root/root	usr/bin/sha1pass
 -rwxr-xr-x	root/root	usr/bin/syslinux
 -rwxr-xr-x	root/root	usr/bin/syslinux2ansi
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/extlinux.1.gz
--rw-r--r--	root/root	usr/man/man1/gethostip.1.gz
--rw-r--r--	root/root	usr/man/man1/lss16toppm.1.gz
--rw-r--r--	root/root	usr/man/man1/ppmtolss16.1.gz
--rw-r--r--	root/root	usr/man/man1/syslinux.1.gz
--rw-r--r--	root/root	usr/man/man1/syslinux2ansi.1.gz
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/extlinux.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/gethostip.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/lss16toppm.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/ppmtolss16.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/syslinux.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/syslinux2ansi.1.gz
 drwxr-xr-x	root/root	usr/share/syslinux/
 -rw-r--r--	root/root	usr/share/syslinux/altmbr.bin
 -rw-r--r--	root/root	usr/share/syslinux/altmbr_c.bin
@@ -45,6 +46,7 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/bitsize/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/ctype.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/dev.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/dirent.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/dprintf.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/elf.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/endian.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/errno.h
@@ -52,16 +54,31 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/bitsize/
 drwxr-xr-x	root/root	usr/share/syslinux/com32/include/gplinclude/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/README
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/cpuid.h
+drwxr-xr-x	root/root	usr/share/syslinux/com32/include/gplinclude/disk/
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/bootloaders.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/common.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/errno_disk.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/error.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/geom.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/mbrs.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/msdos.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/partition.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/read.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/swsusp.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/util.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/disk/write.h
 drwxr-xr-x	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_base_board.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_battery.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_bios.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_cache.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_chassis.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_ipmi.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_memory.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_processor.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/dmi/dmi_system.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/memory.h
 drwxr-xr-x	root/root	usr/share/syslinux/com32/include/gplinclude/vpd/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/inttypes.h
@@ -72,6 +89,7 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/klibc/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/klibc/endian.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/klibc/extern.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/klibc/sysconfig.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/libansi.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/limits.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/math.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/minmax.h
@@ -93,6 +111,7 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/sys/
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/elf64.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/elfcommon.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/fpu.h
+-rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/gpxe.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/io.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/pci.h
 -rw-r--r--	root/root	usr/share/syslinux/com32/include/sys/stat.h
@@ -133,16 +152,24 @@ drwxr-xr-x	root/root	usr/share/syslinux/com32/include/syslinux/
 -rw-r--r--	root/root	usr/share/syslinux/config.c32
 -rw-r--r--	root/root	usr/share/syslinux/copybs.com
 -rw-r--r--	root/root	usr/share/syslinux/cpuidtest.c32
+-rw-r--r--	root/root	usr/share/syslinux/disk.c32
 -rw-r--r--	root/root	usr/share/syslinux/dmitest.c32
+drwxr-xr-x	root/root	usr/share/syslinux/dosutil/
+-rw-r--r--	root/root	usr/share/syslinux/dosutil/eltorito.sys
+-rw-r--r--	root/root	usr/share/syslinux/dosutil/mdiskchk.com
 -rw-r--r--	root/root	usr/share/syslinux/elf.c32
 -rw-r--r--	root/root	usr/share/syslinux/ethersel.c32
+-rw-r--r--	root/root	usr/share/syslinux/gfxboot.c32
 -rw-r--r--	root/root	usr/share/syslinux/gfxboot.com
 -rw-r--r--	root/root	usr/share/syslinux/gptmbr.bin
 -rw-r--r--	root/root	usr/share/syslinux/gptmbr_c.bin
 -rw-r--r--	root/root	usr/share/syslinux/gptmbr_f.bin
+-rw-r--r--	root/root	usr/share/syslinux/gpxecmd.c32
 -rw-r--r--	root/root	usr/share/syslinux/gpxelinux.0
 -rw-r--r--	root/root	usr/share/syslinux/hdt.c32
+-rw-r--r--	root/root	usr/share/syslinux/ifcpu.c32
 -rw-r--r--	root/root	usr/share/syslinux/ifcpu64.c32
+-rw-r--r--	root/root	usr/share/syslinux/int18.com
 -rw-r--r--	root/root	usr/share/syslinux/isohdpfx.bin
 -rw-r--r--	root/root	usr/share/syslinux/isohdpfx_c.bin
 -rw-r--r--	root/root	usr/share/syslinux/isohdpfx_f.bin
diff --git a/extra/syslinux/.md5sum b/extra/syslinux/.md5sum
index a3d3c9fda..ffa892006 100644
--- a/extra/syslinux/.md5sum
+++ b/extra/syslinux/.md5sum
@@ -1,2 +1 @@
-6e1582f679cc2c7effd152620b30afea  Makefile.patch
-c9f4e73e385c86b3a8faf9b615a04836  syslinux-3.82.tar.bz2
+7a3503098a9d1e3b55b90bec303e66e2  syslinux-3.84.tar.bz2
diff --git a/extra/syslinux/Makefile.patch b/extra/syslinux/Makefile.patch
deleted file mode 100644
index 5375190ba..000000000
--- a/extra/syslinux/Makefile.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- Makefile.orig	2008-10-02 10:33:21.000000000 +0200
-+++ Makefile	2008-10-02 10:39:30.000000000 +0200
-@@ -39,7 +39,7 @@ BTARGET  = version.gen version.h version
- BOBJECTS = $(BTARGET) \
- 	mbr/mbr.bin mbr/gptmbr.bin \
- 	core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
--	gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
-+	gpxe/gpxelinux.0 dos/syslinux.com \
- 	$(MODULES)
- 
- # BSUBDIRs build the on-target binary components.
-@@ -49,7 +49,7 @@ BOBJECTS = $(BTARGET) \
- # files that depend only on the B phase, but may have to be regenerated
- # for "make installer".
- BSUBDIRS = codepage core memdisk modules com32 mbr memdump gpxe sample \
--	   libinstaller dos win32
-+	   libinstaller dos
- ITARGET  =
- IOBJECTS = $(ITARGET) dos/copybs.com \
- 	utils/gethostip utils/isohybrid utils/mkdiskimage \
-@@ -57,27 +57,17 @@ IOBJECTS = $(ITARGET) dos/copybs.com \
- ISUBDIRS = libinstaller mtools linux extlinux utils
- 
- # Things to install in /usr/bin
--INSTALL_BIN   =	mtools/syslinux
--# Things to install in /sbin
--INSTALL_SBIN  = extlinux/extlinux
-+INSTALL_BIN   =	mtools/syslinux extlinux/extlinux
- # Things to install in /usr/lib/syslinux
- INSTALL_AUX   =	core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \
- 		core/isolinux-debug.bin \
--		dos/syslinux.com dos/copybs.com win32/syslinux.exe \
-+		dos/syslinux.com dos/copybs.com \
- 		mbr/mbr.bin mbr/gptmbr.bin \
--		$(MODULES)
--INSTALL_AUX_OPT = win32/syslinux.exe
-+		com32/menu/*.c32 com32/modules/*.c32
- 
- # These directories manage their own installables
- INSTALLSUBDIRS = com32 utils
- 
--# Things to install in /boot/extlinux
--EXTBOOTINSTALL = $(MODULES)
--
--# Things to install in /tftpboot
--NETINSTALLABLE = core/pxelinux.0 gpxe/gpxelinux.0 \
--		 $(MODULES)
--
- all:
- 	$(MAKE) all-local
- 	set -e ; for i in $(BSUBDIRS) $(ISUBDIRS) ; do $(MAKE) -C $$i $@ ; done
-@@ -102,11 +92,8 @@ version.mk: version version.pl
- local-install: installer
- 	mkdir -m 755 -p $(INSTALLROOT)$(BINDIR)
- 	install -m 755 -c $(INSTALL_BIN) $(INSTALLROOT)$(BINDIR)
--	mkdir -m 755 -p $(INSTALLROOT)$(SBINDIR)
--	install -m 755 -c $(INSTALL_SBIN) $(INSTALLROOT)$(SBINDIR)
- 	mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)
- 	install -m 644 -c $(INSTALL_AUX) $(INSTALLROOT)$(AUXDIR)
--	-install -m 644 -c $(INSTALL_AUX_OPT) $(INSTALLROOT)$(AUXDIR)
- 	mkdir -m 755 -p $(INSTALLROOT)$(MANDIR)/man1
- 	install -m 644 -c man/*.1 $(INSTALLROOT)$(MANDIR)/man1
- 	: mkdir -m 755 -p $(INSTALLROOT)$(MANDIR)/man8
-@@ -115,15 +102,7 @@ local-install: installer
- install: local-install
- 	set -e ; for i in $(INSTALLSUBDIRS) ; do $(MAKE) -C $$i $@ ; done
- 
--netinstall: installer
--	mkdir -p $(INSTALLROOT)$(TFTPBOOT)
--	install -m 644 $(NETINSTALLABLE) $(INSTALLROOT)$(TFTPBOOT)
--
--extbootinstall: installer
--	mkdir -m 755 -p $(INSTALLROOT)$(EXTLINUXDIR)
--	install -m 644 $(EXTBOOTINSTALL) $(INSTALLROOT)$(EXTLINUXDIR)
--
--install-all: install netinstall extbootinstall
-+install-all: install
- 
- local-tidy:
- 	rm -f *.o *.elf *_bin.c stupid.* patch.offset
-
diff --git a/extra/syslinux/Pkgfile b/extra/syslinux/Pkgfile
index 1a2b323a6..8f8293f8b 100644
--- a/extra/syslinux/Pkgfile
+++ b/extra/syslinux/Pkgfile
@@ -2,18 +2,16 @@
 # URL: http://syslinux.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: mtools, nasm
+# Depends on: mtools
 
 name=syslinux
-version=3.82
+version=3.84
 release=1
-source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$name-$version.tar.bz2\
-	Makefile.patch)
+source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
 	sed -i "s|win32/syslinux.exe||g" Makefile
-#	patch -p0 -i $SRC/Makefile.patch
 	make
-	make INSTALLROOT=$PKG install
+	make INSTALLROOT=$PKG  MANDIR=/usr/share/man install
 }