# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1353530642 -3600
# Node ID 2188bfc43e67f71db1c88c313ed5ece02ba5d093
# Parent  111165cbc6d4ca1226abe4cd9832fc39ef2c1c13
Add ccid

diff -r 111165cbc6d4 -r 2188bfc43e67 ccid/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ccid/receipt	Wed Nov 21 21:44:02 2012 +0100
@@ -0,0 +1,32 @@
+# SliTaz package receipt.
+
+PACKAGE="ccid"
+VERSION="1.4.8"
+CATEGORY="base-system"
+SHORT_DESC="Chip/Smart Card Interface Devices driver."
+MAINTAINER="pascal.bellard@slitaz.org"
+WEB_SITE="http://pcsclite.alioth.debian.org/"
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="https://alioth.debian.org/frs/download.php/3768/$TARBALL"
+#https://alioth.debian.org/frs/download.php/3768/ccid-1.4.8.tar.bz2
+
+DEPENDS="libusb pcsc-lite"
+BUILD_DEPENDS="wget pcsc-lite-dev libusb-dev"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	cd $src
+	./configure --prefix=/usr \
+		--enable-usbdropdir=/usr/lib/pscs/drivers \
+		$CONFIGURE_ARGS &&
+	make && make DESTDIR=$DESTDIR install
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir $fs/etc/udev/rules.d/
+	cp -a $install/* $fs/
+	cp $src/src/92_pcscd_ccid.rules $fs/etc/udev/rules.d/
+}
diff -r 111165cbc6d4 -r 2188bfc43e67 linux/stuff/bootloader.sh
--- a/linux/stuff/bootloader.sh	Wed Nov 21 20:46:23 2012 +0000
+++ b/linux/stuff/bootloader.sh	Wed Nov 21 21:44:02 2012 +0100
@@ -88,10 +88,10 @@
 	[ -n "$DEBUG" ] && printf "store%d(%03X) = %0$(($1/4))X	%s\n" $1 $2 $3 "$5" 1>&2
 }
 
-# usage: getlong offset file
+# usage: getlong offset file [bytes]
 getlong()
 {
-	ddq if=$2 bs=1 skip=$(($1)) count=4 | hexdump -e '"" 1/4 "%d" "\n"'
+	od -j $1 -N ${3:-4} -t u${3:-4} -An $2
 }
 
 error()
@@ -122,8 +122,7 @@
 	[ -n "$DEBUG" ] && echo "Read bootsector..." 1>&2
 	ddq if=$KERNEL bs=512 count=1 of=$bs
 
-	[ $(( $(getlong 0x1FE $bs) & 0xFFFF )) -eq 43605 ] ||
-		error "Not bootable"
+	[ $(getlong 0x1FE $bs 2) -eq 43605 ] || error "Not bootable"
 	
 	uudecode <<EOT | ddq of=$bs conv=notrunc
 begin-base64 644 -
@@ -141,7 +140,7 @@
 ====
 EOT
 	# Get setup
-	setupsz=$(( $(getlong $SetupSzOfs $bs) & 0xFF ))
+	setupsz=$(getlong $SetupSzOfs $bs 1)
 	if [ $setupsz -eq 0 ]; then
 		setupsz=4
 		store 8 $SetupSzOfs $setupsz $bs "setup size $setupsz"
@@ -149,7 +148,7 @@
 	[ -n "$DEBUG" ] && echo "Read setup ($setupsz sectors) ..." 1>&2
 	ddq if=$KERNEL bs=512 skip=1 count=$setupsz >> $bs
 
-	Version=$(( $(getlong 0x206 $bs) & 0xFFFF ))
+	Version=$(getlong 0x206 $bs 2)
 	[ $(getlong $Magic $bs) -ne 1400005704 ] && Version=0
 	feature=""
 	while read prot kern info ; do
@@ -181,7 +180,7 @@
 201 FFF 224	00:9B				heap_end_ptr
 EOT
 	if [ $Version -lt 514 ]; then
-		version_string=$((0x200 + ($(getlong 0x20E $bs) & 65535) ))
+		version_string=$((0x200 + $(getlong 0x20E $bs 2) ))
 		store	16	0x0037	$version_string	$bs version_string
 	fi
 	if [ $Version -ge 512 -a $(getlong 0x214 $bs) -ge $((0x100000)) ]; then 
diff -r 111165cbc6d4 -r 2188bfc43e67 syslinux/stuff/tools/isohybrid.sh
--- a/syslinux/stuff/tools/isohybrid.sh	Wed Nov 21 20:46:23 2012 +0000
+++ b/syslinux/stuff/tools/isohybrid.sh	Wed Nov 21 21:44:02 2012 +0100
@@ -71,7 +71,7 @@
 # read a 32 bits data
 read32()
 {
-	readiso $1 $2 4 | hexdump -e '"" 1/4 "%d" "\n"'
+	readiso $1 $2 4 | od -N 4 -t u4 -An
 }
 
 # write a 32 bits data