# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1550828705 -3600
# Node ID fcd3d43eadad35c6a12f4455fae33f53a132b657
# Parent  c914135fdee1b2fbc3b04d3a99b07dbbf0cba264
Update some WEB_SITE

diff -r c914135fdee1 -r fcd3d43eadad astromenace/receipt
--- a/astromenace/receipt	Thu Feb 21 17:41:22 2019 +0100
+++ b/astromenace/receipt	Fri Feb 22 10:45:05 2019 +0100
@@ -8,7 +8,7 @@
 LICENSE="GPLv3"
 TARBALL="$PACKAGE-src-$VERSION.tar.bz2"
 
-WEB_SITE="https://viewizard.com/astromenace/index_linux.php"
+WEB_SITE="https://viewizard.com/"
 WGET_URL="$SF_MIRROR/openastromenace/$TARBALL"
 
 TAGS="arcade game shooting space"
diff -r c914135fdee1 -r fcd3d43eadad hfsprogs/receipt
--- a/hfsprogs/receipt	Thu Feb 21 17:41:22 2019 +0100
+++ b/hfsprogs/receipt	Fri Feb 22 10:45:05 2019 +0100
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="APLS"
 TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
-WEB_SITE="https://www.opensource.apple.com/darwinsource/10.4/"
+WEB_SITE="https://opensource.apple.com/"
 WGET_URL="http://http.debian.net/debian/pool/main/h/hfsprogs/$TARBALL"
 EXTRA_SOURCE_FILES="${PACKAGE}_$VERSION-11.debian.tar.gz"
 
diff -r c914135fdee1 -r fcd3d43eadad openmotif-demo/receipt
--- a/openmotif-demo/receipt	Thu Feb 21 17:41:22 2019 +0100
+++ b/openmotif-demo/receipt	Fri Feb 22 10:45:05 2019 +0100
@@ -6,7 +6,7 @@
 SHORT_DESC="source code version of Motif under a public license, demo files."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
-WEB_SITE="https://www.motifzone.org/"
+WEB_SITE="http://www.motifzone.org/"
 WANTED="openmotif"
 
 DEPENDS="openmotif openmotif-dev"
diff -r c914135fdee1 -r fcd3d43eadad openmotif-dev/receipt
--- a/openmotif-dev/receipt	Thu Feb 21 17:41:22 2019 +0100
+++ b/openmotif-dev/receipt	Fri Feb 22 10:45:05 2019 +0100
@@ -6,7 +6,7 @@
 SHORT_DESC="source code version of Motif under a public license, development files."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
-WEB_SITE="https://www.motifzone.org/"
+WEB_SITE="http://www.motifzone.org/"
 WANTED="openmotif"
 
 DEPENDS="openmotif util-linux-uuid xorg-printproto"
diff -r c914135fdee1 -r fcd3d43eadad openmotif-man/receipt
--- a/openmotif-man/receipt	Thu Feb 21 17:41:22 2019 +0100
+++ b/openmotif-man/receipt	Fri Feb 22 10:45:05 2019 +0100
@@ -6,7 +6,7 @@
 SHORT_DESC="source code version of Motif under a public license, manual pages."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
-WEB_SITE="https://www.motifzone.org/"
+WEB_SITE="http://www.motifzone.org/"
 WANTED="openmotif"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r c914135fdee1 -r fcd3d43eadad openmotif/receipt
--- a/openmotif/receipt	Thu Feb 21 17:41:22 2019 +0100
+++ b/openmotif/receipt	Fri Feb 22 10:45:05 2019 +0100
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://www.motifzone.org/"
+WEB_SITE="http://www.motifzone.org/"
 WGET_URL="${WEB_SITE}files/public_downloads/$PACKAGE/${VERSION%.*}/$VERSION/$TARBALL"
 
 DEPENDS="xorg fontconfig expat freetype jpeg libpng xorg-libXp xorg-libXft"
diff -r c914135fdee1 -r fcd3d43eadad python-lxml/receipt
--- a/python-lxml/receipt	Thu Feb 21 17:41:22 2019 +0100
+++ b/python-lxml/receipt	Fri Feb 22 10:45:05 2019 +0100
@@ -8,7 +8,7 @@
 LICENSE="BSD GPL PSL"
 SOURCE="lxml"
 TARBALL="$SOURCE-$VERSION.tgz"
-WEB_SITE="https://codespeak.net/lxml/"
+WEB_SITE="https://pypi.org/project/lxml/"
 WGET_URL="${WEB_SITE}${TARBALL}"
 
 DEPENDS="python libxml2 libxslt zlib"
diff -r c914135fdee1 -r fcd3d43eadad syslinux/stuff/iso2exe/iso2exe.sh
--- a/syslinux/stuff/iso2exe/iso2exe.sh	Thu Feb 21 17:41:22 2019 +0100
+++ b/syslinux/stuff/iso2exe/iso2exe.sh	Fri Feb 22 10:45:05 2019 +0100
@@ -8,6 +8,7 @@
 store()
 {
 	local i
+	local n
 	n=$2; for i in $(seq 8 8 ${4:-16}); do
 		printf '\\\\x%02X' $(($n & 255))
 		n=$(($n >> 8))
@@ -83,36 +84,29 @@
 add_win32exe()
 {
 	SIZE=$($0 --get win32.exe 2> /dev/null | tee /tmp/exe$$ | wc -c)
-	[ -n "$gpt" ] && SIZE=$(($SIZE+1024))
-	[ -n "$mac" ] && SIZE=$(($SIZE+3072))
+	[ -n "$gpt" ] && n=1536 || n=512
+	SIZE=$(($SIZE+$n))
 	printf "Adding WIN32 file at %04X (%d bytes) ...\n" 0 $SIZE
-	ddq if=/tmp/exe$$ of=$1 conv=notrunc
-	if [ -n "$gpt" ]; then
-		printf "Adding GPT at %04X (1024 bytes) ...\n" 512
-		ddq if=$2 bs=512 skip=1 of=$1 seek=1 conv=notrunc
-		i=3; [ -n "$mac" ] && i=9
-		ddq if=/tmp/exe$$ bs=512 skip=1 of=$1 seek=$i conv=notrunc
-		OFS=$((512*($i-1)))
-		for i in 18C 1B4 1DC ; do	# always 3 UPX sections
-			store $((0x$i)) $(($OFS + $(get 0x$i $1))) $1
-		done
-	fi
+	[ -n "$gpt" ] && printf "Adding GPT at %04X (1024 bytes) ...\n" 512
+	for i in $(seq 396 40 $((356+$(get 0x86 /tmp/exe$$)*40))); do
+		x=$(($n + $(get $i /tmp/exe$$)))
+		store $(($i)) $x /tmp/exe$$	### section offset
+	done
+	cut=$((0x98+$(get 0x94 /tmp/exe$$)))	### end of header
+	store $((0x94)) $(($n + $cut - 0x98)) /tmp/exe$$
+	ddq if=/tmp/exe$$ of=$1 conv=notrunc bs=1 count=$cut
+	ddq if=/tmp/exe$$ of=$1 conv=notrunc bs=1 skip=$cut seek=$(($n+$cut))
 	printf "Adding bootiso head at %04X...\n" 0
 	$0 --get bootiso.bin 2> /dev/null > /tmp/exe$$
-	ddq if=/tmp/exe$$ of=$1 bs=128 count=1 conv=notrunc
-	store $((0x94)) $((0xE0 - 12*8)) $1
-	store $((0xF4)) $((16 - 12)) $1
-	ddq if=$1 of=/tmp/coff$$ bs=1 skip=$((0x178)) count=$((0x88))
-	ddq if=/tmp/coff$$ of=$1 conv=notrunc bs=1 seek=$((0x178 - 12*8))
+	ddq if=/tmp/exe$$ of=$1 bs=128 count=1 conv=notrunc	### DOS stub
 	ddq if=/tmp/exe$$ of=$1 bs=1 count=24 seek=$((0x1A0)) skip=$((0x1A0)) conv=notrunc
 	ddq if=$2 bs=1 skip=$((0x1B8)) seek=$((0x1B8)) count=72 of=$1 conv=notrunc
 	store 510 $((0xAA55)) $1
 	i=$SIZE; OFS=$(($SIZE+512))
-	[ -n "$mac" ] && OFS=$SIZE && i=1536
-	store 417 $(($i/512)) $1 8
+	store 417 $(($i/512)) $1 8	### isolinux boot sector
 	printf "Moving syslinux hybrid boot record at %04X (512 bytes) ...\n" $i
 	ddq if=$2 bs=1 count=512 of=$1 seek=$i conv=notrunc
-	if [ $(get $((0x7C00)) /tmp/exe$$) -eq 60905 ]; then
+	if [ $(get $((0x7C00)) /tmp/exe$$) -eq 60905 ]; then	# partition boot code
 		ddq if=/tmp/exe$$ bs=1 count=66 skip=$((0x7DBE)) of=$1 seek=$(($i + 0x1BE)) conv=notrunc
 		ddq if=$1 bs=1 count=3 skip=$i of=$1 seek=$(($i + 0x1BE)) conv=notrunc
 		ddq if=/tmp/exe$$ bs=1 count=3 skip=$((0x7C00)) of=$1 seek=$i conv=notrunc
@@ -317,7 +311,7 @@
 $(tar cf - ${@/init/rootfs.gz} | compress | uuencode -m -)
 EOT
 EOM
-	sed -i '/^case/,/^esac/d' $0
+	sed -i 's|[ \t]*###.*||;/^case/,/^esac/d' $0
 	exit ;;
 --get)
 	cat $2
diff -r c914135fdee1 -r fcd3d43eadad xlockmore/receipt
--- a/xlockmore/receipt	Thu Feb 21 17:41:22 2019 +0100
+++ b/xlockmore/receipt	Fri Feb 22 10:45:05 2019 +0100
@@ -1,14 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="xlockmore"
-VERSION="5.40"
+VERSION="5.56"
 CATEGORY="utilities"
 SHORT_DESC="X Window System Lock Screen."
 MAINTAINER="rocky@slitaz.org"
 LICENSE="BSD"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://www.tux.org/~bagleyd/xlockmore.html"
-WGET_URL="https://www.tux.org/~bagleyd/xlock/$PACKAGE-$VERSION/$TARBALL"
+TARBALL="$PACKAGE-$VERSION.tar.xz"
+WEB_SITE="http://sillycycle.com/xlockmore.html"
+WGET_URL="http://sillycycle.com/xlock/$TARBALL"
 
 DEPENDS="xorg-libX11 freetype freetype1"
 BUILD_DEPENDS="xorg-libXdmcp-dev xorg-libXpm-dev xorg-libX11-dev \