# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1529870365 -7200
# Node ID 2f42ab2912beaa95c79951e8f46a61fbabf1d8b9
# Parent  95605b3559a85167b2b748e2f728e8663626bfb2
Fix floppies/download.php

diff -r 95605b3559a8 -r 2f42ab2912be mirror/floppies/download.php
--- a/mirror/floppies/download.php	Fri Apr 27 11:29:08 2018 +0200
+++ b/mirror/floppies/download.php	Sun Jun 24 21:59:25 2018 +0200
@@ -26,13 +26,17 @@
 		basename($_GET['iso'],".iso").".*".
 		" | cpio -o -H newc | cat - /dev/zero ";
 	if ($_GET['file'] == "md5sum") {
-		$cmd .= "| for i in \$(seq 1 $max); do dd bs=$fdsz ".
-			"count=1 2> /dev/null | md5sum | ".
+		$cmd .= "| for i in \$(seq 1 $max); do dd conv=sync bs=4k ".
+			"count=".($fdsz/4096)." 2> /dev/null | md5sum | ".
 			"sed \"s/-\\\$/\$(printf 'fdiso%02d.img' \$i)/\"; done";
-		download("md5sum", 46 * $max, $cmd);
+		$len = 46 * $max;
+		$cmd .= "; md5sum ".basename($_GET['iso']);
+		$len += strlen(basename($_GET['iso'])) + 35;
+		download("md5sum", $len, $cmd);
 	}
 	else {
-		$cmd .= "| dd bs=".$fdsz." count=1 skip=".($_GET['file'] - 1)." "; 
+		$cmd .= "| dd bs=4k count=".($fdsz/4096)." conv=sync skip=".
+			(($_GET['file'] - 1)*($fdsz/4096))." "; 
 		download(sprintf("fdiso%02d.img",$_GET['file']), $fdsz, $cmd);
 	}
 }
@@ -81,8 +85,9 @@
 for ($i = 1; file_exists("index-$i.0.html") ; $i++);
 while (--$i > 0) {
 	echo "			<li><a href=\"index-$i.0.html\">SliTaz $i.0</a>";
-	if (file_exists("index-loram-".$i.".0.html"))
-		echo "				· <a href=\"index-loram-$i.0.html\">loram</a>";
+	foreach (array("loram","web","mini") as $flavor)
+	    if (file_exists("index-".$flavor."-".$i.".0.html"))
+		echo "				&middot; <a href=\"index-".$flavor."-$i.0.html\">".$flavor."</a>";
 	echo "			</li>\n";
 }
 ?>
@@ -155,24 +160,24 @@
 
 <footer>
 	<div>
-		Copyright © <span class="year"></span>
+		Copyright &copy; <span class="year"></span>
 		<a href="http://www.slitaz.org/">SliTaz</a>
 	</div>
 	<div>
 		Network:
-		<a href="http://scn.slitaz.org/">Community</a> ·
-		<a href="http://doc.slitaz.org/">Doc</a> ·
-		<a href="http://forum.slitaz.org/">Forum</a> ·
-		<a href="http://pkgs.slitaz.org/">Packages</a> ·
-		<a href="http://bugs.slitaz.org">Bugs</a> ·
+		<a href="http://scn.slitaz.org/">Community</a> &middot;
+		<a href="http://doc.slitaz.org/">Doc</a> &middot;
+		<a href="http://forum.slitaz.org/">Forum</a> &middot;
+		<a href="http://pkgs.slitaz.org/">Packages</a> &middot;
+		<a href="http://bugs.slitaz.org">Bugs</a> &middot;
 		<a href="http://hg.slitaz.org/?sort=lastchange">Hg</a>
 	</div>
 	<div>
 		SliTaz @
-		<a href="http://twitter.com/slitaz">Twitter</a> ·
-		<a href="http://www.facebook.com/slitaz">Facebook</a> ·
-		<a href="http://distrowatch.com/slitaz">Distrowatch</a> ·
-		<a href="http://en.wikipedia.org/wiki/SliTaz">Wikipedia</a> ·
+		<a href="http://twitter.com/slitaz">Twitter</a> &middot;
+		<a href="http://www.facebook.com/slitaz">Facebook</a> &middot;
+		<a href="http://distrowatch.com/slitaz">Distrowatch</a> &middot;
+		<a href="http://en.wikipedia.org/wiki/SliTaz">Wikipedia</a> &middot;
 		<a href="http://flattr.com/profile/slitaz">Flattr</a>
 	</div>
 	<img src="/static/qr.png" alt="#" onmouseover="this.title = location.href"
diff -r 95605b3559a8 -r 2f42ab2912be mirror/floppies/floppies
--- a/mirror/floppies/floppies	Fri Apr 27 11:29:08 2018 +0200
+++ b/mirror/floppies/floppies	Sun Jun 24 21:59:25 2018 +0200
@@ -7,9 +7,9 @@
 
 ds()
 {
-	set -- $1 ${2:-512} 512
-	dd count=$((($1*$2)/$3)) bs=$3 2>/dev/null
-	dd count=$(((($1*$2)%$3)/$2)) bs=$2 2>/dev/null
+	set -- $1 ${2:-512}
+	dd count=$((($1*$2)/512)) bs=512 2>/dev/null
+	dd count=$(((($1*$2)%512)/$2)) bs=$2 2>/dev/null
 }
 
 case "$1" in
@@ -17,23 +17,21 @@
 	ds 1
 	ds $(($(rd 0x1F1 1)-1))
 	[ $(rd 0x229 1) -le 128 ] || ds 1
-	[ $(rd 0x228) -ne 0 ] && ds 1 >cmdline$$
+	[ $(rd 0x228) -ne 0 ] && ds 1 >cmd$$
 	ds $(( ($(rd 0x1F4) +31) /32)) ) >kernel
-	if [ $(rd 0x21C) -ne 0 ]; then
-		ds $(( ($(rd 0x21C) +3) /4)) 4 >rootfs
-	elif [ $(rd 0x218) -ne 0 ]; then
+	[ $(rd 0x21C) -ne 0 ] && ds $(( ($(rd 0x21C) +3) /4)) 4 >rootfs ||
+	if [ $(rd 0x218) -ne 0 ]; then
 		n=$(($(rd 0x1EE 2)%512))
 		i=0
+		[ $(rd $n 4 cmd$$) -eq 0 ] && ds 5000 >rootfs ||
 		while [ $(($n % 256)) -lt $(rd 0x1F0 1) ]; do
-			ds $(( ($(rd $n 4 cmdline$$) +3) /4)) 4 >rootfs$i
+			ds $(( ($(rd $n 4 cmd$$) +3) /4)) 4 >rootfs$i
 			n=$(($n+4))
 			i=$(($i+1))
 		done
 	fi
-	if [ -s cmdline$$ ]; then
-		strings <cmdline$$ | sed q >cmdline
-		rm -f cmdline$$
-	fi
+	[ -s cmd$$ ] && strings <cmd$$ | sed q >cmdline
+	rm -f cmd$$
 	;;
 *)	cat <<EOT
 usage: cat fd*.img | $0 extract  or
diff -r 95605b3559a8 -r 2f42ab2912be mirror/floppies/mkfdrolling.sh
--- a/mirror/floppies/mkfdrolling.sh	Fri Apr 27 11:29:08 2018 +0200
+++ b/mirror/floppies/mkfdrolling.sh	Sun Jun 24 21:59:25 2018 +0200
@@ -2,8 +2,10 @@
 
 WD=$(cd $(dirname $0); pwd)
 while read name iso; do
+    [ -d $WD/$name ] || continue
     cd $WD/$name
-    ISO=../../$iso
+    ISO=$(ls -t ../../$iso | sed q)
+    [ -s "$ISO" ] || continue
     if [ ! -s fd001.img ] || [ $ISO -nt fd001.img ]; then
 	rm -f fd* 2> /dev/null
 	taziso $ISO floppyset > /dev/null
@@ -11,24 +13,34 @@
 	mnt=/mnt$$
 	mkdir $mnt
 	mount -o loop,ro $ISO $mnt
-	mtime=$(stat -c %y $mnt/md5sum | sed 's/ .*//')
+	mtime=$(stat -c %y $mnt/md5sum | cut -f1 -d ' ')
+	[ $(date --help 2>&1 | sed '/^BusyB/!d;s/.* v\([^ ]*\).*/\1/;s/\./ /g'\
+		 | awk '{ printf "%d%02d\n",$1,$2 }') -gt 126 ] &&
+		mtime=$(LC_ALL=C date '+%d %B %Y' -d $mtime)
 	set -- $(sed '/ifmem/!d;s/.*ifmem //' $mnt/boot/isolinux/isolinux.cfg \
 		| sed 's|^|echo |;s|\([0-9][0-9]*\) |$((\1/1024))M |g' | sh)
 	umount $mnt
 	rmdir $mnt
-	echo "Built on $mtime, needs up to ${1}b of RAM" > title
-	n=0; x=1; while [ -n "$x" ]; do n=$(($n+2)); eval x=\$$n; done
-	n=$((($n - 2) / 2))
-	cat > description.html <<EOT
+		cat > description.html <<EOT
+<p>This floppy set uses the BIOS instead of the linux driver. You can boot
+SliTaz using unsupported floppy drives such as some PCMCIA devices.</p>
+EOT
+	if [ -z "$1" ]; then
+		echo "Built on $mtime" > title
+	else
+		echo "Built on $mtime, needs up to ${1}b of RAM" > title
+		n=0; x=1; while [ -n "$x" ]; do n=$(($n+2)); eval x=\$$n; done
+		n=$((($n - 2) / 2))
+		cat >> description.html <<EOT
 <p>You can start with one of the $n following flavors:</p>
 
 <ul>
 EOT
-	i=0
-	while [ $i -lt $n ]; do
-		eval flavor=\$$((($n - $i)*2))
-		eval ram=\$$((($n - $i)*2 -1))
-		cat >> description.html <<EOT
+		i=0
+		while [ $i -lt $n ]; do
+			eval flavor=\$$((($n - $i)*2))
+			eval ram=\$$((($n - $i)*2 -1))
+			cat >> description.html <<EOT
 	<li><b>$flavor</b> needs ${ram}B of RAM and $(ls fd* | \
 		awk "/fd$(($i+1))/{q=1}{if(!q)n++}END{print n}") floppies:
 		<tt>fd001.img</tt> to <tt>$(ls -r fd${i}* | sed q)</tt>.<br>
@@ -39,12 +51,13 @@
 gtkonly the minimum SliTaz distribution subset with GTK+ support
 core the default SliTaz distribution
 EOT
-		).</li>
+	).</li>
 EOT
-		i=$(($i+1))
-	done
+			i=$(($i+1))
+		done
+		echo "</ul>" >> description.html
+	fi
 	cat >> description.html <<EOT
-</ul>
 
 <p>Start your computer with <tt>fd001.img</tt>. It will show the kernel version
 string and the kernel cmdline line. You can edit the cmdline. Most users can
@@ -53,6 +66,8 @@
 <p>The floppy is then loaded into memory (one dot each 64KB) and you will be
 prompted to insert the next floppy, <tt>fd002.img</tt>. And so on up to last
 floppy.</p>
+EOT
+	[ -n "$1" ] && cat >> description.html <<EOT
 
 <p>You will be prompted to insert extra floppies for the next flavors.
 You can bypass this by using B to boot without loading extra floppies.</p>
@@ -63,4 +78,5 @@
 done <<EOT
 rolling		iso/rolling/slitaz-rolling.iso
 loram-rolling	iso/rolling/slitaz-rolling-loram.iso
+next		iso/next/slitaz-next-*.iso
 EOT
diff -r 95605b3559a8 -r 2f42ab2912be mirror/floppies/mkindex.sh
--- a/mirror/floppies/mkindex.sh	Fri Apr 27 11:29:08 2018 +0200
+++ b/mirror/floppies/mkindex.sh	Sun Jun 24 21:59:25 2018 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 list_version() {
-	ls rolling ?.0 -dr | \
+	ls rolling next ?.0 -dr | \
 	while read dir; do
 		echo $dir
 		[ -d loram-$dir ] && echo loram-$dir
@@ -21,6 +21,7 @@
 		web*)	TYPE="&nbsp;web" ;;
 		mini*)	TYPE="&nbsp;mini" ;;
 		loram*)	TYPE="&nbsp;loram" ;;
+		next*)	TYPE="&nbsp;next" ;;
 		*)	TYPE=""
 	esac
 	TITLE="Floppy image set"
@@ -70,7 +71,7 @@
 list_version | \
 while read dir; do
 	case "$dir" in
-	*-*)
+	*-*|next)
 		echo -n "					<li>"
 		text="${dir/-/ }";;
 	*)
@@ -83,7 +84,7 @@
 	echo "						>$text</a>"
 
 	case "$dir" in
-	*-*)
+	*-*|next)
 		echo "					</li>";;
 	*)
 		echo "						<ul>"
@@ -123,9 +124,10 @@
 list_version | \
 while read dir; do
 	case "$dir" in
-	web*)	echo -en "\n				· <a href=\"index-$dir.html\">web</a>" ;;
-	mini*)	echo -en "\n				· <a href=\"index-$dir.html\">mini</a>" ;;
-	loram*)	echo -en "\n				· <a href=\"index-$dir.html\">loram</a>" ;;
+	web*)	echo -en "\n				&middot; <a href=\"index-$dir.html\">web</a>" ;;
+	mini*)	echo -en "\n				&middot; <a href=\"index-$dir.html\">mini</a>" ;;
+	loram*)	echo -en "\n				&middot; <a href=\"index-$dir.html\">loram</a>" ;;
+	next*)	echo -en "\n				&middot; <a href=\"index-$dir.html\">next</a>" ;;
 	*)   	echo -en "$tail			<li><a href=\"index-$dir.html\">SliTaz $dir</a>" ;;
 	esac
 	tail="</li>\n"
@@ -171,7 +173,7 @@
 
 <pre># dd if=fd001.img of=/dev/fd0</pre>
 
-<p>If you have a CD-ROM, an USB port and an USB key or a network card, but you
+<p>If you have a CD-ROM, a USB port and a USB key or a network card, but you
 can't boot these devices directly, then try <a
 href="http://mirror.slitaz.org/boot/floppy-grub4dos" target="_blank"
 >floppy-grub4dos</a> first. This 1.44Mb floppy provides tiny programs to boot
@@ -259,24 +261,24 @@
 
 <footer>
 	<div>
-		Copyright © <span class="year"></span>
+		Copyright &copy; <span class="year"></span>
 		<a href="http://www.slitaz.org/">SliTaz</a>
 	</div>
 	<div>
 		Network:
-		<a href="http://scn.slitaz.org/">Community</a> ·
-		<a href="http://doc.slitaz.org/">Doc</a> ·
-		<a href="http://forum.slitaz.org/">Forum</a> ·
-		<a href="http://pkgs.slitaz.org/">Packages</a> ·
-		<a href="http://bugs.slitaz.org">Bugs</a> ·
+		<a href="http://scn.slitaz.org/">Community</a> &middot;
+		<a href="http://doc.slitaz.org/">Doc</a> &middot;
+		<a href="http://forum.slitaz.org/">Forum</a> &middot;
+		<a href="http://pkgs.slitaz.org/">Packages</a> &middot;
+		<a href="http://bugs.slitaz.org">Bugs</a> &middot;
 		<a href="http://hg.slitaz.org/?sort=lastchange">Hg</a>
 	</div>
 	<div>
 		SliTaz @
-		<a href="http://twitter.com/slitaz">Twitter</a> ·
-		<a href="http://www.facebook.com/slitaz">Facebook</a> ·
-		<a href="http://distrowatch.com/slitaz">Distrowatch</a> ·
-		<a href="http://en.wikipedia.org/wiki/SliTaz">Wikipedia</a> ·
+		<a href="http://twitter.com/slitaz">Twitter</a> &middot;
+		<a href="http://www.facebook.com/slitaz">Facebook</a> &middot;
+		<a href="http://distrowatch.com/slitaz">Distrowatch</a> &middot;
+		<a href="http://en.wikipedia.org/wiki/SliTaz">Wikipedia</a> &middot;
 		<a href="http://flattr.com/profile/slitaz">Flattr</a>
 	</div>
 	<img src="/static/qr.png" alt="#" onmouseover="this.title = location.href"