# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1639239411 0
# Node ID 4e5765b0f66e32a65cbbd3e4dee4d63f4df6ca8a
# Parent  352993bf2f20cae544b834fa497b31e42e5ed46a
rsync: lz4 & zstd support

diff -r 352993bf2f20 -r 4e5765b0f66e linld/stuff/src/_BEG.ASM
--- a/linld/stuff/src/_BEG.ASM	Wed Dec 08 09:15:20 2021 +0100
+++ b/linld/stuff/src/_BEG.ASM	Sat Dec 11 16:16:51 2021 +0000
@@ -271,7 +271,7 @@
 		inc	ax
 		cpuid			; again cause of Nasty EMM386s
 		push	eax
-		shr	edx,1+26	; test bit 26 (sse2), clear bit 29 (lm)
+		shr	edx,1+26	; test bit 26 (sse2), clear bit 29 (tm/lm confusion)
 		jnc	baseInfo
 		else
 		jne	@@no_cpuid	; CPUID feature bit changed ?
diff -r 352993bf2f20 -r 4e5765b0f66e memtest/stuff/unlzma.S
--- a/memtest/stuff/unlzma.S	Wed Dec 08 09:15:20 2021 +0100
+++ b/memtest/stuff/unlzma.S	Sat Dec 11 16:16:51 2021 +0000
@@ -107,6 +107,7 @@
  
 	mov	$ws1, CX
 #ifdef ONLY8086
+	.arch	i8086
 	movw	$2048/2, %ax
 lzd1:
 	pushw	%ax
@@ -213,9 +214,13 @@
 	add	BX, DX
 #endif
 
+#if PROP_LC == 0 && PROP_LP == 0
+	mov	$1846, AX
+#else
 	movb	$3, %ah
 	mul	BX		// dx = 3*bh
 	add	$1846, AX
+#endif
 
 //       int symbol = 1;
 
diff -r 352993bf2f20 -r 4e5765b0f66e rsync/receipt
--- a/rsync/receipt	Wed Dec 08 09:15:20 2021 +0100
+++ b/rsync/receipt	Sat Dec 11 16:16:51 2021 +0000
@@ -14,8 +14,9 @@
 TAGS="sync copy secure"
 HOST_ARCH="i486 arm"
 
-DEPENDS="popt attr acl xxhash-lib"
-BUILD_DEPENDS="popt-dev attr-dev acl-dev xxhash-dev"
+DEPENDS="popt attr acl xxhash-lib lz4-lib zstd"
+BUILD_DEPENDS="popt-dev attr-dev acl-dev xxhash-dev lz4-dev zstd-dev"
+SUGGESTED="bash openssl"
 
 # TazPanel
 TAZPANEL_DAEMON="man::rsync|help::rsync|edit|options|web::$WEB_SITE"
@@ -35,8 +36,6 @@
 		--disable-iconv \
 		--disable-iconv-open \
 		--disable-openssl \
-		--disable-zstd \
-		--disable-lz4 \
 		$CONFIGURE_ARGS
 	sed -i  -e 's/HAVE_ICONV_H ./HAVE_ICONV_H 0/' \
 		-e 's/HAVE_ICONV_OPEN ./HAVE_ICONV_OPEN 0/' config.h
diff -r 352993bf2f20 -r 4e5765b0f66e syslinux/stuff/iso2exe/iso2exe.sh
--- a/syslinux/stuff/iso2exe/iso2exe.sh	Wed Dec 08 09:15:20 2021 +0100
+++ b/syslinux/stuff/iso2exe/iso2exe.sh	Sat Dec 11 16:16:51 2021 +0000
@@ -43,7 +43,7 @@
 	TMP=/tmp/iso2exe$$
 	mkdir -p $TMP/mnt
 	mount -o loop,ro $1 $TMP/mnt
-	if [ $2 = --array ] || grep -qs rootfs $TMP/mnt/boot/isolinux/isolinux.cfg ; then
+	if [ "$2" = "--array" ] || grep -qs rootfs $TMP/mnt/boot/isolinux/isolinux.cfg ; then
 		$0 --get rootfs.gz > $TMP/rootfs.gz
 		SIZE=$(wc -c < $TMP/rootfs.gz)
 		store 24 $SIZE $1
@@ -109,7 +109,7 @@
 	mount -o loop,ro $1 /tmp/mnt$$
 	if [ -s /tmp/mnt$$/boot/linld.com ]; then
 		i=$(($(get 20 $1)-0xC0))
-		store $(($i-6)) $(($(stat -m /tmp/mnt$$/boot/linld.com | sed q)*2048)) $1 32
+		store $(($i-6)) $(($(busybox stat -m /tmp/mnt$$/boot/linld.com | sed q)*2048)) $1 32
 		store $(($i-2)) $(stat -c %s /tmp/mnt$$/boot/linld.com) $1
 		r="$(sed '/rootfs[0-9]/!d;s|.* initrd=||;s|/boot/||g;s| .*||' \
 			/tmp/mnt$$/boot/isolinux/isolinux.cfg | tail -n1)"
@@ -235,7 +235,7 @@
 			f=$((0x$(od -An -N 4 -j $(($o+8)) -t x1 "$1" | sed 's/ //g')))
 			l=$((0x$(od -An -N 4 -j $(($o+0x54)) -t x1 "$1" | sed 's/ //g')))
 			printf " $i:%08X  %08X  %s\n" $f $l \
-			"$(ddq bs=1 skip=$(($o+16)) count=32 if="$1")"
+			"$(ddq bs=1 skip=$(($o+16)) count=32 if="$1" | strings -n 1)"
 			o=$(($o+2048))
 			i=$(($i+1))
 		done