# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1215080371 0
# Node ID 29ef7d8a472990c76e7ca760eb7be620e2f7e8e3
# Parent  3c48e6f2d04a40a54f8ba1c43e2886217a298d0a
Up: syslinux (3.70)

diff -r 3c48e6f2d04a -r 29ef7d8a4729 syslinux-extra/receipt
--- a/syslinux-extra/receipt	Wed Jul 02 18:23:20 2008 +0200
+++ b/syslinux-extra/receipt	Thu Jul 03 10:19:31 2008 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="syslinux-extra"
-VERSION="3.63"
+VERSION="3.70"
 CATEGORY="system-tools"
 SHORT_DESC="MBR/FAT/EXT3/PXE bootloader files"
 MAINTAINER="pankso@slitaz.org"
@@ -13,13 +13,14 @@
 genpkg_rules()
 {
     mkdir -p $fs/usr/share/boot
-    lzma e $src/memdisk/memdisk $fs/usr/share/boot/memdisk.lzma
+    lzma e $src/memdisk/memdisk $fs/usr/share/boot/memdisk.lzma 2>-
     cp -a $src/mbr/mbr.bin $fs/usr/share/boot
-    lzma e $src/pxelinux.0 $fs/usr/share/boot/pxelinux.0.lzma
+    lzma e $src/core/pxelinux.0 $fs/usr/share/boot/pxelinux.0.lzma 2>-
     #lzma e $src/com32/menu/vesamenu.c32 $fs/usr/share/boot/vesamenu.c32.lzma
+    #lzma e $src/com32/modules/mboot.c32 $fs/usr/share/boot/mboot.c32.lzma
     cp $src/com32/modules/sdi.c32 $fs/usr/share/boot/
     mkdir -p $fs/bin
-    cp -a $src/unix/syslinux-nomtools $fs/bin/syslinux
+    cp -a $src/linux/syslinux-nomtools $fs/bin/syslinux
     cp -a $src/extlinux/extlinux $fs/bin
     chown root.root $fs/usr/share/boot/* $fs/bin/*
 }
diff -r 3c48e6f2d04a -r 29ef7d8a4729 syslinux/receipt
--- a/syslinux/receipt	Wed Jul 02 18:23:20 2008 +0200
+++ b/syslinux/receipt	Thu Jul 03 10:19:31 2008 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="syslinux"
-VERSION="3.63"
+VERSION="3.70"
 CATEGORY="base-system"
 SHORT_DESC="LiveCD ISO bootloader (isolinux)"
 MAINTAINER="pankso@slitaz.org"
@@ -15,7 +15,7 @@
 compile_rules()
 {
     cd $src
-    patch -p1 < ../stuff/tools/keytab-lilo.pl.u
+    cp ../stuff/tools/keytab-lilo.pl .
     for i in /usr/share/kbd/keymaps/i386/*/*.map.gz; do
         [ "$(basename $(dirname $i))" = "include" ] && continue
         j=$(basename $i)
@@ -28,7 +28,7 @@
 genpkg_rules()
 {
     mkdir -p $fs/boot/isolinux
-    cp -a $src/isolinux.bin $fs/boot/isolinux
+    cp -a $src/core/isolinux.bin $fs/boot/isolinux
     cp -a $src/com32/modules/reboot.c32 $fs/boot/isolinux
     cp stuff/* $fs/boot/isolinux
     rm -rf $fs/boot/isolinux/tools $fs/boot/isolinux/*.kbd 2> /dev/null
@@ -38,5 +38,10 @@
         cp $src/$kbd $fs/boot/isolinux/$cfg.kbd
     done
     chown root.root $fs/boot/isolinux/*
+    # Package all syslinux pkgs
+    for i in $(cd $WOK; ls -d syslinux-*)
+    do
+    	tazwok genpkg $i
+    done
 }
 
diff -r 3c48e6f2d04a -r 29ef7d8a4729 syslinux/stuff/tools/keytab-lilo.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/tools/keytab-lilo.pl	Thu Jul 03 10:19:31 2008 +0000
@@ -0,0 +1,111 @@
+#!/usr/bin/perl
+# --------------------------------------------------------------------------
+# This program was taken from the LILO-20 distribution; only this header
+# was added.
+#
+# LILO program code, documentation and auxiliary programs are
+# Copyright 1992-1997 Werner Almesberger.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms of parts of or the
+# whole original or derived work are permitted provided that the
+# original work is properly attributed to the author. The name of the
+# author may not be used to endorse or promote products derived from
+# this software without specific prior written permission. This work
+# is provided "as is" and without any express or implied warranties.
+# --------------------------------------------------------------------------
+
+eval { use bytes; }; eval { binmode STDOUT; };
+
+$DEFAULT_PATH = "/usr/lib/kbd/keytables";
+$DEFAULT_MAP = "us";
+$DEFAULT_EXT = ".map";
+
+sub usage
+{
+    print STDERR
+      "usage: $0 [ -p old_code=new_code ] ...\n".
+      (" "x(8+length $0))."[path]default_layout[.map] ] ".
+      "[path]kbd_layout[.map]\n";
+    exit 1;
+}
+
+
+while ($ARGV[0] eq "-p") {
+    shift(@ARGV);
+    &usage unless $ARGV[0] =~ /=/;
+    $table[eval($`)] = eval($');
+    shift(@ARGV);
+}
+&usage unless defined $ARGV[0];
+load_map("def",defined $ARGV[1] ? $ARGV[0] : undef);
+load_map("kbd",defined $ARGV[1] ? $ARGV[1] : $ARGV[0]);
+&build_table("plain","shift","ctrl","altgr","shift_ctrl",
+  "altgr_ctrl","alt","shift_alt","ctrl_alt");
+for ($i = 0; $i < 256; $i++) {
+    printf("%c",$table[$i] ? $table[$i] : $i) || die "print: $!";
+}
+close STDOUT || die "close: $!";
+
+
+sub load_map
+{
+    local ($pfx,$map) = @_;
+    local ($empty,$current);
+
+    $map = $DEFAULT_MAP unless defined $map;
+    $map = $DEFAULT_PATH."/".$map unless $map =~ m|/|;
+    $map .= $DEFAULT_EXT unless $map =~ m|/[^/]+\.[^/]+$|;
+    if (!open(FILE,"loadkeys -m $map |")) {
+	print STDERR "loadkeys -m $map: $!\n";
+	exit 1;
+    }
+    undef $current;
+    $empty = 1;
+    while (<FILE>) {
+	chop;
+	if (/^(static\s+)?u_short\s+(\S+)_map\[\S+\]\s+=\s+{\s*$/) {
+	    die "active at beginning of map" if defined $current;
+	    $current = $pfx.":".$2;
+	    next;
+	}
+	undef $current if /^};\s*$/;
+	next unless defined $current;
+	s/\s//g;
+	$map{$current} .= $_;
+	$empty = 0;
+    }
+    close FILE;
+    return unless $empty;
+    print STDERR "Keymap is empty\n";
+    exit 1;
+}
+
+
+sub build_table
+{
+    local (@maps) = @_;
+    local (@tmp);
+
+    $set = 0;
+    for $map (@maps) {
+	$code = $set;
+	for (split(",",$map{"def:".$map})) {
+	    die "bad map entry $_ (def, map $map)" unless /^0x\S\S(\S\S)$/;
+	    $tmp[$code] = hex $1 unless $tmp[$code];
+	    $code++;
+	}
+	$set += 256;
+    }
+    $set = 0;
+    for $map (@maps) {
+	$code = $set;
+	for (split(",",$map{"kbd:".$map})) {
+	    die "bad map entry $_ (kbd, map $map)" unless /^0x\S\S(\S\S)$/;
+	    $table[$tmp[$code]] = hex $1 unless $table[$tmp[$code]];
+	    $code++;
+	}
+	$set += 256;
+    }
+    $table[0] = 0;
+}