wok rev 25698

Up beep (1.4.12), gsoap (2.8.134), perl-test-warnings (0.033)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun May 26 08:12:35 2024 +0000 (3 weeks ago)
parents 47bbbfd2172b
children 65c2646b484d
files BootProg/receipt BootProg/stuff/boot16.asm BootProg/stuff/boot32.asm BootProg/stuff/bootex.asm BootProg/stuff/bootprog.sh beep/receipt gsoap-dev/receipt gsoap/receipt hiawatha/receipt mosh/receipt pan/receipt perl-file-sharedir-install/receipt perl-term-readkey/receipt perl-test-warnings/receipt screentest/receipt xdelta/receipt
line diff
     1.1 --- a/BootProg/receipt	Sun May 12 07:10:04 2024 +0100
     1.2 +++ b/BootProg/receipt	Sun May 26 08:12:35 2024 +0000
     1.3 @@ -3,12 +3,18 @@
     1.4  PACKAGE="BootProg"
     1.5  VERSION="slitaz"
     1.6  CATEGORY="base-system"
     1.7 -SHORT_DESC="FAT12/16/32 Bootsector for .COMs/.EXEs"
     1.8 +SHORT_DESC="FAT12/16/32 and exFAT Bootsector for .COMs/.EXEs"
     1.9  MAINTAINER="pascal.bellard@slitaz.org"
    1.10  LICENSE="MIT"
    1.11  WEB_SITE="https://wiki.osdev.org/BootProg"
    1.12  
    1.13 -BUILD_DEPENDS="nasm xz"
    1.14 +BUILD_DEPENDS="nasm xz advancecomp"
    1.15 +
    1.16 +bootprog_data()
    1.17 +{
    1.18 +	sed "1,2d;s|FAT32SZ|$(stat -c %s boot32.bin)|" $stuff/bootprog.sh
    1.19 +	cat ${1// /.bin }.bin
    1.20 +}
    1.21  
    1.22  # Rules to configure and make the package.
    1.23  compile_rules()
    1.24 @@ -22,17 +28,18 @@
    1.25  	for i in $bs ; do
    1.26  		nasm $i.asm -f bin -o $i.bin -l $i.lst || return 1
    1.27  	done
    1.28 -	sed '1,2!d' $stuff/bootprog.sh > bootprog
    1.29 -	{
    1.30 -		sed "1,2d;s|FAT32SZ|$(stat -c %s boot32.bin)|" $stuff/bootprog.sh
    1.31 -		cat ${bs// /.bin }.bin
    1.32 -	} | xz -z --format=lzma --lzma1=lc=0,pb=0,nice=33,dict=4k >> bootprog
    1.33 -	chmod +x bootprog
    1.34 +	sed '1,2!d' $stuff/bootprog.sh > bootprog.lzma
    1.35 +	bootprog_data "$bs" | xz -z --format=lzma --lzma1=lc=0,pb=0,nice=33,dict=4k >> bootprog.lzma
    1.36 +	bootprog_data "$bs" | gzip -9 > bootprog.gz
    1.37 +	advdef -z4 -i 1200 bootprog.gz
    1.38 +	sed '1,2!d;s|unlzma|zcat|' $stuff/bootprog.sh | cat - bootprog.gz > bootprog.gzip
    1.39 +	rm bootprog.gz
    1.40 +	chmod +x bootprog.lzma bootprog.gzip
    1.41  }
    1.42  
    1.43  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.44  genpkg_rules()
    1.45  {
    1.46  	mkdir -p $fs/usr/bin
    1.47 -	cp -a $src/bootprog $fs/usr/bin
    1.48 +	cp -a $src/bootprog.gzip $fs/usr/bin/bootprog
    1.49  }
     2.1 --- a/BootProg/stuff/boot16.asm	Sun May 12 07:10:04 2024 +0100
     2.2 +++ b/BootProg/stuff/boot16.asm	Sun May 26 08:12:35 2024 +0000
     2.3 @@ -102,6 +102,7 @@
     2.4  WaitForKey              equ     0               ; +5 bytes
     2.5  SectorOf512Bytes        equ     0               ; -4/-6 bytes
     2.6  Always2FATs             equ     0               ; -1 bytes
     2.7 +AnyWhere                equ     1               ; +4 bytes
     2.8  
     2.9  [BITS 16]
    2.10  [CPU 8086]
    2.11 @@ -155,13 +156,20 @@
    2.12  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    2.13  
    2.14  start:
    2.15 -        cld
    2.16  
    2.17  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    2.18  ;; How much RAM is there? ;;
    2.19  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    2.20  
    2.21          int     12h             ; get conventional memory size (in KBs)
    2.22 +%if AnyWhere
    2.23 +        call    here
    2.24 +here:
    2.25 +        pop     si
    2.26 +        sub     si, here - boot
    2.27 +        push    cs
    2.28 +        pop     ds
    2.29 +%endif
    2.30          mov     cx, 106h
    2.31          shl     ax, cl          ; and convert it to 16-byte paragraphs
    2.32  
    2.33 @@ -178,11 +186,14 @@
    2.34  ;; Copy ourselves to top of memory ;;
    2.35  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    2.36  
    2.37 +        xor     di, di
    2.38 +%if AnyWhere == 0
    2.39          mov     si, 7C00h
    2.40 -        xor     di, di
    2.41          mov     ds, di
    2.42 +%endif
    2.43          push    es
    2.44          mov     [si(DriveNumber)], dx   ; store BIOS boot drive number
    2.45 +        cld
    2.46          rep     movsw                   ; move 512 bytes (+ 12)
    2.47  
    2.48  ;;;;;;;;;;;;;;;;;;;;;;
     3.1 --- a/BootProg/stuff/boot32.asm	Sun May 12 07:10:04 2024 +0100
     3.2 +++ b/BootProg/stuff/boot32.asm	Sun May 26 08:12:35 2024 +0000
     3.3 @@ -100,6 +100,7 @@
     3.4  SectorOf512Bytes        equ     0               ; -4 bytes
     3.5  Always2FATs             equ     0               ; -4 bytes
     3.6  WaitForKey              equ     0               ; +5 bytes
     3.7 +AnyWhere                equ     1               ; +4 bytes
     3.8  
     3.9  [BITS 16]
    3.10  [CPU 386]
    3.11 @@ -169,13 +170,20 @@
    3.12  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    3.13  
    3.14  start:
    3.15 -        cld
    3.16  
    3.17  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    3.18  ;; How much RAM is there? ;;
    3.19  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    3.20  
    3.21          int     12h             ; get conventional memory size (in KBs)
    3.22 +%if AnyWhere
    3.23 +        call    here
    3.24 +here:
    3.25 +        pop     si
    3.26 +        sub     si, here - boot
    3.27 +        push    cs
    3.28 +        pop     ds
    3.29 +%endif
    3.30          dec     ax              ; reserve 1K bytes for the code and the stack
    3.31          mov     cx, 106h
    3.32          shl     ax, cl          ; and convert it to 16-byte paragraphs
    3.33 @@ -194,12 +202,15 @@
    3.34  ;; Copy ourselves to top of memory ;;
    3.35  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    3.36  
    3.37 +        xor     di, di
    3.38 +%if AnyWhere == 0
    3.39          mov     si, 7C00h
    3.40 -        xor     di, di
    3.41          mov     ds, di
    3.42 +%endif
    3.43          push    es
    3.44          mov     [si(DriveNumber)], dx  ; store BIOS boot drive number
    3.45 -        rep     movsw
    3.46 +        cld
    3.47 +        rep     movsw                  ; move 512 bytes (+ 12)
    3.48  
    3.49  ;;;;;;;;;;;;;;;;;;;;;;
    3.50  ;; Jump to the copy ;;
     4.1 --- a/BootProg/stuff/bootex.asm	Sun May 12 07:10:04 2024 +0100
     4.2 +++ b/BootProg/stuff/bootex.asm	Sun May 26 08:12:35 2024 +0000
     4.3 @@ -85,6 +85,7 @@
     4.4  WaitForKey              equ     0               ; +5 bytes
     4.5  TfatSupport             equ     1               ; +10 bytes
     4.6  CheckLBAsupport         equ     0               ; +11/21 bytes
     4.7 +AnyWhere                equ     1               ; +2 bytes
     4.8  
     4.9  [BITS 16]
    4.10  [CPU 386]
    4.11 @@ -136,13 +137,20 @@
    4.12  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    4.13  
    4.14  start:
    4.15 -        cld
    4.16  
    4.17  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    4.18  ;; How much RAM is there? ;;
    4.19  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    4.20  
    4.21          int     12h             ; get conventional memory size (in KBs)
    4.22 +%if AnyWhere
    4.23 +        call    start2
    4.24 +here:
    4.25 +%macro BootAnyWhere 0
    4.26 +start2:
    4.27 +        pop     si
    4.28 +        sub     si, here - boot
    4.29 +%endif
    4.30          mov     cx, 106h
    4.31          dec     ax              ; reserve 1K bytes for the code and the stack
    4.32          shl     ax, cl          ; and convert it to 16-byte paragraphs
    4.33 @@ -159,19 +167,28 @@
    4.34  ;; Copy ourselves to top of memory ;;
    4.35  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    4.36  
    4.37 +        xor     di, di
    4.38 +%if AnyWhere == 0
    4.39          mov     si, 7C00h
    4.40 -        xor     di, di
    4.41          mov     ds, di
    4.42 +%endif
    4.43          push    es
    4.44 -        mov     [si(DriveNumber)], dx   ; store BIOS boot drive number
    4.45 -        rep     movsw                   ; move 512 bytes (+ 12)
    4.46 +        cld
    4.47  
    4.48  ;;;;;;;;;;;;;;;;;;;;;;
    4.49  ;; Jump to the copy ;;
    4.50  ;;;;;;;;;;;;;;;;;;;;;;
    4.51  
    4.52 +%if AnyWhere == 0
    4.53 +        rep     movsw                   ; move 512 bytes (+ 12)
    4.54          push    word main
    4.55          retf
    4.56 +%else
    4.57 +        rep     cs movsw                ; move 512 bytes (+ 12)
    4.58 +        push    byte main
    4.59 +        retf
    4.60 +%endm
    4.61 +%endif
    4.62  
    4.63  %if CheckLBAsupport != 0
    4.64  %macro BootFileName 0
    4.65 @@ -193,6 +210,7 @@
    4.66  
    4.67          xor     ebx, ebx
    4.68  
    4.69 +        mov     [bx(DriveNumber)], dx   ; store BIOS boot drive number
    4.70          mov     esi, [bx(bpbRootDirCluster)] ; esi=cluster # of root dir
    4.71  
    4.72          push    byte ImageLoadSeg
    4.73 @@ -390,6 +408,10 @@
    4.74  %endm
    4.75  %endif
    4.76  
    4.77 +%if AnyWhere
    4.78 +	BootAnyWhere
    4.79 +%endif
    4.80 +
    4.81  ;;;;;;;;;;;;;;;;;;;;;;;;;;
    4.82  ;; Error Messaging Code ;;
    4.83  ;;;;;;;;;;;;;;;;;;;;;;;;;;
     5.1 --- a/BootProg/stuff/bootprog.sh	Sun May 12 07:10:04 2024 +0100
     5.2 +++ b/BootProg/stuff/bootprog.sh	Sun May 26 08:12:35 2024 +0000
     5.3 @@ -1,10 +1,10 @@
     5.4  #!/bin/sh
     5.5 -p=/tmp/bp$$;sed '1,2d' $0|unlzma>$p;sh $p $0 "$@";s=$?;rm $p;exit $s
     5.6 +p=/tmp/b$$;sed 1,2d $0|unlzma>$p;sh $p $0 "$@";s=$?;rm $p;exit $s
     5.7  set -- "$2" "${3:-startup.bin}" $1
     5.8 -[ ! -e "$1" ] && cat<<S && exit 2
     5.9 +[ ! -e "$1" ] && cat<<s && exit 2
    5.10  Usage: [FS=<FAT12|FAT16|FAT32|EXFAT>] $3 device [file]
    5.11 -Example: $3 /dev/fd0 $1
    5.12 -S
    5.13 +Example: $3 /dev/fd0 $2
    5.14 +s
    5.15  r="dd if=$1 count"
    5.16  w="dd of=$1 bs=1 conv=notrunc seek"
    5.17  while read c o b s f
    5.18 @@ -24,10 +24,10 @@
    5.19  END { b=a/256;c=b/256; for (;i>0;i-=44) printf "%c%c%c%c",a%256,b%256,c%256,(c/256)%256 }' | $w=5632
    5.20  	esac
    5.21  	exit 0
    5.22 -done<<S 2>/dev/null
    5.23 +done<<s 2>/dev/null
    5.24  54	59	0	512	FAT12
    5.25  54	59	512	512	FAT16
    5.26  3	113	1024	512	EXFAT
    5.27  82	87	1536	FAT32SZ	FAT32
    5.28 -S
    5.29 +s
    5.30  exit 1
     6.1 --- a/beep/receipt	Sun May 12 07:10:04 2024 +0100
     6.2 +++ b/beep/receipt	Sun May 26 08:12:35 2024 +0000
     6.3 @@ -1,28 +1,29 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="beep"
     6.7 -VERSION="1.3"
     6.8 +VERSION="1.4.12"
     6.9  CATEGORY="system-tools"
    6.10  SHORT_DESC="Advanced pc-speaker beeper."
    6.11  MAINTAINER="pascal.bellard@slitaz.org"
    6.12  LICENSE="GPL2"
    6.13 -WEB_SITE="http://www.johnath.com/beep/README"
    6.14 +WEB_SITE="https://github.com/spkr-beep/beep"
    6.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    6.16 -WGET_URL="http://www.johnath.com/beep/$TARBALL"
    6.17 +WGET_URL="https://github.com/spkr-beep/beep/archive/refs/tags/v$VERSION.tar.gz"
    6.18  
    6.19  # What is the latest version available today?
    6.20  current_version()
    6.21  {
    6.22 -	wget -O - ${WGET_URL%/*} 2>/dev/null | \
    6.23 -	sed '/latest version/!d;s|.* is v||;s|,.*||;q'
    6.24 +	wget -O - ${WGET_URL%/arch*}/releases 2>/dev/null | \
    6.25 +	sed '/tag\//!d;s|.*tag/v*||;s|".*||;q'
    6.26  }
    6.27  
    6.28  # Rules to configure and make the package.
    6.29  compile_rules()
    6.30  {
    6.31 +	sed -i 's|secure_getenv|getenv|' beep-log.c
    6.32  	make
    6.33  
    6.34 -	cook_pick_manpages beep.1.gz
    6.35 +	cook_pick_manpages beep.1
    6.36  }
    6.37  
    6.38  # Rules to gen a SliTaz package suitable for Tazpkg.
     7.1 --- a/gsoap-dev/receipt	Sun May 12 07:10:04 2024 +0100
     7.2 +++ b/gsoap-dev/receipt	Sun May 26 08:12:35 2024 +0000
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="gsoap-dev"
     7.7 -VERSION="2.8.127"
     7.8 +VERSION="2.8.134"
     7.9  CATEGORY="development"
    7.10  SHORT_DESC="Gsoap development files."
    7.11  MAINTAINER="slaxemulator@gmail.com"
     8.1 --- a/gsoap/receipt	Sun May 12 07:10:04 2024 +0100
     8.2 +++ b/gsoap/receipt	Sun May 26 08:12:35 2024 +0000
     8.3 @@ -1,7 +1,7 @@
     8.4  # SliTaz package receipt.
     8.5  
     8.6  PACKAGE="gsoap"
     8.7 -VERSION="2.8.127"
     8.8 +VERSION="2.8.134"
     8.9  CATEGORY="network"
    8.10  SHORT_DESC="XML language binding to develop SOAP/XML services in C/C++."
    8.11  MAINTAINER="slaxemulator@gmail.com"
     9.1 --- a/hiawatha/receipt	Sun May 12 07:10:04 2024 +0100
     9.2 +++ b/hiawatha/receipt	Sun May 26 08:12:35 2024 +0000
     9.3 @@ -10,7 +10,7 @@
     9.4  WEB_SITE="https://www.hiawatha-webserver.org/"
     9.5  
     9.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
     9.7 -WGET_URL="${WEB_SITE}files/$TARBALL"
     9.8 +WGET_URL="https://hiawatha.leisink.net/files/$TARBALL"
     9.9  
    9.10  PROVIDE="lighttpd"
    9.11  DEPENDS="gcc83-lib-base libxml2 libxslt openssl zlib"
    10.1 --- a/mosh/receipt	Sun May 12 07:10:04 2024 +0100
    10.2 +++ b/mosh/receipt	Sun May 26 08:12:35 2024 +0000
    10.3 @@ -10,7 +10,7 @@
    10.4  WEB_SITE="https://mosh.org/"
    10.5  
    10.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
    10.7 -WGET_URL="${WEB_SITE}$TARBALL"
    10.8 +WGET_URL="https://github.com/mobile-shell/mosh/releases/download/$PACKAGE-$VERSION/$TARBALL"
    10.9  
   10.10  DEPENDS="gcc-lib-base libcrypto libssl ncursesw perl protobuf ssh zlib \
   10.11  gcc83-lib-base"
   10.12 @@ -20,8 +20,8 @@
   10.13  # What is the latest version available today?
   10.14  current_version()
   10.15  {
   10.16 -	wget -O - ${WGET_URL%/*} 2>/dev/null | \
   10.17 -	sed "/latest/d;/$PACKAGE-[0-9]/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*\".*|\\1|" | sort -Vr | sed q
   10.18 +	wget -O - ${WGET_URL%/down*} 2>/dev/null | \
   10.19 +	sed '/tag\//!d;s|.*tag/[a-z-]*||;s|".*||;q'
   10.20  }
   10.21  
   10.22  # Rules to configure and make the package.
    11.1 --- a/pan/receipt	Sun May 12 07:10:04 2024 +0100
    11.2 +++ b/pan/receipt	Sun May 26 08:12:35 2024 +0000
    11.3 @@ -6,7 +6,7 @@
    11.4  SHORT_DESC="A usenet newsreader."
    11.5  MAINTAINER="allan316@gmail.com"
    11.6  LICENSE="GPL2"
    11.7 -WEB_SITE="https://pan.rebelbase.com"
    11.8 +WEB_SITE="http://pan.rebelbase.com"
    11.9  
   11.10  TARBALL="$PACKAGE-$VERSION.tar.gz"
   11.11  WGET_URL="$WEB_SITE/download/releases/$VERSION/source/$TARBALL"
    12.1 --- a/perl-file-sharedir-install/receipt	Sun May 12 07:10:04 2024 +0100
    12.2 +++ b/perl-file-sharedir-install/receipt	Sun May 26 08:12:35 2024 +0000
    12.3 @@ -11,7 +11,7 @@
    12.4  
    12.5  SOURCE="File-ShareDir-Install"
    12.6  TARBALL="$SOURCE-$VERSION.tar.gz"
    12.7 -WGET_URL="https://www.cpan.org/authors/id/E/ET/ETHER/$TARBALL"
    12.8 +WGET_URL="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$TARBALL"
    12.9  
   12.10  DEPENDS="perl"
   12.11  BUILD_DEPENDS="perl"
    13.1 --- a/perl-term-readkey/receipt	Sun May 12 07:10:04 2024 +0100
    13.2 +++ b/perl-term-readkey/receipt	Sun May 26 08:12:35 2024 +0000
    13.3 @@ -6,7 +6,7 @@
    13.4  SHORT_DESC="Perl extension Term::ReadKey."
    13.5  MAINTAINER="slaxemulator@gmail.com"
    13.6  LICENSE="GPL"
    13.7 -WEB_SITE="https://metacpan.org/dist/Term::ReadKey"
    13.8 +WEB_SITE="https://metacpan.org/pod/Term::ReadKey"
    13.9  
   13.10  SOURCE="TermReadKey"
   13.11  TARBALL="$SOURCE-$VERSION.tar.gz"
    14.1 --- a/perl-test-warnings/receipt	Sun May 12 07:10:04 2024 +0100
    14.2 +++ b/perl-test-warnings/receipt	Sun May 26 08:12:35 2024 +0000
    14.3 @@ -1,12 +1,12 @@
    14.4  # SliTaz package receipt.
    14.5  
    14.6  PACKAGE="perl-test-warnings"
    14.7 -VERSION="0.031"
    14.8 +VERSION="0.033"
    14.9  CATEGORY="development"
   14.10  SHORT_DESC="Perl extension Test::Warnings."
   14.11  MAINTAINER="nneul@neulinger.org"
   14.12  LICENSE="GPL"
   14.13 -WEB_SITE="https://metacpan.org/dist/Test-Warnings"
   14.14 +WEB_SITE="https://metacpan.org/pod/Test::Warnings"
   14.15  REPOLOGY="perl:test-warnings"
   14.16  
   14.17  SOURCE="Test-Warnings"
   14.18 @@ -16,6 +16,7 @@
   14.19  DEPENDS="perl"
   14.20  BUILD_DEPENDS="perl"
   14.21  
   14.22 +# What is the latest version available today?
   14.23  current_version()
   14.24  {
   14.25  	wget -O - $WEB_SITE 2>/dev/null | \
    15.1 --- a/screentest/receipt	Sun May 12 07:10:04 2024 +0100
    15.2 +++ b/screentest/receipt	Sun May 26 08:12:35 2024 +0000
    15.3 @@ -7,7 +7,7 @@
    15.4  MAINTAINER="pascal.bellard@slitaz.org"
    15.5  LICENSE="GPL2"
    15.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
    15.7 -WEB_SITE="http://tobix.github.io/screentest/"
    15.8 +WEB_SITE="https://tobix.github.io/screentest/"
    15.9  WGET_URL="https://github.com/TobiX/screentest/archive/$VERSION.tar.gz"
   15.10  TAGS="test diagnostic screen"
   15.11  
    16.1 --- a/xdelta/receipt	Sun May 12 07:10:04 2024 +0100
    16.2 +++ b/xdelta/receipt	Sun May 26 08:12:35 2024 +0000
    16.3 @@ -7,7 +7,7 @@
    16.4  MAINTAINER="pascal.bellard@slitaz.org"
    16.5  LICENSE="GPL2"
    16.6  TARBALL="$PACKAGE$VERSION.tar.gz"
    16.7 -WEB_SITE="http://xdelta.org/"
    16.8 +WEB_SITE="https://xdelta.org/"
    16.9  WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$PACKAGE/$TARBALL"
   16.10  
   16.11  # What is the latest version available today?