# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1491225137 -7200
# Node ID a7fbb1c5c71a4c93b7f9b2d242f58d02d31abec7
# Parent  2717d404353bad23211cd9c9215ce76bfd0d6cee
Add openct

diff -r 2717d404353b -r a7fbb1c5c71a linld/stuff/src/MEMCPY32.ASM
--- a/linld/stuff/src/MEMCPY32.ASM	Mon Apr 03 10:59:15 2017 +0200
+++ b/linld/stuff/src/MEMCPY32.ASM	Mon Apr 03 15:12:17 2017 +0200
@@ -169,7 +169,9 @@
 		xor	dx,dx
 		xor	si,si
 		mov	ax,[bp+8]		; srcseg
-		call	near N_LXLSH@4
+		mov	cl,4
+		extrn	N_LXLSH@:near
+		call	near N_LXLSH@
 		add	[bp+10],ax		; srcofs lo
 		adc	[bp+10+2],dx		; srcofs hi
 @@2flat:
@@ -260,7 +262,7 @@
                 ;db      66h     ;operand width override for ecx
                 db      67h     ;address width override for esi/edi
             rep movsb
-		cld
+		;cld
 
 ;****** Return to rm *******************************************
                 dec     ax              ;CR0_PE off
@@ -314,21 +316,6 @@
 
         endp    N_LXURSH@4
 
-        global  N_LXLSH@:near
-        global  N_LXLSH@4:near
-        proc    N_LXLSH@4 near
-
-		mov	cl,4
-N_LXLSH@:
-		mov	ch,0
-@@loop:
-		shl	ax,1
-		rcl	dx,1
-		loop	@@loop
-		ret
-
-        endp    N_LXLSH@4
-
 		endif
 
         ends    _TEXT
diff -r 2717d404353b -r a7fbb1c5c71a linld/stuff/src/MEMTOP.ASM
--- a/linld/stuff/src/MEMTOP.ASM	Mon Apr 03 10:59:15 2017 +0200
+++ b/linld/stuff/src/MEMTOP.ASM	Mon Apr 03 15:12:17 2017 +0200
@@ -97,20 +97,21 @@
                 xor     dx,dx
                 add     ah,4h           ;account for 1024 low kb
                 adc     dx,dx           ;  (optimized to death)
+		mov	cl,10		;multiply by 1024
+        global  N_LXLSH@:near
+N_LXLSH@:
 		ifndef	NO386
-                shld    dx,ax,10        ;multiply by 1024
-                shl     ax,10           ;  (kbytes -> bytes)
+		shld    dx,ax,cl
+		shl     ax,cl		;  (kbytes -> bytes)
 		else
+		mov	ch,0
 @@lp:
-		mov	cx,10
-                shl     ax,1            ;multiply by 1024
+		shl	ax,1
 		rcl	dx,1
 		loop	@@lp
 		endif
-;		mov	cx,ax
-;		or	cx,dx		;update ZF
-;@@fail:
-                ret
+		ret
+
 ;        endp    _memtop_88
 
 ;        proc    _memtopz near
@@ -170,32 +171,24 @@
 
 		ifndef  xmm_hook
                 mov     ax,4300h
-		cwd
-		mov	es,dx
                 int     2fh
                 cmp     al,80h			; 80h = XMS driver installed
                 je      @@skip
 		endif
+		xor	bx,bx
+		mov	es,bx
 		ifndef	NO386
-		 ifdef  xmm_hook
-		push	0
-		pop	es
-		 endif
 		push	cs
 		push	offset int15_88
 		pop	eax
-		xchg	eax,[es:15*4]
+		xchg	eax,[es:bx+15*4]
 		mov	[saved15],eax
 		else
-		 ifdef  xmm_hook
-		xor	ax,ax
-		mov	es,ax
-		 endif
 		mov	ax,offset int15_88
-		xchg	ax,[es:15*4]
+		xchg	ax,[es:bx+15*4]
 		mov	[word saved15],ax
 		mov	ax,cs
-		xchg	ax,[es:15*4+2]
+		xchg	ax,[es:bx+15*4+2]
 		mov	[word saved15+2],ax
 		endif
 @@skip:
diff -r 2717d404353b -r a7fbb1c5c71a linld/stuff/src/XMM.ASM
--- a/linld/stuff/src/XMM.ASM	Mon Apr 03 10:59:15 2017 +0200
+++ b/linld/stuff/src/XMM.ASM	Mon Apr 03 15:12:17 2017 +0200
@@ -112,11 +112,9 @@
 		mov	dx,[bx+8]		; hi m->size
 		sub	ax,1
 		sbb	dx,0
-		mov	cx,10
-@@tokblp:
-		shr	dx,1
-		rcr	ax,1
-		loop	@@tokblp
+		mov	cl,10
+		extrn	N_LXURSH@:near
+		call	N_LXURSH@
 		endif
                 inc     dx
 		push	bx
diff -r 2717d404353b -r a7fbb1c5c71a openct-dev/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/openct-dev/receipt	Mon Apr 03 15:12:17 2017 +0200
@@ -0,0 +1,21 @@
+# SliTaz package receipt.
+
+PACKAGE="openct-dev"
+VERSION="0.6.20"
+CATEGORY="development"
+SHORT_DESC="Drivers for several smart card readers, development files."
+MAINTAINER="pascal.bellard@slitaz.org"
+LICENSE="LGPL2.1"
+WEB_SITE="https://github.com/OpenSC/openct"
+WANTED="openct"
+
+DEPENDS="openct pkg-config"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/lib
+	cp -a $install/usr/lib/*a $fs/usr/lib
+	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+	cp -a $install/usr/include $fs/usr
+}
diff -r 2717d404353b -r a7fbb1c5c71a openct/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/openct/receipt	Mon Apr 03 15:12:17 2017 +0200
@@ -0,0 +1,40 @@
+# SliTaz package receipt.
+
+PACKAGE="openct"
+VERSION="0.6.20"
+CATEGORY="misc"
+SHORT_DESC="Drivers for several smart card readers."
+MAINTAINER="pascal.bellard@slitaz.org"
+LICENSE="LGPL2.1"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WEB_SITE="https://github.com/OpenSC/openct"
+WGET_URL="$WEB_SITE/archive/$TARBALL"
+
+DEPENDS="pcsc-lite libusb"
+BUILD_DEPENDS="automake libtool pcsc-lite-dev libusb-dev doxygen"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	mkdir -p $DESTDIR/etc
+	./bootstrap &&
+	./configure --prefix=/usr \
+		--enable-pcsc \
+		--enable-usb \
+		--sysconfdir=/etc \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+	$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$DESTDIR install
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/lib
+	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	cp -a $install/etc $fs
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/sbin $fs/usr
+}