# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1626253444 0
# Node ID eb617e43dc082a13703ff449b62b2355aa726d9d
# Parent  8da769e5f6c39861c7d08eaa82430aa41b92af14
Fix ctorrent-dnh & tfttest

diff -r 8da769e5f6c3 -r eb617e43dc08 base-tiny/receipt
--- a/base-tiny/receipt	Sat May 08 17:23:19 2021 +0000
+++ b/base-tiny/receipt	Wed Jul 14 09:04:04 2021 +0000
@@ -14,7 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	for i in $CONFIG_FILES ; do
+	for i in $CONFIG_FILES /var/run /var/log ; do
 		[ -e $stuff$i ] && echo ${i#/}
 	done | ( cd $stuff ; cpio -o -H newc ) | ( cd $fs ; cpio -id )
 }
diff -r 8da769e5f6c3 -r eb617e43dc08 busybox-net/receipt
--- a/busybox-net/receipt	Sat May 08 17:23:19 2021 +0000
+++ b/busybox-net/receipt	Wed Jul 14 09:04:04 2021 +0000
@@ -9,7 +9,7 @@
 LICENSE="GPL2"
 [ -n "$TARGET" ] || TARGET="i486"
 DEPENDS="busybox"
-BUILD_DEPENDS="bzip2 uclibc-cross-compiler-$TARGET wget advancecomp"
+BUILD_DEPENDS="bzip2 uclibc-cross-compiler-$TARGET wget"
 TARBALL="busybox-$VERSION.tar.bz2"
 WEB_SITE="http://www.busybox.net/"
 WGET_URL="https://git.busybox.net/busybox/snapshot/busybox-$GIT_TAG.tar.bz2"
@@ -37,8 +37,6 @@
     [ $(. $WOK/linux/receipt; printf "%d%02d%02d" ${VERSION//./ }) -le 20626 ] &&
     	echo apply 0001-mdev-create-devices-from-sys-dev.patch &&
 	patch -p1 -R < $stuff/0001-mdev-create-devices-from-sys-dev.patch
-    [ "$(which advdef)" ] &&
-	sed -i 's|^cmd_gzip.*|& \&\& advdef -z4 $@|' scripts/Makefile.lib
     cp $stuff/$PACKAGE-git.config .config
     var="CONFIG_CROSS_COMPILER_PREFIX"
     sed -i "s/.*$var.*/$var=\"uclibc-$TARGET-\"/" .config
@@ -75,19 +73,19 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir $fs/boot $fs/bin $fs/sbin
-    cp -a $WOK/base-tiny/stuff/. $fs/
-    sed -i -e 's| *#.*$||' -e '/^$/d' $fs/etc/services
+    mkdir -p $fs/boot $fs/bin $fs/sbin $fs/etc/init.d
+    sed -e 's| *#.*$||' -e '/^$/d' < $stuff/services > $fs/etc/services
     cp -a $src/_install/bin/busybox $fs/bin
     for i in /bin/sh /bin/login /bin/false /sbin/mdev /init ; do
 	ln -f $fs/bin/busybox $fs$i
     done
-    sed '/hostname/{Nd}' -i $fs/etc/init.d/network.sh
 	
     # Busybox config files.
     touch $fs/etc/resolv.conf
     cp $stuff/inetd.conf $fs/etc
+    cp $stuff/network.conf $fs/etc
     cp $stuff/daemon $fs/etc/init.d
+    cp $stuff/network.sh $fs/etc/init.d
     for i in crond dnsd ftpd httpd inetd klogd ntpd syslogd telnetd tftpd \
 	     udhcpd zcip ; do
 	grep -qi config_$i=y $src/.config &&
@@ -98,10 +96,8 @@
     cp $stuff/udhcp.script $fs/usr/share/udhcpc/default.script
     chmod +x $fs/usr/share/udhcpc/default.script
 	
-    sed -i '2,$s/^#.*//;/^$/d' $fs/etc/init.d/rc* $fs/etc/init.d/daemon \
-	$fs/etc/init.d/*.sh
-    sed -i 's/^#.*//;/^$/d' $fs/etc/*.conf $fs/etc/*tab \
-	$fs/etc/profile $fs/etc/securetty $fs/etc/shells
+    sed -i '2,$s/^#.*//;/^$/d' $fs/etc/init.d/daemon $fs/etc/init.d/*.sh
+    sed -i 's/^#.*//;/^$/d' $fs/etc/*.conf
     find $fs -exec touch -r $fs {} \;
     cp $stuff/busybox-net-git.config $fs/boot/config-busybox
 }
@@ -149,6 +145,40 @@
 EOT
 }
 
+config_note()
+{
+	cat <<EOT
+<script type="text/javascript">
+function update_form()
+{
+	var hide = true
+	for (var i = 0; i < document.forms.length; i++) {
+		for (var j = 0; j < document.forms[i].elements.length; j++) {
+			var obj = document.forms[i].elements[j]
+			if (obj.name == "MODE" && obj.value == "STATIC")
+				hide = false
+		}
+	}	
+	for (var i = 0; i < document.forms.length; i++) {
+		for (var j = 0; j < document.forms[i].elements.length; j++) {
+			var obj = document.forms[i].elements[j]
+			switch (obj.name) {
+			case "IP" :
+			case "NETMASK" :
+			case "GATEWAY" :
+			case "DNS_SERVER" :
+				obj.disabled = hide; break;
+			}
+		}
+	}	
+}
+update_form()
+window.onchange = update_form
+//-->
+</script>
+EOT
+}
+
 post_install()
 {
 	sed -i 's|local.sh|network.sh &|' $1/etc/rcS.conf
diff -r 8da769e5f6c3 -r eb617e43dc08 busybox-net/stuff/daemon
--- a/busybox-net/stuff/daemon	Sat May 08 17:23:19 2021 +0000
+++ b/busybox-net/stuff/daemon	Wed Jul 14 09:04:04 2021 +0000
@@ -9,7 +9,7 @@
 
 NAME=$(basename $0)
 DESC="$NAME deamon"
-DAEMON=$(which $NAME || echo $NAME)
+DAEMON=$NAME
 eval $(grep -i ^${NAME}_OPTIONS /etc/daemons.conf | sed 's/.*_OPT/OPT/')
 PIDFILE=/var/run/$NAME.pid
 
@@ -47,7 +47,7 @@
     fi
     echo -n "Starting $DESC: $NAME... "
     $DAEMON $OPTIONS 
-    [ -f $PIDFILE ] || ps ax | sed "/$NAME/!d;/etc\/init/d;s| .*||" > $PIDFILE
+    [ -f $PIDFILE ] || ps | sed "/$NAME/!d;/etc\/init/d;s| .*||" > $PIDFILE
     active_pidfile $PIDFILE $NAME
     status
     ;;
@@ -73,7 +73,7 @@
     kill `cat $PIDFILE`
     sleep 2
     $DAEMON $OPTIONS
-    [ -f $PIDFILE ] || ps ax | sed "/$NAME/!d;/etc\/init/d;s| .*||" > $PIDFILE
+    [ -f $PIDFILE ] || ps | sed "/$NAME/!d;/etc\/init/d;s| .*||" > $PIDFILE
     active_pidfile $PIDFILE $NAME
     status
     ;;
diff -r 8da769e5f6c3 -r eb617e43dc08 busybox-net/stuff/network.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/busybox-net/stuff/network.conf	Wed Jul 14 09:04:04 2021 +0000
@@ -0,0 +1,24 @@
+# /etc/network.conf: SliTaz system wide networking configuration.
+# Config file used by: /etc/init.d/network.sh
+#
+
+# Set default interface.
+INTERFACE="eth0"
+
+# Dynamic IP address.
+# Enable/disable DHCP client at boot time.
+DHCP="no"
+
+# Static IP address.
+# Enable/disable static IP at boot time.
+STATIC="yes"
+
+# Set IP address and netmask for a static IP.
+IP="192.168.0.6"
+NETMASK="255.255.255.0"
+
+# Set route gateway for a static IP.
+GATEWAY="192.168.0.1"
+
+# Set DNS server for a static IP.
+DNS_SERVER="192.168.0.1"
diff -r 8da769e5f6c3 -r eb617e43dc08 busybox-net/stuff/network.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/busybox-net/stuff/network.sh	Wed Jul 14 09:04:04 2021 +0000
@@ -0,0 +1,54 @@
+#!/bin/sh
+# /etc/init.d/network.sh - Network initialization boot script.
+# Config file is: /etc/network.conf
+#
+. /etc/init.d/rc.functions
+. /etc/network.conf
+
+# Stopping everything
+Stop() {
+	echo "Stopping all interfaces"
+	ifconfig $INTERFACE down
+
+	echo "Killing all daemons"
+	killall udhcpc
+
+}
+
+Start() {
+	ifconfig $INTERFACE up
+	if [ "$DHCP" = "yes" ] ; then
+		echo "Starting udhcpc client on: $INTERFACE..."
+		udhcpc -b -T 1 -A 12 -i $INTERFACE -p \
+		/var/run/udhcpc.$INTERFACE.pid
+	fi
+	if [ "$STATIC" = "yes" ] ; then
+		echo "Configuring static IP on $INTERFACE: $IP..."
+		ifconfig $INTERFACE $IP netmask $NETMASK up
+		route add default gateway $GATEWAY
+		# Multi-DNS server in $DNS_SERVER.
+		mv /etc/resolv.conf /tmp/resolv.conf.$$
+		for NS in $DNS_SERVER
+		do
+			echo "nameserver $NS" >> /etc/resolv.conf
+		done
+		for HELPER in /etc/ipup.d/*; do
+			[ -x $HELPER ] && $HELPER $INTERFACE $DNS_SERVER
+		done
+	fi
+}
+
+# looking for arguments:
+case $1 in
+'')
+	ifconfig lo 127.0.0.1 up
+	route add 127.0.0.1 lo
+	Start ;;
+start)
+	Start ;;
+stop)
+	Stop ;;
+restart)
+	Stop
+	Start ;;
+esac
diff -r 8da769e5f6c3 -r eb617e43dc08 busybox-net/stuff/services
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/busybox-net/stuff/services	Wed Jul 14 09:04:04 2021 +0000
@@ -0,0 +1,317 @@
+# /etc/services:
+# $Id: services,v 1.4 2000/01/23 21:03:36 notting Exp $
+#
+# Network services, Internet style
+#
+# Note that it is presently the policy of IANA to assign a single well-known
+# port number for both TCP and UDP; hence, most entries here have two entries
+# even if the protocol doesn't support UDP operations.
+# Updated from RFC 1700, ``Assigned Numbers'' (October 1994).  Not all ports
+# are included, only the more common ones.
+
+tcpmux		1/tcp				# TCP port service multiplexer
+echo		7/tcp
+echo		7/udp
+discard		9/tcp		sink null
+discard		9/udp		sink null
+systat		11/tcp		users
+daytime		13/tcp
+daytime		13/udp
+netstat		15/tcp
+qotd		17/tcp		quote
+msp		18/tcp				# message send protocol
+msp		18/udp				# message send protocol
+chargen		19/tcp		ttytst source
+chargen		19/udp		ttytst source
+ftp-data	20/tcp
+ftp		21/tcp
+fsp		21/udp		fspd
+ssh		22/tcp				# SSH Remote Login Protocol
+ssh		22/udp				# SSH Remote Login Protocol
+telnet		23/tcp
+# 24 - private
+smtp		25/tcp		mail
+# 26 - unassigned
+time		37/tcp		timserver
+time		37/udp		timserver
+rlp		39/udp		resource	# resource location
+nameserver	42/tcp		name		# IEN 116
+whois		43/tcp		nicname
+re-mail-ck	50/tcp				# Remote Mail Checking Protocol
+re-mail-ck	50/udp				# Remote Mail Checking Protocol
+domain		53/tcp		nameserver	# name-domain server
+domain		53/udp		nameserver
+mtp		57/tcp				# deprecated
+bootps		67/tcp				# BOOTP server
+bootps		67/udp
+bootpc		68/tcp				# BOOTP client
+bootpc		68/udp
+tftp		69/udp
+gopher		70/tcp				# Internet Gopher
+gopher		70/udp
+rje		77/tcp		netrjs
+finger		79/tcp
+www		80/tcp		http		# WorldWideWeb HTTP
+www		80/udp				# HyperText Transfer Protocol
+link		87/tcp		ttylink
+kerberos	88/tcp		kerberos5 krb5	# Kerberos v5
+kerberos	88/udp		kerberos5 krb5	# Kerberos v5
+supdup		95/tcp
+# 100 - reserved
+hostnames	101/tcp		hostname	# usually from sri-nic
+iso-tsap	102/tcp		tsap		# part of ISODE.
+csnet-ns	105/tcp		cso-ns		# also used by CSO name server
+csnet-ns	105/udp		cso-ns
+# unfortunately the poppassd (Eudora) uses a port which has already
+# been assigned to a different service. We list the poppassd as an
+# alias here. This should work for programs asking for this service.
+# (due to a bug in inetd the 3com-tsmux line is disabled)
+#3com-tsmux	106/tcp		poppassd
+#3com-tsmux	106/udp		poppassd
+rtelnet		107/tcp				# Remote Telnet
+rtelnet		107/udp
+pop2		109/tcp		pop-2	postoffice	# POP version 2
+pop2		109/udp		pop-2
+pop3		110/tcp		pop-3		# POP version 3
+pop3		110/udp		pop-3
+sunrpc		111/tcp		portmapper	# RPC 4.0 portmapper TCP
+sunrpc		111/udp		portmapper	# RPC 4.0 portmapper UDP
+auth		113/tcp		authentication tap ident
+sftp		115/tcp
+uucp-path	117/tcp
+nntp		119/tcp		readnews untp	# USENET News Transfer Protocol
+ntp		123/tcp
+ntp		123/udp				# Network Time Protocol
+netbios-ns	137/tcp				# NETBIOS Name Service
+netbios-ns	137/udp
+netbios-dgm	138/tcp				# NETBIOS Datagram Service
+netbios-dgm	138/udp
+netbios-ssn	139/tcp				# NETBIOS session service
+netbios-ssn	139/udp
+imap2		143/tcp		imap		# Interim Mail Access Proto v2
+imap2		143/udp		imap
+snmp		161/udp				# Simple Net Mgmt Proto
+snmp-trap	162/udp		snmptrap	# Traps for SNMP
+cmip-man	163/tcp				# ISO mgmt over IP (CMOT)
+cmip-man	163/udp
+cmip-agent	164/tcp
+cmip-agent	164/udp
+xdmcp		177/tcp				# X Display Mgr. Control Proto
+xdmcp		177/udp
+nextstep	178/tcp		NeXTStep NextStep	# NeXTStep window
+nextstep	178/udp		NeXTStep NextStep	# server
+bgp		179/tcp				# Border Gateway Proto.
+bgp		179/udp
+prospero	191/tcp				# Cliff Neuman's Prospero
+prospero	191/udp
+irc		194/tcp				# Internet Relay Chat
+irc		194/udp
+smux		199/tcp				# SNMP Unix Multiplexer
+smux		199/udp
+at-rtmp		201/tcp				# AppleTalk routing
+at-rtmp		201/udp
+at-nbp		202/tcp				# AppleTalk name binding
+at-nbp		202/udp
+at-echo		204/tcp				# AppleTalk echo
+at-echo		204/udp
+at-zis		206/tcp				# AppleTalk zone information
+at-zis		206/udp
+qmtp		209/tcp				# The Quick Mail Transfer Protocol
+qmtp		209/udp				# The Quick Mail Transfer Protocol
+z3950		210/tcp		wais		# NISO Z39.50 database
+z3950		210/udp		wais
+ipx		213/tcp				# IPX
+ipx		213/udp
+imap3		220/tcp				# Interactive Mail Access
+imap3		220/udp				# Protocol v3
+rpc2portmap	369/tcp
+rpc2portmap	369/udp				# Coda portmapper
+codaauth2	370/tcp
+codaauth2	370/udp				# Coda authentication server
+ulistserv	372/tcp				# UNIX Listserv
+ulistserv	372/udp
+ldap            389/tcp    			# Lightweight Directory Access Protocol
+ldap            389/udp    			# Lightweight Directory Access Protocol
+https		443/tcp				# MCom
+https		443/udp				# MCom
+snpp		444/tcp				# Simple Network Paging Protocol
+snpp		444/udp				# Simple Network Paging Protocol
+saft		487/tcp				# Simple Asynchronous File Transfer
+saft		487/udp				# Simple Asynchronous File Transfer
+npmp-local	610/tcp		dqs313_qmaster	# npmp-local / DQS
+npmp-local	610/udp		dqs313_qmaster	# npmp-local / DQS
+npmp-gui	611/tcp		dqs313_execd	# npmp-gui / DQS
+npmp-gui	611/udp		dqs313_execd	# npmp-gui / DQS
+hmmp-ind	612/tcp		dqs313_intercell# HMMP Indication / DQS
+hmmp-ind	612/udp		dqs313_intercell# HMMP Indication / DQS
+#
+# UNIX specific services
+#
+exec		512/tcp
+biff		512/udp		comsat
+login		513/tcp
+who		513/udp		whod
+shell		514/tcp		cmd		# no passwords used
+syslog		514/udp
+printer		515/tcp		spooler		# line printer spooler
+talk		517/udp
+ntalk		518/udp
+route		520/udp		router routed	# RIP
+timed		525/udp		timeserver
+tempo		526/tcp		newdate
+courier		530/tcp		rpc
+conference	531/tcp		chat
+netnews		532/tcp		readnews
+netwall		533/udp				# -for emergency broadcasts
+uucp		540/tcp		uucpd		# uucp daemon
+afpovertcp	548/tcp				# AFP over TCP
+afpovertcp	548/udp				# AFP over TCP
+remotefs	556/tcp		rfs_server rfs	# Brunhoff remote filesystem
+klogin		543/tcp				# Kerberized `rlogin' (v5)
+kshell		544/tcp		krcmd		# Kerberized `rsh' (v5)
+kerberos-adm	749/tcp				# Kerberos `kadmin' (v5)
+#
+webster		765/tcp				# Network dictionary
+webster		765/udp
+swat		901/tcp				# Samba Web Administration Tool
+#
+# From ``Assigned Numbers'':
+#
+#> The Registered Ports are not controlled by the IANA and on most systems
+#> can be used by ordinary user processes or programs executed by ordinary
+#> users.
+#
+#> Ports are used in the TCP [45,106] to name the ends of logical
+#> connections which carry long term conversations.  For the purpose of
+#> providing services to unknown callers, a service contact port is
+#> defined.  This list specifies the port used by the server process as its
+#> contact port.  While the IANA can not control uses of these ports it
+#> does register or list uses of these ports as a convienence to the
+#> community.
+#
+ingreslock	1524/tcp
+ingreslock	1524/udp
+prospero-np	1525/tcp			# Prospero non-privileged
+prospero-np	1525/udp
+datametrics	1645/tcp	old-radius	# datametrics / old radius entry
+datametrics	1645/udp	old-radius	# datametrics / old radius entry
+sa-msg-port	1646/tcp	old-radacct	# sa-msg-port / old radacct entry
+sa-msg-port	1646/udp	old-radacct	# sa-msg-port / old radacct entry
+radius		1812/tcp			# Radius
+radius		1812/udp			# Radius
+radacct		1813/tcp			# Radius Accounting
+radacct		1813/udp			# Radius Accounting
+cvspserver	2401/tcp			# CVS client/server operations
+cvspserver	2401/udp			# CVS client/server operations
+venus		2430/tcp			# codacon port
+venus		2430/udp			# Venus callback/wbc interface
+venus-se	2431/tcp			# tcp side effects
+venus-se	2431/udp			# udp sftp side effect
+codasrv		2432/tcp			# not used
+codasrv		2432/udp			# server port
+codasrv-se	2433/tcp			# tcp side effects
+codasrv-se	2433/udp			# udp sftp side effect
+mysql		3306/tcp			# MySQL
+mysql		3306/udp			# MySQL
+rfe		5002/tcp			# Radio Free Ethernet
+rfe		5002/udp			# Actually uses UDP only
+cfengine	5308/tcp			# CFengine
+cfengine	5308/udp			# CFengine
+bbs		7000/tcp			# BBS service
+#
+#
+# Kerberos (Project Athena/MIT) services
+# Note that these are for Kerberos v4, and are unofficial.  Sites running
+# v4 should uncomment these and comment out the v5 entries above.
+#
+kerberos4	750/udp		kerberos-iv kdc	# Kerberos (server) udp
+kerberos4	750/tcp		kerberos-iv kdc	# Kerberos (server) tcp
+kerberos_master	751/udp				# Kerberos authentication
+kerberos_master	751/tcp				# Kerberos authentication
+passwd_server	752/udp				# Kerberos passwd server
+krb_prop	754/tcp				# Kerberos slave propagation
+krbupdate	760/tcp		kreg		# Kerberos registration
+kpasswd		761/tcp		kpwd		# Kerberos "passwd"
+kpop		1109/tcp			# Pop with Kerberos
+knetd		2053/tcp			# Kerberos de-multiplexor
+zephyr-srv	2102/udp			# Zephyr server
+zephyr-clt	2103/udp			# Zephyr serv-hm connection
+zephyr-hm	2104/udp			# Zephyr hostmanager
+eklogin		2105/tcp			# Kerberos encrypted rlogin
+#
+# Unofficial but necessary (for NetBSD) services
+#
+supfilesrv	871/tcp				# SUP server
+supfiledbg	1127/tcp			# SUP debugging
+#
+# Datagram Delivery Protocol services
+#
+rtmp		1/ddp				# Routing Table Maintenance Protocol
+nbp		2/ddp				# Name Binding Protocol
+echo		4/ddp				# AppleTalk Echo Protocol
+zip		6/ddp				# Zone Information Protocol
+#
+# Services added for the Debian GNU/Linux distribution
+poppassd	106/tcp				# Eudora
+poppassd	106/udp				# Eudora
+mailq		174/tcp				# Mailer transport queue for Zmailer
+mailq		174/udp				# Mailer transport queue for Zmailer
+ssmtp		465/tcp				# SMTP over SSL
+gdomap		538/tcp				# GNUstep distributed objects
+gdomap		538/udp				# GNUstep distributed objects
+snews		563/tcp				# NNTP over SSL
+ssl-ldap	636/tcp				# LDAP over SSL
+omirr		808/tcp		omirrd		# online mirror
+omirr		808/udp		omirrd		# online mirror
+rsync		873/tcp				# rsync
+rsync		873/udp				# rsync
+simap	 	993/tcp				# IMAP over SSL
+spop3		995/tcp				# POP-3 over SSL
+socks		1080/tcp			# socks proxy server
+socks		1080/udp			# socks proxy server
+rmtcfg		1236/tcp			# Gracilis Packeten remote config server
+xtel		1313/tcp			# french minitel
+support		1529/tcp			# GNATS
+cfinger		2003/tcp			# GNU Finger
+ninstall	2150/tcp			# ninstall service
+ninstall	2150/udp			# ninstall service
+afbackup	2988/tcp			# Afbackup system
+afbackup	2988/udp			# Afbackup system
+icp		3130/tcp			# Internet Cache Protocol (Squid)
+icp		3130/udp			# Internet Cache Protocol (Squid)
+postgres	5432/tcp			# POSTGRES
+postgres	5432/udp			# POSTGRES
+fax		4557/tcp			# FAX transmission service        (old)
+hylafax		4559/tcp			# HylaFAX client-server protocol  (new)
+noclog		5354/tcp			# noclogd with TCP (nocol)
+noclog		5354/udp			# noclogd with UDP (nocol)
+hostmon		5355/tcp			# hostmon uses TCP (nocol)
+hostmon		5355/udp			# hostmon uses TCP (nocol)
+ircd		6667/tcp			# Internet Relay Chat
+ircd		6667/udp			# Internet Relay Chat
+webcache	8080/tcp			# WWW caching service
+webcache	8080/udp			# WWW caching service
+tproxy		8081/tcp			# Transparent Proxy
+tproxy		8081/udp			# Transparent Proxy
+mandelspawn	9359/udp	mandelbrot	# network mandelbrot
+amanda		10080/udp			# amanda backup services
+kamanda		10081/tcp			# amanda backup services (Kerberos)
+kamanda		10081/udp			# amanda backup services (Kerberos)
+amandaidx	10082/tcp			# amanda backup services
+amidxtape	10083/tcp			# amanda backup services
+isdnlog		20011/tcp			# isdn logging system
+isdnlog		20011/udp			# isdn logging system
+vboxd		20012/tcp			# voice box system
+vboxd		20012/udp			# voice box system
+binkp		24554/tcp			# Binkley
+binkp		24554/udp			# Binkley
+asp		27374/tcp			# Address Search Protocol
+asp		27374/udp			# Address Search Protocol
+tfido		60177/tcp			# Ifmail
+tfido		60177/udp			# Ifmail
+fido		60179/tcp			# Ifmail
+fido		60179/udp			# Ifmail
+
+# Local services
+
+linuxconf	98/tcp
diff -r 8da769e5f6c3 -r eb617e43dc08 busybox/receipt
--- a/busybox/receipt	Sat May 08 17:23:19 2021 +0000
+++ b/busybox/receipt	Wed Jul 14 09:04:04 2021 +0000
@@ -13,6 +13,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.busybox.net/"
 WGET_URL="https://git.busybox.net/busybox/snapshot/busybox-$GIT_TAG.tar.bz2"
+CONFIG_FILES="/etc/rcS.conf /etc/hostname /etc/fstab /etc/init.d/local.sh"
 AUTO_SELECTION="always"
 
 apply_bb_patchs()
@@ -159,13 +160,13 @@
 fi
 EOT
 	[ "$STUPID" ] && cat >> $1/boot/mkrootfs.pre_exec <<EOT
-for i in boot/bzImage boot/memtest boot/ipxe; do
+for i in boot/bzImage boot/memtest boot/ipxe boot/plop boot/x86test; do
 	[ -s \$i ] || continue
 	dd if=\$i bs=512 count=1 | \\
 	sed "s|\$(echo -en '\x64\x66\x8F\x47\x78')|\$(echo -en '\x5E\x5E\x90\x90\x90')|" | \\
 	sed "s|\$(echo -en '\x66\x8F\x47\x78')|\$(echo -en '\x5E\x5E\x90\x90')|" | \\
 	sed "s|\$(echo -en '\x77\x02\xB0\x01')|\$(echo -en '\x90\x90\xB0\x01')|" | \\
-	sed "s|\$(echo -en '\x98\xCD\x13')|\$(echo -en '\x89\x90\x90')|" | \\
+	sed "s|\$(echo -en '\x98\xCD\x13')|\$(echo -en '\x98\x90\x90')|" | \\
 	sed "s|\$(echo -en '\x60\xCD\x13')|\$(echo -en '\x60\x90\x90')|" | \\
 	sed "s|\$(echo -en '\xB0\x31\x1C\x03\xB4\x0E')|\$(echo -en '\xB0\x31\x14\xFD\xB4\x0E')|" | \\
 	dd of=\$i conv=notrunc
diff -r 8da769e5f6c3 -r eb617e43dc08 busybox/stuff/busybox-git.config
--- a/busybox/stuff/busybox-git.config	Sat May 08 17:23:19 2021 +0000
+++ b/busybox/stuff/busybox-git.config	Wed Jul 14 09:04:04 2021 +0000
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.28.0.git
-# Thu Feb 27 11:00:06 2020
+# Tue Jul 13 06:01:18 2021
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -97,7 +97,7 @@
 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
 # CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
 # CONFIG_FEATURE_REVERSE_SEARCH is not set
-# CONFIG_FEATURE_TAB_COMPLETION is not set
+CONFIG_FEATURE_TAB_COMPLETION=y
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
 # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
diff -r 8da769e5f6c3 -r eb617e43dc08 busybox/stuff/daemon
--- a/busybox/stuff/daemon	Sat May 08 17:23:19 2021 +0000
+++ b/busybox/stuff/daemon	Wed Jul 14 09:04:04 2021 +0000
@@ -9,7 +9,7 @@
 
 NAME=$(basename $0)
 DESC="$NAME deamon"
-DAEMON=$(which $NAME || echo $NAME)
+DAEMON=$NAME
 eval $(grep -i ^${NAME}_OPTIONS /etc/daemons.conf | sed 's/.*_OPT/OPT/')
 PIDFILE=/var/run/$NAME.pid
 
@@ -22,7 +22,7 @@
     echo -n "Starting $DESC: $NAME... "
     $DAEMON $OPTIONS 
     [ -f $PIDFILE ] ||
-    ps ax | grep $NAME | grep -v etc/init | cut -d ' ' -f1 > $PIDFILE
+    ps | grep $NAME | grep -v etc/init | cut -d ' ' -f1 > $PIDFILE
     active_pidfile $PIDFILE $NAME
     status
     ;;
@@ -45,7 +45,7 @@
     sleep 2
     $DAEMON $OPTIONS
     [ -f $PIDFILE ] ||
-    ps ax | grep $NAME | grep -v etc/init | cut -d ' ' -f1 > $PIDFILE
+    ps | grep $NAME | grep -v etc/init | cut -d ' ' -f1 > $PIDFILE
     active_pidfile $PIDFILE $NAME
     status
     ;;
diff -r 8da769e5f6c3 -r eb617e43dc08 ctorrent-dnh/receipt
--- a/ctorrent-dnh/receipt	Sat May 08 17:23:19 2021 +0000
+++ b/ctorrent-dnh/receipt	Wed Jul 14 09:04:04 2021 +0000
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 [ -n "$TARGET" ] || TARGET="i486"
-DEPENDS="busybox-net"
+DEPENDS="busybox-net libc++ libm libgcc_s"
 BUILD_DEPENDS="uclibc-cross-compiler-$TARGET"
 TARBALL="${PACKAGE}$VERSION.tar.gz"
 WEB_SITE="http://www.rahul.net/dholmes/ctorrent/"
@@ -20,6 +20,7 @@
 		--prefix=/usr \
 		--with-ssl=no \
 		--host=$TARGET-pc-linux-gnu \
+		CXX=uclibc-$TARGET-c++ \
 		CC=uclibc-$TARGET-cc &&
 	make &&
 	make DESTDIR=$DESTDIR install
diff -r 8da769e5f6c3 -r eb617e43dc08 ipxe/receipt
--- a/ipxe/receipt	Sat May 08 17:23:19 2021 +0000
+++ b/ipxe/receipt	Wed Jul 14 09:04:04 2021 +0000
@@ -3,7 +3,7 @@
 PACKAGE="ipxe"
 VERSION="1.0.0-20160119"
 CATEGORY="system-tools"
-SHORT_DESC="Open source network boot firmware."
+SHORT_DESC="Open source network boot firmware (586+)."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://ipxe.org/"
diff -r 8da769e5f6c3 -r eb617e43dc08 libc++/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libc++/receipt	Wed Jul 14 09:04:04 2021 +0000
@@ -0,0 +1,27 @@
+# SliTaz package receipt.
+
+PACKAGE="libc++"
+VERSION="0.9.31"
+CATEGORY="base-system"
+GROUP="library"
+SHORT_DESC="C++ runtime library"
+MAINTAINER="pascal.bellard@slitaz.org"
+LICENSE="LGPL"
+[ -n "$TARGET" ] || TARGET="i486"
+DEPENDS="base-tiny"
+BUILD_DEPENDS="uclibc-cross-compiler-$TARGET"
+WEB_SITE="http://tiny.slitaz.org/"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	mkdir -p $DESTDIR/lib
+	cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/libuClibc++**.so* $DESTDIR/lib
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cp -a $install/lib $fs/
+	chown 0.0 $fs/lib/*
+}
diff -r 8da769e5f6c3 -r eb617e43dc08 linux/receipt
--- a/linux/receipt	Sat May 08 17:23:19 2021 +0000
+++ b/linux/receipt	Wed Jul 14 09:04:04 2021 +0000
@@ -29,20 +29,28 @@
 	objcopy -O binary $1.o $1.bin
 }
 
+rootfs()
+{
+	[ -s $stuff/root.cpio ] && cp $stuff/root.cpio . &&
+	sed -i 's|CONFIG_INITRAMFS_SOURCE="|&root.cpio|' .config
+}
+
 # Rules to configure and make the package.
 compile_rules()
 {
+	export CFLAGS="-march=i386 -Os -pipe -fomit-frame-pointer"
 	[ -s $SRC/$(basename $PATCH) ] ||
 	wget --no-check-certificate -O $SRC/$(basename $PATCH) $PATCH
-	bzcat $SRC/$(basename $PATCH) | patch -p1
+	bzcat $SRC/$(basename $PATCH) | patch -p1 &&
+	sed '/DEBUG/,/* kstrdup/d' < mm/slab.c > mm/kstrdup.c &&
+	echo 'obj-y += kstrdup.o' >> mm/Makefile
 	patch -p0 < $stuff/linux-2.6.14-unpack.u
 	patch -p0 < $stuff/jsclipboard.u
 	sed -i 's|\([>\.]\)val|\1u.val|;s|\([>\.]\)next|\1u.next|;s|\t};|\t} u;|' \
 		lib/inflate.c
-	sed '/DEBUG/,/* kstrdup/d' < mm/slab.c > mm/kstrdup.c
-	echo 'obj-y += kstrdup.o' >> mm/Makefile
 	sed -i 's|3.1024|11*256|' arch/i386/boot/compressed/misc.c
 	sed -i 's/O_CREAT/&|O_TRUNC/' init/initramfs.c
+	sed -i 's|hostname|echo slitaz|' scripts/mkcompile_h
 	which advdef 2> /dev/null && ! which upx 2> /dev/null &&
 	sed -i 's|gzip)|&\n	advdef -z4 $@|' \
 		usr/Makefile arch/i386/boot/compressed/Makefile
@@ -59,6 +67,7 @@
 	sed -i 's/^config %config:/config:/' Makefile
 	
 	cp $stuff/linux-$VERSION-slitaz.config .config
+	rootfs
 	yes '' | make ARCH=i386 HOSTCC=gcc-2 config
 	make ARCH=i386 CC=gcc-2 HOSTCC=gcc-2 -j 4 bzImage
 	
@@ -69,10 +78,13 @@
 	cp $stuff/bundle .
 	sh ./bundle
 	S2bin cmdline
+	[ $(upx --version 2> /dev/null | sed '/upx/!d;s|upx ||;s|\.||;q')0 -ge 3960 ] &&
+		upx --ultra-brute arch/i386/boot/bzImage
 	cp arch/i386/boot/bzImage arch/i386/boot/bzImage.386
 	cp .config .config.386
 	cp System.map System.map.386
 	cp $stuff/linux-$VERSION-slitaz.config.586 .config
+	rootfs
 	yes '' | make ARCH=i386 HOSTCC=gcc-2 config
 	make ARCH=i386 CC=gcc-2 HOSTCC=gcc-2 -j 4 bzImage
 	which upx 2> /dev/null && upx --ultra-brute arch/i386/boot/bzImage
@@ -82,25 +94,28 @@
 genpkg_rules()
 {
 	mkdir $fs/boot
-	cp -a $src/arch/i386/boot/bzImage* $fs/boot/
-	dd if=$src/bootloader.bin of=$fs/boot/bzImage conv=notrunc
-	dd if=$src/cmdline.bin bs=1 seek=560 of=$fs/boot/bzImage conv=notrunc
 	cp -a $src/pack $fs/boot/
-	cp -a $src/System.map* $fs/boot/
-	cp -a $src/.config $fs/boot/config
-	[ -s $src/.config.386 ] && cp -a $src/.config.386 $fs/boot/config.386
 	cp -a $src/bundle.sh $fs/boot/bundle
+	for i in '' .386 ; do
+		[ -s $src/arch/i386/boot/bzImage$i ] || continue
+		cp -a $src/arch/i386/boot/bzImage$i $fs/boot/
+		dd if=$src/bootloader.bin of=$fs/boot/bzImage$i conv=notrunc
+		dd if=$src/cmdline.bin bs=1 seek=560 of=$fs/boot/bzImage$i conv=notrunc
+		cp -a $src/System.map$i $fs/boot/
+		cp -a $src/.config$i $fs/boot/config$i
+	done
 }
 
 config_form()
 {
 	cat <<EOT
+<p>
+Tune the kernel according to the CPU type
+</p>
 <table>
-<td>Tune the kernel according to the CPU type<td>
-<td>
-<input type="radio" name="CPU586" $([ "$CPU586" = "no" ] && echo "checked=checked ")value="no"> for any CPU starting from 386sx
-<input type="radio" name="CPU586" $([ "$CPU586" != "no" ] && echo "checked=checked ")value="yes"> optimized for pentium or newer CPU
-</td>
+<tr>
+<td><input type="radio" name="CPU586" $([ "$CPU586" = "no" ] && echo "checked=checked ")value="no"> for any CPU starting from 386sx</td>
+<td><input type="radio" name="CPU586" $([ "$CPU586" != "no" ] && echo "checked=checked ")value="yes"> optimized for pentium or newer CPU</td>
 </tr>
 </table>
 EOT
@@ -112,7 +127,6 @@
 	for i in $1/boot/*.386 ; do
 		[ "$CPU586" = "yes" ] && rm -f $i || mv -f $i ${i%.386}
 	done 2> /dev/null
-	rm -f $1/boot/bzImage.noupx
 	[ -s $1/boot/cmdline ] && cat $1/boot/cmdline | sed 's/^ *//' | \
 		dd of=$1/boot/bzImage conv=notrunc bs=1 seek=768 count=3072
 	$1/boot/pack $1/boot/bzImage
diff -r 8da769e5f6c3 -r eb617e43dc08 linux/stuff/bootloader.S
--- a/linux/stuff/bootloader.S	Sat May 08 17:23:19 2021 +0000
+++ b/linux/stuff/bootloader.S	Wed Jul 14 09:04:04 2021 +0000
@@ -47,6 +47,7 @@
 // #define NO_FLOPPY_TABLE_PATCH	remove floppy parameter table patch
 // #define NO_OUTPUT		remove output code
 
+	//.arch	i386,nojumps
 	.code16
 	.org	0
 
@@ -83,21 +84,21 @@
 					# length of bootsect + length of
 					# setup + room for stack;
 					# 12 is disk parm size.
-	pushw	$INITSEG
-	popw	%ss			# %ss contain INITSEG
+	movw	$INITSEG, %ax
+	movw	%ax, %ss		# %ss contain INITSEG
 	movw	%di, %sp		# put stack at INITSEG:stacktop-...
-	pushw	%ss
-	popw	%es			# %es = %ss = INITSEG
-	xorw	%ax, %ax		# %ax = 0
+	movw	%ax, %es		# %es = %ss = INITSEG
+	cbw				# %ax = 0
+	cld
 #ifdef EXE_CMDLINE
 	movw	$zeroed+1, %cx		# clear gdt + offset, %ds, limits, cmdline=""
-	rep				# don't worry about cld
-	stosb				# already done above
+	rep
+	stosb
 	decw	%di
 #else
 	movw	$zeroed/2, %cx		# clear gdt + offset, %ds, limits
-	rep				# don't worry about cld
-	stosw				# already done above
+	rep
+	stosw
 #endif
 	popw	%bx			# offset = 0
 .endm
@@ -205,7 +206,6 @@
 # endif
 #else
 	ldsw	0x78(%bx), %si		# %ds:%bx+0x78 is parameter table address
-	popw	%di
 	pushw	%es
 	pushw	%di
 # ifdef	FLOPPY_CMDLINE
@@ -508,8 +508,12 @@
 
 #ifndef EXE_ONLY
 
-#define FLOPPY_CYLINDERS	80	
-#define FLOPPY_HEADS		2	
+# 720KB 800KB 880KB 1.04MB 1.12MB 1.2MB 1.44MB 1.6MB 1.68MB 1.76MB
+# 1.84MB 1.92MB 2.88MB 3.12MB 3.20MB 3.52MB 3.84MB support
+# do not support 820KB 830KB 1.48MB 1.49MB 1.72MB 1.74MB
+#define FLOPPY_CYLINDERS	80
+# do not support 360KB 410KB 420KB
+#define FLOPPY_HEADS		2
 
 #if defined(MULTI_FLOPPY) && defined(COUNTER)
 .macro	putsmsg
@@ -529,7 +533,6 @@
 #endif
 
 check_limits:
-	popw	%dx
         cmpb    %cl, %al		# max sector known ?
         jbe	next_head		#   no -> store it
         #.byte	0xd6	# SALC		# sector by sector
@@ -556,16 +559,16 @@
 	pushw	%ax			# save context
 	movb	$2, %ah			# cmd: read chs
         int     $0x13
-	popw	%dx			# save %ax
+	popw	%bp			# save %ax
         popw    %ax			# limits
+	popw	%dx
 	jc	check_limits
 	xchgw	%ax, %bp
-	addw	%dx,%cx			# next sector
+	addw	%ax,%cx			# next sector
 	movw	%cx, %gs
-	addb	%dl,%bh
-	addb	%dl,%bh			# next location
-	subw	%dx,%di			# update sector counter
-	popw	%dx
+	addb	%al,%bh
+	addb	%al,%bh			# next location
+	subw	%ax,%di			# update sector counter
 	jz	putcdot
 read_sectors:
 	movw	%gs, %cx
diff -r 8da769e5f6c3 -r eb617e43dc08 linux/stuff/unlzma.S
--- a/linux/stuff/unlzma.S	Sat May 08 17:23:19 2021 +0000
+++ b/linux/stuff/unlzma.S	Wed Jul 14 09:04:04 2021 +0000
@@ -107,6 +107,7 @@
  
 	mov	$ws1, CX
 #ifdef ONLY8086
+	.arch	i8086
 	movw	$2048/2, %ax
 lzd1:
 	pushw	%ax
@@ -195,23 +196,31 @@
 # else
 	shrb	$8-PROP_LC, %bl
 # endif
+#else
+	xor	%bx,%bx
 #endif
 
 #if PROP_LP != 0
 	movb	posState2(BP), %dl
-# ifdef ONLY8086
+# if PROP_LC != 0
+#  ifdef ONLY8086
 	movb	$PROP_LC, %cl
 	shl	%cl, DX
-# else
+#  else
 	shl	$PROP_LC, DX
+#  endif
+	movb	$0, %bh
 # endif
-	movb	$0, %bh
 	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 8da769e5f6c3 -r eb617e43dc08 memtest/receipt
--- a/memtest/receipt	Sat May 08 17:23:19 2021 +0000
+++ b/memtest/receipt	Wed Jul 14 09:04:04 2021 +0000
@@ -13,6 +13,21 @@
 
 BUILD_DEPENDS="xz"
 
+tune_lzma()
+{
+	cp $stuff/*.S $stuff/pack .
+	sed "s/VERSION/$VERSION/;s|lzma1=|&nice=$1,|" -i pack
+	while [ -n "$2" ]; do
+		sed "s|^#define PROP_$2 .*|#define PROP_$2 $3|" -i unlzma.S
+		shift 2
+	done
+	for i in bootloader unpack ; do
+		cc -o $i.o -Wa,-a=$i.lst -c $i.S
+		objcopy -O binary $i.o $i.bin
+	done
+	./pack --build bootloader.bin unpack.bin
+}
+
 # Rules to configure and make the package.
 compile_rules()
 {
@@ -21,14 +36,16 @@
 		patch -p1 < $i
 	done
 	make
-	cp $stuff/*.S $stuff/pack .
-	for i in bootloader unpack ; do
-		cc -o $i.o -Wa,-a=$i.lst -c $i.S
-		objcopy -O binary $i.o $i.bin
-	done
-	sed -i "s/VERSION/$VERSION/" pack
-	./pack --build bootloader.bin unpack.bin
+	tune_lzma 127,mf=bt2 PB 3
 	./pack memtest.bin memtest.packed
+	mv memtest.bin memtest.bin.console
+	sed -i  -e 's/SERIAL_CONSOLE_DEFAULT 0/SERIAL_CONSOLE_DEFAULT 1/' \
+		-e 's/SERIAL_BAUD_RATE 9600/SERIAL_BAUD_RATE 115200/' config.h
+	make clean
+	make
+	tune_lzma 172,mf=bt2 PB 3
+	./pack memtest.bin memtest.packed-115200
+	mv memtest.bin memtest.bin.serial
 } 
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 8da769e5f6c3 -r eb617e43dc08 memtest/stuff/pack
--- a/memtest/stuff/pack	Sat May 08 17:23:19 2021 +0000
+++ b/memtest/stuff/pack	Wed Jul 14 09:04:04 2021 +0000
@@ -45,7 +45,7 @@
 
 compress()
 {
-	xz -z -e --format=raw --lzma1=mf=bt2,lc=$(bits LC),lp=$(bits LP),pb=$(bits PB),nice=127 --stdout 
+	xz -z -e --format=raw --lzma1=lc=$(bits LC),lp=$(bits LP),pb=$(bits PB) --stdout
 }
 
 main()
diff -r 8da769e5f6c3 -r eb617e43dc08 memtest/stuff/unlzma.S
--- a/memtest/stuff/unlzma.S	Sat May 08 17:23:19 2021 +0000
+++ b/memtest/stuff/unlzma.S	Wed Jul 14 09:04:04 2021 +0000
@@ -18,7 +18,7 @@
  * Compression with : lzma e src dst -eos -pb2 -lp0 -lc3
  */
 
-#define PROP_PB 3
+#define PROP_PB 2
 #define PROP_LP 0
 #define PROP_LC 3
 #define PROPS (PROP_LC+(PROP_LP*9)+(PROP_PB*45))
@@ -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 8da769e5f6c3 -r eb617e43dc08 plop/receipt
--- a/plop/receipt	Sat May 08 17:23:19 2021 +0000
+++ b/plop/receipt	Wed Jul 14 09:04:04 2021 +0000
@@ -13,6 +13,21 @@
 
 BUILD_DEPENDS="xz wget"
 
+tune_lzma()
+{
+	cp $stuff/*.S $stuff/pack .
+	sed "s/VERSION/$VERSION/;s|lzma1=|&nice=$1,|" -i pack
+	while [ -n "$2" ]; do
+		sed "s|^#define PROP_$2 .*|#define PROP_$2 $3|" -i unlzma.S
+		shift 2
+	done
+	for i in bootloader unpack ; do
+		cc -o $i.o -Wa,-a=$i.lst -c $i.S
+		objcopy -O binary $i.o $i.bin
+	done
+	./pack --build bootloader.bin unpack.bin
+}
+
 # Rules to configure and make the package.
 compile_rules()
 {
@@ -25,13 +40,7 @@
 0299	01	font=bios
 029A	00	zoomanimation=off
 EOT
-	cp $stuff/*.S $stuff/pack .
-	for i in bootloader unpack ; do
-		cc -o $i.o -Wa,-a=$i.lst -c $i.S
-		objcopy -O binary $i.o $i.bin
-	done
-	sed -i "s/VERSION/$VERSION/" pack
-	./pack --build bootloader.bin unpack.bin
+	tune_lzma 84,mf=bt2 PB 0 LC 0
 	./pack plpbt.bin plop
 }
 
diff -r 8da769e5f6c3 -r eb617e43dc08 plop/stuff/pack
--- a/plop/stuff/pack	Sat May 08 17:23:19 2021 +0000
+++ b/plop/stuff/pack	Wed Jul 14 09:04:04 2021 +0000
@@ -49,7 +49,7 @@
 
 compress()
 {
-	xz -z -e --format=raw --lzma1=mf=bt2,lc=$(bits LC),lp=$(bits LP),pb=$(bits PB),nice=84 --stdout
+	xz -z -e --format=raw --lzma1=lc=$(bits LC),lp=$(bits LP),pb=$(bits PB) --stdout
 }
 
 main()
diff -r 8da769e5f6c3 -r eb617e43dc08 plop/stuff/unlzma.S
--- a/plop/stuff/unlzma.S	Sat May 08 17:23:19 2021 +0000
+++ b/plop/stuff/unlzma.S	Wed Jul 14 09:04:04 2021 +0000
@@ -18,11 +18,9 @@
  * Compression with : lzma e src dst -eos -pb2 -lp0 -lc3
  */
 
-//#define PROP_PB 2
-#define PROP_PB 0
+#define PROP_PB 2
 #define PROP_LP 0
-//#define PROP_LC 3
-#define PROP_LC 0
+#define PROP_LC 3
 #define PROPS (PROP_LC+(PROP_LP*9)+(PROP_PB*45))
 
 // static const Byte *Buffer;
@@ -109,6 +107,7 @@
  
 	mov	$ws1, CX
 #ifdef ONLY8086
+	.arch	i8086
 	movw	$2048/2, %ax
 lzd1:
 	pushw	%ax
@@ -215,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 8da769e5f6c3 -r eb617e43dc08 tfttest/receipt
--- a/tfttest/receipt	Sat May 08 17:23:19 2021 +0000
+++ b/tfttest/receipt	Wed Jul 14 09:04:04 2021 +0000
@@ -20,7 +20,7 @@
 		cc -o $i.o -Wa,-a=$i.lst -c $i.S
 		objcopy -O binary $i.o $i.bin
 	done
-	dd if=TFTTEST.COM of=bootloader.bin bs=16 seek=6 conv=notrunc 2> /dev/null
+	dd if=TFTTEST.COM of=bootloader.bin bs=16 seek=9 conv=notrunc 2> /dev/null
 	umount mnt
 } 
 
@@ -35,5 +35,5 @@
 post_install()
 {
 	grep -qs ^tfttest $1/boot/bootmenu ||
-	echo "tfttest	Tfttest,pixel,tft	Check dead pixels (may run under DOS if renamed to tfttest.com)" >> $1/boot/bootmenu
+	echo "tfttest	Tfttest,pixel,tft	Check pixels" >> $1/boot/bootmenu
 }
diff -r 8da769e5f6c3 -r eb617e43dc08 tfttest/stuff/bootloader.S
--- a/tfttest/stuff/bootloader.S	Sat May 08 17:23:19 2021 +0000
+++ b/tfttest/stuff/bootloader.S	Wed Jul 14 09:04:04 2021 +0000
@@ -5,40 +5,57 @@
 	.globl	_start
 _start:
 	call	start2
+	
+BPB	=	0x3E
+#define TINY_MENU	Tiny SliTaz floppy boot menu
+#ifdef	TINY_MENU
+	.org	BPB-12
+	xchgw	%ax, %di		# 79 58 41 E8
+	popw	%ax
+	incw	%cx
+	call	called
+called:
+	addw	$0x20, %cs:bootseg+0x201	# code at 07C0:0200
+	.org	BPB, 0x90
+#endif
+	
+	.org	BPB
 start2:
-	popw	%bx
-	cmpb	$0x1, %bh
+	popw	%ax
+com_offset	=	0x100
+	cmpw	$com_offset+3, %ax
 	je	dotcom
-	xorw	%ax, %ax		# %ax = 0
-	movw	%ax, %ds
-	leaw	int21-start2(%bx), %ax
-	movw	%ax,0x21*4
-	movw	%cs,0x21*4+2
-	movw	$0x7C0-0x10, %ax
-	movw	%ax, %ds
+	cwd
+int21hook:
+	movb	$int21-_start, %al
+	movw	%dx, %ds
+	movw	%ax, 0x21*4
+	movw	%cs, 0x21*4+2
+bootseg:
+	movw	$0x7C0-com_offset/16, %ax
+	.byte	0x3d			# cmp $0xc88c, %ax
 dotcom:
-	movw	%ds, %ax
-	addw	$6, %ax			# addw $code/16, %ax
+	movw	%cs, %ax
+paragraphs	=	9
+	addw	$paragraphs, %ax
 	movw	%ax, %ds
 	movw	%ax, %es
 	movw	%ax, %ss
 	movw	$0xFFFE, %sp
-	pushw	%ds
-	movw	$0x100, %ax
 	pushw	%ax
-	cbw
-	xorw	%bx, %bx
+	movw	$com_offset, %ax
+	pushw	%ax
+	cbw				# %ax = 0
 	retf
 
 int21:
-	cmpb	$7, %ah
+	subb	$7, %ah
 	jne	not_input
-	movb	$0, %ah
-	int	$0x16
+	int	$0x16			# %ah = 0
 do_iret:
 	iret
 not_input:
-	cmpb	$9, %ah
+	cmpb	$9-7, %ah
 	jne	abort
 	movw	%dx, %si
 puts:
@@ -51,8 +68,8 @@
 	jmp	puts
 abort:
 	ljmp	$0xffff,$0
-	
-	.org	0x60
+
+	.org	paragraphs*16	
 code:
 	.org	510	
 	
diff -r 8da769e5f6c3 -r eb617e43dc08 x86test/receipt
--- a/x86test/receipt	Sat May 08 17:23:19 2021 +0000
+++ b/x86test/receipt	Wed Jul 14 09:04:04 2021 +0000
@@ -11,18 +11,27 @@
 
 BUILD_DEPENDS="xz"
 
+tune_lzma()
+{
+	cp $stuff/*.S $stuff/pack .
+	sed "s/VERSION/$VERSION/;s|lzma1=|&nice=$1,|" -i pack
+	sed -i '/#define ONLY8086/d' unpack.S
+	while [ -n "$2" ]; do
+		sed "s|^#define PROP_$2 .*|#define PROP_$2 $3|" -i unlzma.S
+		shift 2
+	done
+	for i in bootloader unpack ; do
+		cc -o $i.o -Wa,-a=$i.lst -c $i.S
+		objcopy -O binary $i.o $i.bin
+	done
+	./pack --build bootloader.bin unpack.bin
+}
+
 # Rules to configure and make the package.
 compile_rules()
 {
 	mkdir -p $src && cd $src
-	cp $stuff/x86test $stuff/*.S $stuff/pack .
-	sed -i '/#define ONLY8086/d' unpack.S
-	for i in bootloader unpack ; do
-		cc -o $i.o -Wa,-a=$i.lst -c $i.S
-		objcopy -O binary $i.o $i.bin
-	done
-	sed -i "s/VERSION/$VERSION/" pack
-	./pack --build bootloader.bin unpack.bin
+	tune_lzma 36,mf=bt2 PB 0
 	./pack x86test x86test.packed
 	dd if=bootloader.bin of=x86test conv=notrunc 2> /dev/null
 } 
diff -r 8da769e5f6c3 -r eb617e43dc08 x86test/stuff/unlzma.S
--- a/x86test/stuff/unlzma.S	Sat May 08 17:23:19 2021 +0000
+++ b/x86test/stuff/unlzma.S	Wed Jul 14 09:04:04 2021 +0000
@@ -18,7 +18,7 @@
  * Compression with : lzma e src dst -eos -pb2 -lp0 -lc3
  */
 
-#define PROP_PB 0
+#define PROP_PB 2
 #define PROP_LP 0
 #define PROP_LC 3
 #define PROPS (PROP_LC+(PROP_LP*9)+(PROP_PB*45))
@@ -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;