wok-current rev 20451

Add python-click python-itsdangerous & python-flask
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Sep 29 15:27:00 2018 +0200 (2018-09-29)
parents 9c21088bf854
children 570dc794f847
files linld/stuff/src/CRTL.ASM linld/stuff/src/LINLD.CPP linld/stuff/src/MEMTOP.ASM linld/stuff/src/TAZBOOT.CPP linld/stuff/src/_BEG.ASM python-click/receipt python-flask/receipt python-itsdangerous/receipt
line diff
     1.1 --- a/linld/stuff/src/CRTL.ASM	Fri Sep 21 13:01:08 2018 +0200
     1.2 +++ b/linld/stuff/src/CRTL.ASM	Sat Sep 29 15:27:00 2018 +0200
     1.3 @@ -16,13 +16,13 @@
     1.4  
     1.5          segment _DATA byte public use16 'DATA'
     1.6  
     1.7 -        global  _heap_top:word
     1.8 -	extrn	_bss_end
     1.9 +		global	_heap_top
    1.10 +		extrn	_bss_end
    1.11  _heap_top	dw	_bss_end
    1.12  msg_hang	db      "High mem corrupted - not exiting to DOS"
    1.13  msg_crlf	db	13,10,0
    1.14 -vcpi_alloc_err	db	"vcpi "
    1.15 -msg_malloc      db      "malloc failure",0
    1.16 +vcpi_alloc_err	db	"VCPI "
    1.17 +msg_malloc      db      "malloc error",0
    1.18  	ifdef	EXTRA
    1.19  tazboot_cmd	db	"tazboot.cmd",0
    1.20  	endif
    1.21 @@ -159,7 +159,7 @@
    1.22  		lodsb
    1.23  		sub	al,[bx]
    1.24  		jnz	@@out
    1.25 -		sub	al,[bx]
    1.26 +		sub	al,al
    1.27  		jnz	@@lp
    1.28  @@out:
    1.29  		cbw
    1.30 @@ -183,8 +183,8 @@
    1.31          global  malloc:near			; malloc(cx)
    1.32  malloc:						; keep CX, use AX,BX
    1.33  		mov	ax,[_heap_top]
    1.34 -		mov	bx,-1400h		; MIN_STACK=_1k+PAGE_SIZE
    1.35 -		add	bx,sp
    1.36 +		mov	bx,sp
    1.37 +		add	bh,-14h			; MIN_STACK=_1k+PAGE_SIZE
    1.38  		sub	bx,ax			; can't overflow
    1.39  		cmp	bx,cx
    1.40  		mov	bx,offset msg_malloc
     2.1 --- a/linld/stuff/src/LINLD.CPP	Fri Sep 21 13:01:08 2018 +0200
     2.2 +++ b/linld/stuff/src/LINLD.CPP	Sat Sep 29 15:27:00 2018 +0200
     2.3 @@ -29,8 +29,8 @@
     2.4          "Use cl=@filename to get it from a file"
     2.5  #if 1
     2.6          NL NL "Examples:" NL
     2.7 -        "\tlinld -f -b 64m initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz \"cl=rw root=/dev/null video=-32\""
     2.8 -	NL NL "\tlinld image=memtest"
     2.9 +        "\tLINLD -f -b 64m initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz \"cl=rw root=/dev/null video=-32\""
    2.10 +	NL NL "\tLINLD image=memtest"
    2.11  #endif
    2.12      );
    2.13  }
     3.1 --- a/linld/stuff/src/MEMTOP.ASM	Fri Sep 21 13:01:08 2018 +0200
     3.2 +++ b/linld/stuff/src/MEMTOP.ASM	Sat Sep 29 15:27:00 2018 +0200
     3.3 @@ -11,18 +11,10 @@
     3.4                  p386
     3.5  		endif
     3.6  
     3.7 -        group   DGROUP  _TEXT,_DATA,_BSS
     3.8 +        group   DGROUP  _TEXT,_BSS
     3.9          assume  cs:DGROUP,ds:DGROUP
    3.10  
    3.11  
    3.12 -        segment _DATA byte public use16 'DATA'
    3.13 -
    3.14 -        global  _topmem:dword
    3.15 -
    3.16 -_topmem		dd	10000000h	; max 256m
    3.17 -
    3.18 -        ends    _DATA
    3.19 -
    3.20          segment _BSS byte public use16 'BSS'
    3.21  
    3.22  saved15		dd	?
    3.23 @@ -161,6 +153,7 @@
    3.24  ; we had trouble detecting memory size
    3.25  		cmp	dx,cx
    3.26  		jb	@@set
    3.27 +		extrn	_topmem:dword
    3.28  		mov	cx,[word _topmem+2]	; max 256m ?
    3.29  ; Kernel can have trouble with initrd at very high addr:
    3.30  ; limit mem top to 256m
     4.1 --- a/linld/stuff/src/TAZBOOT.CPP	Fri Sep 21 13:01:08 2018 +0200
     4.2 +++ b/linld/stuff/src/TAZBOOT.CPP	Sat Sep 29 15:27:00 2018 +0200
     4.3 @@ -167,7 +167,7 @@
     4.4  	if (argc < 2) {
     4.5  		try_default_args();
     4.6  dousage:
     4.7 -		die("Usage: tazboot [[@commands]|[-f][-b base_himem][kernel=<bzimage>] \
     4.8 +		die("Usage: tazboot [[@commands]|[-f][-b base_himem][kernel=<bzImage>] \
     4.9  [initrd=<rootfs>[,<rootfs2>...]] [bootfrom=<isofile>] ...]\r\n\n\
    4.10  Defaults: tazboot kernel=bzImage auto\r\n\n\
    4.11  Examples for tazboot.cmd:\r\n\n\
     5.1 --- a/linld/stuff/src/_BEG.ASM	Fri Sep 21 13:01:08 2018 +0200
     5.2 +++ b/linld/stuff/src/_BEG.ASM	Sat Sep 29 15:27:00 2018 +0200
     5.3 @@ -11,6 +11,32 @@
     5.4          assume  cs:DGROUP,ds:DGROUP
     5.5  
     5.6          segment _TEXT byte public use16 'CODE'
     5.7 +        ends    _TEXT
     5.8 +
     5.9 +        segment _DATA byte public use16 'DATA'
    5.10 +        global  _data_start:byte
    5.11 +        label   _data_start byte
    5.12 +		ifndef	NO386
    5.13 +msg_badcpu      db      "I need 386+ CPU in real mode or under VCPI manager"
    5.14 +		endif
    5.15 +        global  _vcpi:byte
    5.16 +_vcpi		db	0
    5.17 +msg_badmapping  db      "VCPI: low 640k: need 1:1 mapping"
    5.18 +        global  _topmem:dword
    5.19 +_topmem		dd	10000000h	; max 256m
    5.20 +
    5.21 +        ends    _DATA
    5.22 +
    5.23 +        segment _BSS byte public use16 'BSS'
    5.24 +        global  _bss_start:byte
    5.25 +        label   _bss_start byte
    5.26 +		ifdef	EXTRA
    5.27 +        global  _cpu_features:dword
    5.28 +_cpu_features	dd	?
    5.29 +		endif
    5.30 +        ends    _BSS
    5.31 +
    5.32 +        segment _TEXT byte public use16 'CODE'
    5.33  
    5.34  	macro   cpuid
    5.35          	db      0fh,0A2h
    5.36 @@ -24,42 +50,27 @@
    5.37  ; clear bss
    5.38  ;***************************************************************
    5.39  		mov	si,offset _bss_start
    5.40 +		mov	bx, 0F000h	; cld ; cli
    5.41  clearbss:
    5.42 -		mov	[byte si],0		; clear bss + heap + sp
    5.43 +		mov	[si],bl		; clear bss + heap + sp
    5.44  		inc	si
    5.45  		jne	clearbss
    5.46 -                cld
    5.47  
    5.48  ;***************************************************************
    5.49  ; check CPU
    5.50  ;***************************************************************
    5.51  
    5.52  ; Check for oldies
    5.53 -		ifndef	EXTRA
    5.54 -		push	sp
    5.55 -		pop	ax
    5.56 -		sub	ax,sp
    5.57 -		 ifndef	NO386
    5.58 -		mov	bx,offset msg_badcpu
    5.59 -                jnz	no_vcpi   	;it is a 86/186 not a 286+
    5.60 -		 else
    5.61 -                jnz	endcpu   	;it is a 86/186 not a 286+
    5.62 -		 endif
    5.63 -		else
    5.64 -		pushf
    5.65 -		mov	bh, 0F0h
    5.66  		push	bx		; < 286 : flags[12..15] are forced 1
    5.67  		popf			; = 286 : flags[12..15] are forced 0
    5.68  		pushf			; > 286 : only flags[15] is forced 0
    5.69  		pop	dx
    5.70 -		popf
    5.71 -		add	dh,bh		; NS=386+, NC=286
    5.72 -		 ifndef	NO386
    5.73 +		add	dh,bh		; NS=386+, S+NC=286, S+C=86/186
    5.74 +		ifndef	NO386
    5.75  		mov	bx,offset msg_badcpu
    5.76                  js	no_vcpi   	;it is not a 386+
    5.77 -		 else
    5.78 +		else
    5.79                  js	endcpu   	;it is not a 386+
    5.80 -		 endif
    5.81  		endif
    5.82                  p386
    5.83  		ifdef	EXTRA
    5.84 @@ -131,7 +142,6 @@
    5.85                  test    ah,ah
    5.86  		jnz	no_vcpi
    5.87  is386vcpi:
    5.88 -		inc	[_vcpi]
    5.89                  extrn   prepare_vcpi:near
    5.90  		call	prepare_vcpi
    5.91  ;    get_vcpi_interface() || die("VCPI: low 640k: need 1:1 mapping");
    5.92 @@ -139,6 +149,7 @@
    5.93  		;call	_get_vcpi_interface
    5.94  		mov	bx,offset msg_badmapping
    5.95  		jz	endcpu
    5.96 +		inc	[byte bx+_vcpi-msg_badmapping]
    5.97  no_vcpi:
    5.98                  p8086
    5.99                ;;pop     dx              ;$ handle
   5.100 @@ -184,7 +195,7 @@
   5.101  		endif
   5.102                  mov	bx,2			; argc * 2
   5.103  argeos:
   5.104 -                mov	dl,1			; look for a start of string
   5.105 +                mov	cx,1			; look for a start of string
   5.106                  mov	[byte si-1],bh		; mark eos
   5.107                  mov	ah,20h			; space will be eos
   5.108  arglp:
   5.109 @@ -199,18 +210,17 @@
   5.110                  je	isargstr
   5.111                  cmp	al,22h
   5.112                  je	isargstr
   5.113 -                or	dl,dl
   5.114 -                je	arglp			; not start of string
   5.115 +                jcxz	arglp			; not start of string
   5.116                  dec	si
   5.117                  ;jmp	newarg
   5.118 -		db	0B9h			; mov cx,im opcode
   5.119 +		db	0BAh			; mov dx,im opcode
   5.120  isargstr:
   5.121                  mov	ah,al			; expected eos
   5.122  newarg:
   5.123                  mov	[word bx+di],si		; argv[argc++] = si
   5.124                  inc	bx
   5.125                  inc	bx
   5.126 -                dec	dx
   5.127 +                dec	cx
   5.128                  jmp	arglp
   5.129  argdone:
   5.130                  ;mov	[word bx+di],0		; argv[argc] = 0
   5.131 @@ -255,26 +265,6 @@
   5.132                  int	21h
   5.133          ends    _TEXT
   5.134  
   5.135 -        segment _DATA byte public use16 'DATA'
   5.136 -        global  _data_start:byte
   5.137 -        label   _data_start byte
   5.138 -		ifndef	NO386
   5.139 -msg_badcpu      db      "I need 386+ CPU in real mode or under VCPI manager"
   5.140 -		endif
   5.141 -        global  _vcpi:byte
   5.142 -_vcpi		db	0
   5.143 -msg_badmapping  db      "VCPI: low 640k: need 1:1 mapping",0
   5.144 -
   5.145 -        ends    _DATA
   5.146 -
   5.147 -        segment _BSS byte public use16 'BSS'
   5.148 -        global  _bss_start:byte
   5.149 -        label   _bss_start byte
   5.150 -		ifdef	EXTRA
   5.151 -        global  _cpu_features:dword
   5.152 -_cpu_features	dd	?
   5.153 -		endif
   5.154 -        ends    _BSS
   5.155  
   5.156          end     _text_start
   5.157  
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/python-click/receipt	Sat Sep 29 15:27:00 2018 +0200
     6.3 @@ -0,0 +1,27 @@
     6.4 +# SliTaz package receipt.
     6.5 +
     6.6 +PACKAGE="python-click"
     6.7 +SOURCE="Click"
     6.8 +VERSION="7.0"
     6.9 +CATEGORY="development"
    6.10 +SHORT_DESC="Composable command line interface toolkit"
    6.11 +MAINTAINER="pascal.bellard@slitaz.org"
    6.12 +LICENSE="BSD"
    6.13 +WEB_SITE="https://pypi.org/project/click/"
    6.14 +TARBALL="$SOURCE-$VERSION.tar.gz"
    6.15 +WGET_URL="https://files.pythonhosted.org/packages/f8/5c/f60e9d8a1e77005f664b76ff8aeaee5bc05d0a91798afd7f53fc998dbc47/$TARBALL"
    6.16 +
    6.17 +DEPENDS="python"
    6.18 +BUILD_DEPENDS="python"
    6.19 +
    6.20 +# Rules to configure and make the package.
    6.21 +compile_rules()
    6.22 +{
    6.23 +	python setup.py install --prefix=/usr --root=$DESTDIR
    6.24 +}
    6.25 +
    6.26 +# Rules to gen a SliTaz package suitable for Tazpkg.
    6.27 +genpkg_rules()
    6.28 +{
    6.29 +	cp -a $install/usr $fs/
    6.30 +}
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/python-flask/receipt	Sat Sep 29 15:27:00 2018 +0200
     7.3 @@ -0,0 +1,27 @@
     7.4 +# SliTaz package receipt.
     7.5 +
     7.6 +PACKAGE="python-flask"
     7.7 +SOURCE="Flask"
     7.8 +VERSION="1.0.2"
     7.9 +CATEGORY="development"
    7.10 +SHORT_DESC="A simple framework for building complex web applications"
    7.11 +MAINTAINER="pascal.bellard@slitaz.org"
    7.12 +LICENSE="BSD"
    7.13 +WEB_SITE="http://flask.pocoo.org/"
    7.14 +TARBALL="$SOURCE-$VERSION.tar.gz"
    7.15 +WGET_URL="https://files.pythonhosted.org/packages/4b/12/c1fbf4971fda0e4de05565694c9f0c92646223cff53f15b6eb248a310a62/$TARBALL"
    7.16 +
    7.17 +DEPENDS="python-click python-itsdangerous"
    7.18 +BUILD_DEPENDS="python"
    7.19 +
    7.20 +# Rules to configure and make the package.
    7.21 +compile_rules()
    7.22 +{
    7.23 +	python setup.py install --prefix=/usr --root=$DESTDIR
    7.24 +}
    7.25 +
    7.26 +# Rules to gen a SliTaz package suitable for Tazpkg.
    7.27 +genpkg_rules()
    7.28 +{
    7.29 +	cp -a $install/usr $fs/
    7.30 +}
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/python-itsdangerous/receipt	Sat Sep 29 15:27:00 2018 +0200
     8.3 @@ -0,0 +1,27 @@
     8.4 +# SliTaz package receipt.
     8.5 +
     8.6 +PACKAGE="python-itsdangerous"
     8.7 +SOURCE="itsdangerous"
     8.8 +VERSION="0.24"
     8.9 +CATEGORY="development"
    8.10 +SHORT_DESC="Various helpers to pass trusted data to untrusted environments and back"
    8.11 +MAINTAINER="pascal.bellard@slitaz.org"
    8.12 +LICENSE="BSD"
    8.13 +WEB_SITE="https://pypi.org/project/click/"
    8.14 +TARBALL="$SOURCE-$VERSION.tar.gz"
    8.15 +WGET_URL="https://files.pythonhosted.org/packages/dc/b4/a60bcdba945c00f6d608d8975131ab3f25b22f2bcfe1dab221165194b2d4/$TARBALL"
    8.16 +
    8.17 +DEPENDS="python"
    8.18 +BUILD_DEPENDS="python"
    8.19 +
    8.20 +# Rules to configure and make the package.
    8.21 +compile_rules()
    8.22 +{
    8.23 +	python setup.py install --prefix=/usr --root=$DESTDIR
    8.24 +}
    8.25 +
    8.26 +# Rules to gen a SliTaz package suitable for Tazpkg.
    8.27 +genpkg_rules()
    8.28 +{
    8.29 +	cp -a $install/usr $fs/
    8.30 +}