syslinux: update to 6.03.

This commit is contained in:
Juan RP 2014-10-07 05:25:56 +02:00
parent 3cb0dfca2c
commit 05c6f8181d
3 changed files with 3 additions and 60 deletions

View File

@ -1,10 +0,0 @@
--- core/isolinux.asm
+++ core/isolinux.asm
@@ -420,7 +420,7 @@ MaxLMA equ 384*1024 ; Reasonable limit (384K)
call getlinsec
pop eax
pop cx
- mov dx,cx
+ movzx edx,cx
pop bp
pop bx

View File

@ -1,45 +0,0 @@
Reported-by: Dark Raven <drdarkraven at gmail.com>
Signed-off-by: Raphael S. Carvalho <raphael.scarv at gmail.com>
---
com32/lib/syslinux/disk.c | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
--- com32/lib/syslinux/disk.c
+++ com32/lib/syslinux/disk.c
@@ -171,22 +171,28 @@ out:
static void *ebios_setup(const struct disk_info *const diskinfo, com32sys_t *inreg,
uint64_t lba, uint8_t count, uint8_t op_code)
{
- static __lowmem struct disk_ebios_dapa dapa;
+ static struct disk_ebios_dapa *dapa = NULL;
void *buf;
+ if (!dapa) {
+ dapa = lmalloc(sizeof *dapa);
+ if (!dapa)
+ return NULL;
+ }
+
buf = lmalloc(count * diskinfo->bps);
if (!buf)
return NULL;
- dapa.len = sizeof(dapa);
- dapa.count = count;
- dapa.off = OFFS(buf);
- dapa.seg = SEG(buf);
- dapa.lba = lba;
+ dapa->len = sizeof(*dapa);
+ dapa->count = count;
+ dapa->off = OFFS(buf);
+ dapa->seg = SEG(buf);
+ dapa->lba = lba;
inreg->eax.b[1] = op_code;
- inreg->esi.w[0] = OFFS(&dapa);
- inreg->ds = SEG(&dapa);
+ inreg->esi.w[0] = OFFS(dapa);
+ inreg->ds = SEG(dapa);
inreg->edx.b[0] = diskinfo->disk;
return buf;

View File

@ -1,7 +1,7 @@
# Template file for 'syslinux'
pkgname=syslinux
version=6.02
revision=3
version=6.03
revision=1
hostmakedepends="perl python nasm"
makedepends="gnu-efi-libs libuuid-devel"
short_desc="A boot loader for the Linux operating system"
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project"
license="GPL-2"
distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz"
checksum=afa31b7cbf72e1c0c1752a0636ba724ce01c0e374366e46e61db6862b4685478
checksum=26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e
only_for_archs="i686 x86_64"
pre_build() {
@ -23,7 +23,6 @@ pre_build() {
# Fix FHS manpage path
sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
}
do_build() {
unset CFLAGS LDFLAGS
case "$XBPS_TARGET_MACHINE" in
@ -32,7 +31,6 @@ do_build() {
esac
make installer
}
do_install() {
make INSTALLROOT=${DESTDIR} install
mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin