# HG changeset patch # User Pascal Bellard # Date 1716711155 0 # Node ID 82a123e546150dde35523f66cbacc416fc4c9af6 # Parent 47bbbfd2172b9376381e71ce69eb1ec28cad37ec Up beep (1.4.12), gsoap (2.8.134), perl-test-warnings (0.033) diff -r 47bbbfd2172b -r 82a123e54615 BootProg/receipt --- a/BootProg/receipt Sun May 12 07:10:04 2024 +0100 +++ b/BootProg/receipt Sun May 26 08:12:35 2024 +0000 @@ -3,12 +3,18 @@ PACKAGE="BootProg" VERSION="slitaz" CATEGORY="base-system" -SHORT_DESC="FAT12/16/32 Bootsector for .COMs/.EXEs" +SHORT_DESC="FAT12/16/32 and exFAT Bootsector for .COMs/.EXEs" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="MIT" WEB_SITE="https://wiki.osdev.org/BootProg" -BUILD_DEPENDS="nasm xz" +BUILD_DEPENDS="nasm xz advancecomp" + +bootprog_data() +{ + sed "1,2d;s|FAT32SZ|$(stat -c %s boot32.bin)|" $stuff/bootprog.sh + cat ${1// /.bin }.bin +} # Rules to configure and make the package. compile_rules() @@ -22,17 +28,18 @@ for i in $bs ; do nasm $i.asm -f bin -o $i.bin -l $i.lst || return 1 done - sed '1,2!d' $stuff/bootprog.sh > bootprog - { - sed "1,2d;s|FAT32SZ|$(stat -c %s boot32.bin)|" $stuff/bootprog.sh - cat ${bs// /.bin }.bin - } | xz -z --format=lzma --lzma1=lc=0,pb=0,nice=33,dict=4k >> bootprog - chmod +x bootprog + sed '1,2!d' $stuff/bootprog.sh > bootprog.lzma + bootprog_data "$bs" | xz -z --format=lzma --lzma1=lc=0,pb=0,nice=33,dict=4k >> bootprog.lzma + bootprog_data "$bs" | gzip -9 > bootprog.gz + advdef -z4 -i 1200 bootprog.gz + sed '1,2!d;s|unlzma|zcat|' $stuff/bootprog.sh | cat - bootprog.gz > bootprog.gzip + rm bootprog.gz + chmod +x bootprog.lzma bootprog.gzip } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/bin - cp -a $src/bootprog $fs/usr/bin + cp -a $src/bootprog.gzip $fs/usr/bin/bootprog } diff -r 47bbbfd2172b -r 82a123e54615 BootProg/stuff/boot16.asm --- a/BootProg/stuff/boot16.asm Sun May 12 07:10:04 2024 +0100 +++ b/BootProg/stuff/boot16.asm Sun May 26 08:12:35 2024 +0000 @@ -102,6 +102,7 @@ WaitForKey equ 0 ; +5 bytes SectorOf512Bytes equ 0 ; -4/-6 bytes Always2FATs equ 0 ; -1 bytes +AnyWhere equ 1 ; +4 bytes [BITS 16] [CPU 8086] @@ -155,13 +156,20 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; start: - cld ;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; How much RAM is there? ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;; int 12h ; get conventional memory size (in KBs) +%if AnyWhere + call here +here: + pop si + sub si, here - boot + push cs + pop ds +%endif mov cx, 106h shl ax, cl ; and convert it to 16-byte paragraphs @@ -178,11 +186,14 @@ ;; Copy ourselves to top of memory ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + xor di, di +%if AnyWhere == 0 mov si, 7C00h - xor di, di mov ds, di +%endif push es mov [si(DriveNumber)], dx ; store BIOS boot drive number + cld rep movsw ; move 512 bytes (+ 12) ;;;;;;;;;;;;;;;;;;;;;; diff -r 47bbbfd2172b -r 82a123e54615 BootProg/stuff/boot32.asm --- a/BootProg/stuff/boot32.asm Sun May 12 07:10:04 2024 +0100 +++ b/BootProg/stuff/boot32.asm Sun May 26 08:12:35 2024 +0000 @@ -100,6 +100,7 @@ SectorOf512Bytes equ 0 ; -4 bytes Always2FATs equ 0 ; -4 bytes WaitForKey equ 0 ; +5 bytes +AnyWhere equ 1 ; +4 bytes [BITS 16] [CPU 386] @@ -169,13 +170,20 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; start: - cld ;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; How much RAM is there? ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;; int 12h ; get conventional memory size (in KBs) +%if AnyWhere + call here +here: + pop si + sub si, here - boot + push cs + pop ds +%endif dec ax ; reserve 1K bytes for the code and the stack mov cx, 106h shl ax, cl ; and convert it to 16-byte paragraphs @@ -194,12 +202,15 @@ ;; Copy ourselves to top of memory ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + xor di, di +%if AnyWhere == 0 mov si, 7C00h - xor di, di mov ds, di +%endif push es mov [si(DriveNumber)], dx ; store BIOS boot drive number - rep movsw + cld + rep movsw ; move 512 bytes (+ 12) ;;;;;;;;;;;;;;;;;;;;;; ;; Jump to the copy ;; diff -r 47bbbfd2172b -r 82a123e54615 BootProg/stuff/bootex.asm --- a/BootProg/stuff/bootex.asm Sun May 12 07:10:04 2024 +0100 +++ b/BootProg/stuff/bootex.asm Sun May 26 08:12:35 2024 +0000 @@ -85,6 +85,7 @@ WaitForKey equ 0 ; +5 bytes TfatSupport equ 1 ; +10 bytes CheckLBAsupport equ 0 ; +11/21 bytes +AnyWhere equ 1 ; +2 bytes [BITS 16] [CPU 386] @@ -136,13 +137,20 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; start: - cld ;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; How much RAM is there? ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;; int 12h ; get conventional memory size (in KBs) +%if AnyWhere + call start2 +here: +%macro BootAnyWhere 0 +start2: + pop si + sub si, here - boot +%endif mov cx, 106h dec ax ; reserve 1K bytes for the code and the stack shl ax, cl ; and convert it to 16-byte paragraphs @@ -159,19 +167,28 @@ ;; Copy ourselves to top of memory ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + xor di, di +%if AnyWhere == 0 mov si, 7C00h - xor di, di mov ds, di +%endif push es - mov [si(DriveNumber)], dx ; store BIOS boot drive number - rep movsw ; move 512 bytes (+ 12) + cld ;;;;;;;;;;;;;;;;;;;;;; ;; Jump to the copy ;; ;;;;;;;;;;;;;;;;;;;;;; +%if AnyWhere == 0 + rep movsw ; move 512 bytes (+ 12) push word main retf +%else + rep cs movsw ; move 512 bytes (+ 12) + push byte main + retf +%endm +%endif %if CheckLBAsupport != 0 %macro BootFileName 0 @@ -193,6 +210,7 @@ xor ebx, ebx + mov [bx(DriveNumber)], dx ; store BIOS boot drive number mov esi, [bx(bpbRootDirCluster)] ; esi=cluster # of root dir push byte ImageLoadSeg @@ -390,6 +408,10 @@ %endm %endif +%if AnyWhere + BootAnyWhere +%endif + ;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Error Messaging Code ;; ;;;;;;;;;;;;;;;;;;;;;;;;;; diff -r 47bbbfd2172b -r 82a123e54615 BootProg/stuff/bootprog.sh --- a/BootProg/stuff/bootprog.sh Sun May 12 07:10:04 2024 +0100 +++ b/BootProg/stuff/bootprog.sh Sun May 26 08:12:35 2024 +0000 @@ -1,10 +1,10 @@ #!/bin/sh -p=/tmp/bp$$;sed '1,2d' $0|unlzma>$p;sh $p $0 "$@";s=$?;rm $p;exit $s +p=/tmp/b$$;sed 1,2d $0|unlzma>$p;sh $p $0 "$@";s=$?;rm $p;exit $s set -- "$2" "${3:-startup.bin}" $1 -[ ! -e "$1" ] && cat<] $3 device [file] -Example: $3 /dev/fd0 $1 -S +Example: $3 /dev/fd0 $2 +s r="dd if=$1 count" w="dd of=$1 bs=1 conv=notrunc seek" while read c o b s f @@ -24,10 +24,10 @@ 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 esac exit 0 -done</dev/null +done</dev/null 54 59 0 512 FAT12 54 59 512 512 FAT16 3 113 1024 512 EXFAT 82 87 1536 FAT32SZ FAT32 -S +s exit 1 diff -r 47bbbfd2172b -r 82a123e54615 beep/receipt --- a/beep/receipt Sun May 12 07:10:04 2024 +0100 +++ b/beep/receipt Sun May 26 08:12:35 2024 +0000 @@ -1,28 +1,29 @@ # SliTaz package receipt. PACKAGE="beep" -VERSION="1.3" +VERSION="1.4.12" CATEGORY="system-tools" SHORT_DESC="Advanced pc-speaker beeper." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" -WEB_SITE="http://www.johnath.com/beep/README" +WEB_SITE="https://github.com/spkr-beep/beep" TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="http://www.johnath.com/beep/$TARBALL" +WGET_URL="https://github.com/spkr-beep/beep/archive/refs/tags/v$VERSION.tar.gz" # What is the latest version available today? current_version() { - wget -O - ${WGET_URL%/*} 2>/dev/null | \ - sed '/latest version/!d;s|.* is v||;s|,.*||;q' + wget -O - ${WGET_URL%/arch*}/releases 2>/dev/null | \ + sed '/tag\//!d;s|.*tag/v*||;s|".*||;q' } # Rules to configure and make the package. compile_rules() { + sed -i 's|secure_getenv|getenv|' beep-log.c make - cook_pick_manpages beep.1.gz + cook_pick_manpages beep.1 } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 47bbbfd2172b -r 82a123e54615 gsoap-dev/receipt --- a/gsoap-dev/receipt Sun May 12 07:10:04 2024 +0100 +++ b/gsoap-dev/receipt Sun May 26 08:12:35 2024 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gsoap-dev" -VERSION="2.8.127" +VERSION="2.8.134" CATEGORY="development" SHORT_DESC="Gsoap development files." MAINTAINER="slaxemulator@gmail.com" diff -r 47bbbfd2172b -r 82a123e54615 gsoap/receipt --- a/gsoap/receipt Sun May 12 07:10:04 2024 +0100 +++ b/gsoap/receipt Sun May 26 08:12:35 2024 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gsoap" -VERSION="2.8.127" +VERSION="2.8.134" CATEGORY="network" SHORT_DESC="XML language binding to develop SOAP/XML services in C/C++." MAINTAINER="slaxemulator@gmail.com" diff -r 47bbbfd2172b -r 82a123e54615 hiawatha/receipt --- a/hiawatha/receipt Sun May 12 07:10:04 2024 +0100 +++ b/hiawatha/receipt Sun May 26 08:12:35 2024 +0000 @@ -10,7 +10,7 @@ WEB_SITE="https://www.hiawatha-webserver.org/" TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="${WEB_SITE}files/$TARBALL" +WGET_URL="https://hiawatha.leisink.net/files/$TARBALL" PROVIDE="lighttpd" DEPENDS="gcc83-lib-base libxml2 libxslt openssl zlib" diff -r 47bbbfd2172b -r 82a123e54615 mosh/receipt --- a/mosh/receipt Sun May 12 07:10:04 2024 +0100 +++ b/mosh/receipt Sun May 26 08:12:35 2024 +0000 @@ -10,7 +10,7 @@ WEB_SITE="https://mosh.org/" TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="${WEB_SITE}$TARBALL" +WGET_URL="https://github.com/mobile-shell/mosh/releases/download/$PACKAGE-$VERSION/$TARBALL" DEPENDS="gcc-lib-base libcrypto libssl ncursesw perl protobuf ssh zlib \ gcc83-lib-base" @@ -20,8 +20,8 @@ # What is the latest version available today? current_version() { - wget -O - ${WGET_URL%/*} 2>/dev/null | \ - sed "/latest/d;/$PACKAGE-[0-9]/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*\".*|\\1|" | sort -Vr | sed q + wget -O - ${WGET_URL%/down*} 2>/dev/null | \ + sed '/tag\//!d;s|.*tag/[a-z-]*||;s|".*||;q' } # Rules to configure and make the package. diff -r 47bbbfd2172b -r 82a123e54615 pan/receipt --- a/pan/receipt Sun May 12 07:10:04 2024 +0100 +++ b/pan/receipt Sun May 26 08:12:35 2024 +0000 @@ -6,7 +6,7 @@ SHORT_DESC="A usenet newsreader." MAINTAINER="allan316@gmail.com" LICENSE="GPL2" -WEB_SITE="https://pan.rebelbase.com" +WEB_SITE="http://pan.rebelbase.com" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$WEB_SITE/download/releases/$VERSION/source/$TARBALL" diff -r 47bbbfd2172b -r 82a123e54615 perl-file-sharedir-install/receipt --- a/perl-file-sharedir-install/receipt Sun May 12 07:10:04 2024 +0100 +++ b/perl-file-sharedir-install/receipt Sun May 26 08:12:35 2024 +0000 @@ -11,7 +11,7 @@ SOURCE="File-ShareDir-Install" TARBALL="$SOURCE-$VERSION.tar.gz" -WGET_URL="https://www.cpan.org/authors/id/E/ET/ETHER/$TARBALL" +WGET_URL="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$TARBALL" DEPENDS="perl" BUILD_DEPENDS="perl" diff -r 47bbbfd2172b -r 82a123e54615 perl-term-readkey/receipt --- a/perl-term-readkey/receipt Sun May 12 07:10:04 2024 +0100 +++ b/perl-term-readkey/receipt Sun May 26 08:12:35 2024 +0000 @@ -6,7 +6,7 @@ SHORT_DESC="Perl extension Term::ReadKey." MAINTAINER="slaxemulator@gmail.com" LICENSE="GPL" -WEB_SITE="https://metacpan.org/dist/Term::ReadKey" +WEB_SITE="https://metacpan.org/pod/Term::ReadKey" SOURCE="TermReadKey" TARBALL="$SOURCE-$VERSION.tar.gz" diff -r 47bbbfd2172b -r 82a123e54615 perl-test-warnings/receipt --- a/perl-test-warnings/receipt Sun May 12 07:10:04 2024 +0100 +++ b/perl-test-warnings/receipt Sun May 26 08:12:35 2024 +0000 @@ -1,12 +1,12 @@ # SliTaz package receipt. PACKAGE="perl-test-warnings" -VERSION="0.031" +VERSION="0.033" CATEGORY="development" SHORT_DESC="Perl extension Test::Warnings." MAINTAINER="nneul@neulinger.org" LICENSE="GPL" -WEB_SITE="https://metacpan.org/dist/Test-Warnings" +WEB_SITE="https://metacpan.org/pod/Test::Warnings" REPOLOGY="perl:test-warnings" SOURCE="Test-Warnings" @@ -16,6 +16,7 @@ DEPENDS="perl" BUILD_DEPENDS="perl" +# What is the latest version available today? current_version() { wget -O - $WEB_SITE 2>/dev/null | \ diff -r 47bbbfd2172b -r 82a123e54615 screentest/receipt --- a/screentest/receipt Sun May 12 07:10:04 2024 +0100 +++ b/screentest/receipt Sun May 26 08:12:35 2024 +0000 @@ -7,7 +7,7 @@ MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://tobix.github.io/screentest/" +WEB_SITE="https://tobix.github.io/screentest/" WGET_URL="https://github.com/TobiX/screentest/archive/$VERSION.tar.gz" TAGS="test diagnostic screen" diff -r 47bbbfd2172b -r 82a123e54615 xdelta/receipt --- a/xdelta/receipt Sun May 12 07:10:04 2024 +0100 +++ b/xdelta/receipt Sun May 26 08:12:35 2024 +0000 @@ -7,7 +7,7 @@ MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" TARBALL="$PACKAGE$VERSION.tar.gz" -WEB_SITE="http://xdelta.org/" +WEB_SITE="https://xdelta.org/" WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$PACKAGE/$TARBALL" # What is the latest version available today?