# HG changeset patch # User Pascal Bellard # Date 1716739516 0 # Node ID 65c2646b484d41f577d30bd4bd6694c52e394b45 # Parent 82a123e546150dde35523f66cbacc416fc4c9af6 Up redis (7.2.5) diff -r 82a123e54615 -r 65c2646b484d BootProg/stuff/boot16.asm --- a/BootProg/stuff/boot16.asm Sun May 26 08:12:35 2024 +0000 +++ b/BootProg/stuff/boot16.asm Sun May 26 16:05:16 2024 +0000 @@ -161,7 +161,7 @@ ;; How much RAM is there? ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;; - int 12h ; get conventional memory size (in KBs) + int 12h ; get conventional memory size (in KBs) %if AnyWhere call here here: @@ -171,7 +171,7 @@ pop ds %endif mov cx, 106h - shl ax, cl ; and convert it to 16-byte paragraphs + shl ax, cl ; and convert it to 16-byte paragraphs ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Reserve memory for the boot sector and its stack ;; @@ -188,13 +188,14 @@ xor di, di %if AnyWhere == 0 - mov si, 7C00h + mov si, 7C02h ; exclude DriveNumber mov ds, di %endif push es - mov [si(DriveNumber)], dx ; store BIOS boot drive number cld - rep movsw ; move 512 bytes (+ 12) + xchg ax, dx + stosw ; store BIOS boot drive number + rep movsw ; move 512 bytes (+ 12), no double prefix: 8088 bug ;;;;;;;;;;;;;;;;;;;;;; ;; Jump to the copy ;; diff -r 82a123e54615 -r 65c2646b484d BootProg/stuff/boot32.asm --- a/BootProg/stuff/boot32.asm Sun May 26 08:12:35 2024 +0000 +++ b/BootProg/stuff/boot32.asm Sun May 26 16:05:16 2024 +0000 @@ -100,7 +100,7 @@ SectorOf512Bytes equ 0 ; -4 bytes Always2FATs equ 0 ; -4 bytes WaitForKey equ 0 ; +5 bytes -AnyWhere equ 1 ; +4 bytes +AnyWhere equ 1 ; +3 bytes [BITS 16] [CPU 386] @@ -175,24 +175,22 @@ ;; How much RAM is there? ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;; - int 12h ; get conventional memory size (in KBs) + int 12h ; get conventional memory size (in KBs) %if AnyWhere call here here: pop si - sub si, here - boot - push cs - pop ds + sub si, here - boot - 2 ; exclude DriveNumber %endif - dec ax ; reserve 1K bytes for the code and the stack + dec ax ; reserve 1K bytes for the code and the stack mov cx, 106h - shl ax, cl ; and convert it to 16-byte paragraphs + shl ax, cl ; and convert it to 16-byte paragraphs ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Reserve memory for the boot sector and its stack ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - mov es, ax ; cs:0 = ds:0 = ss:0 -> top - 512 - StackSize + mov es, ax ; cs:0 = ds:0 = ss:0 -> top - 512 - StackSize %if ExtraBootSector == 0 mov ss, ax mov sp, 512+StackSize ; bytes 0-511 are reserved for the boot code @@ -204,13 +202,18 @@ xor di, di %if AnyWhere == 0 - mov si, 7C00h + mov si, 7C02h ; exclude DriveNumber mov ds, di %endif push es - mov [si(DriveNumber)], dx ; store BIOS boot drive number cld - rep movsw ; move 512 bytes (+ 12) + xchg ax, dx + stosw ; store BIOS boot drive number +%if AnyWhere + rep cs movsw ; move 512 bytes (+ 12) +%else + rep movsw ; move 512 bytes (+ 12) +%endif ;;;;;;;;;;;;;;;;;;;;;; ;; Jump to the copy ;; @@ -225,11 +228,11 @@ %if ExtraBootSector != 0 %macro MovedCode 0 -%endif main: -%if ExtraBootSector != 0 add al, 32 push ax +%else +main: %endif ;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Get drive parameters ;; diff -r 82a123e54615 -r 65c2646b484d BootProg/stuff/bootex.asm --- a/BootProg/stuff/bootex.asm Sun May 26 08:12:35 2024 +0000 +++ b/BootProg/stuff/bootex.asm Sun May 26 16:05:16 2024 +0000 @@ -142,18 +142,18 @@ ;; How much RAM is there? ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;; - int 12h ; get conventional memory size (in KBs) + int 12h ; get conventional memory size (in KBs) %if AnyWhere call start2 here: %macro BootAnyWhere 0 start2: pop si - sub si, here - boot + sub si, here - boot - 2 ; exclude DriveNumber %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 + dec ax ; reserve 1K bytes for the code and the stack + shl ax, cl ; and convert it to 16-byte paragraphs ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Reserve memory for the boot sector and its stack ;; @@ -169,30 +169,37 @@ xor di, di %if AnyWhere == 0 - mov si, 7C00h + mov si, 7C02h ; exclude DriveNumber mov ds, di %endif push es cld + xchg ax, dx + stosw ; store BIOS boot drive number +%if AnyWhere + rep cs movsw ; move 512 bytes (+ 12) +%else + rep movsw ; move 512 bytes (+ 12) +%endif ;;;;;;;;;;;;;;;;;;;;;; ;; 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) +%if AnyWhere push byte main retf %endm +%else + push word main + retf %endif %if CheckLBAsupport != 0 %macro BootFileName 0 main: + push cs + pop ds mov ah, 41h ; clobbers AX, BX, CX, DH mov bx, 55AAh int 13h @@ -204,13 +211,11 @@ xor cx, cx %else main: -%endif push cs pop ds - +%endif xor ebx, ebx - mov [bx(DriveNumber)], dx ; store BIOS boot drive number mov esi, [bx(bpbRootDirCluster)] ; esi=cluster # of root dir push byte ImageLoadSeg diff -r 82a123e54615 -r 65c2646b484d hatari/receipt --- a/hatari/receipt Sun May 26 08:12:35 2024 +0000 +++ b/hatari/receipt Sun May 26 16:05:16 2024 +0000 @@ -8,17 +8,18 @@ LICENSE="GPL2" WEB_SITE="https://github.com/hatari/hatari" -TARBALL="$PACKAGE-$VERSION.tar.bz2" -WGET_URL="https://download.tuxfamily.org/$PACKAGE/$VERSION/$TARBALL" +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="https://github.com/hatari/hatari/archive/refs/tags/v$VERSION.tar.gz" DEPENDS="libdb libpng libsdl2 portaudio py3k readline zlib" BUILD_DEPENDS="cmake libpng-dev libsdl2-dev portaudio-dev py3k-dev readline-dev udev-dev xorg-dev zlib-dev" +# What is the latest version available today? current_version() { - wget -O - http://download.tuxfamily.org/$PACKAGE 2>/dev/null | \ - sed "/href=\"[0-9]/!d;s|.*href=\"\\(.*\\)/\".*|\\1|" | sort -Vr | sed q + wget -O - ${WGET_URL%/arch*}/tags 2>/dev/null | \ + sed '/tag\//!d;s|.*tag/v*||;s|".*||;q' } # Rules to configure and make the package. diff -r 82a123e54615 -r 65c2646b484d homebank/receipt --- a/homebank/receipt Sun May 26 08:12:35 2024 +0000 +++ b/homebank/receipt Sun May 26 16:05:16 2024 +0000 @@ -7,7 +7,7 @@ MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="https://www.gethomebank.org/en/index.php" +WEB_SITE="https://launchpad.net/homebank" WGET_URL="https://download.tuxfamily.org/slitaz/sources/packages-cooking/${TARBALL:0:1}/$TARBALL" TAGS="office finance" diff -r 82a123e54615 -r 65c2646b484d libev/receipt --- a/libev/receipt Sun May 26 08:12:35 2024 +0000 +++ b/libev/receipt Sun May 26 16:05:16 2024 +0000 @@ -9,7 +9,7 @@ WEB_SITE="http://software.schmorp.de/pkg/libev.html" TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="http://dist.schmorp.de/libev/$TARBALL" +WGET_URL="http://dist.schmorp.de/libev/Attic/$TARBALL" HOST_ARCH="i486 arm" diff -r 82a123e54615 -r 65c2646b484d redis/receipt --- a/redis/receipt Sun May 26 08:12:35 2024 +0000 +++ b/redis/receipt Sun May 26 16:05:16 2024 +0000 @@ -1,24 +1,25 @@ # SliTaz package receipt. PACKAGE="redis" -VERSION="7.2.4" +VERSION="7.2.5" CATEGORY="database" TAGS="database" SHORT_DESC="An open source, BSD licensed, advanced key-value cache and store." MAINTAINER="nneul@neulinger.org" LICENSE="BSD" -WEB_SITE="https://redis.io/" +WEB_SITE="https://github.com/redis/redis" TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="https://download.redis.io/releases/$TARBALL" +WGET_URL="https://github.com/redis/redis/archive/refs/tags/$VERSION.tar.gz" DEPENDS="gcc83-lib-base libatomic libxslt" BUILD_DEPENDS="gcc83 libatomic libxslt-dev" +# What is the latest version available today? current_version() { - wget -O - $(dirname $WGET_URL) 2>/dev/null | \ - sed "/$PACKAGE-[0-9]/!d;/tar/!d;s|.*>$PACKAGE-||;s|.t.*||" | sort -Vr | sed 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.