wok-tiny rev 173
Fix ctorrent-dnh & tfttest
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Jul 14 09:04:04 2021 +0000 (2021-07-14) |
parents | 8da769e5f6c3 |
children | 2c80994c5e30 |
files | base-tiny/receipt busybox-net/receipt busybox-net/stuff/daemon busybox-net/stuff/network.conf busybox-net/stuff/network.sh busybox-net/stuff/services busybox/receipt busybox/stuff/busybox-git.config busybox/stuff/daemon ctorrent-dnh/receipt ipxe/receipt libc++/receipt linux/receipt linux/stuff/bootloader.S linux/stuff/unlzma.S memtest/receipt memtest/stuff/pack memtest/stuff/unlzma.S plop/receipt plop/stuff/pack plop/stuff/unlzma.S tfttest/receipt tfttest/stuff/bootloader.S x86test/receipt x86test/stuff/unlzma.S |
line diff
1.1 --- a/base-tiny/receipt Sat May 08 17:23:19 2021 +0000 1.2 +++ b/base-tiny/receipt Wed Jul 14 09:04:04 2021 +0000 1.3 @@ -14,7 +14,7 @@ 1.4 # Rules to gen a SliTaz package suitable for Tazpkg. 1.5 genpkg_rules() 1.6 { 1.7 - for i in $CONFIG_FILES ; do 1.8 + for i in $CONFIG_FILES /var/run /var/log ; do 1.9 [ -e $stuff$i ] && echo ${i#/} 1.10 done | ( cd $stuff ; cpio -o -H newc ) | ( cd $fs ; cpio -id ) 1.11 }
2.1 --- a/busybox-net/receipt Sat May 08 17:23:19 2021 +0000 2.2 +++ b/busybox-net/receipt Wed Jul 14 09:04:04 2021 +0000 2.3 @@ -9,7 +9,7 @@ 2.4 LICENSE="GPL2" 2.5 [ -n "$TARGET" ] || TARGET="i486" 2.6 DEPENDS="busybox" 2.7 -BUILD_DEPENDS="bzip2 uclibc-cross-compiler-$TARGET wget advancecomp" 2.8 +BUILD_DEPENDS="bzip2 uclibc-cross-compiler-$TARGET wget" 2.9 TARBALL="busybox-$VERSION.tar.bz2" 2.10 WEB_SITE="http://www.busybox.net/" 2.11 WGET_URL="https://git.busybox.net/busybox/snapshot/busybox-$GIT_TAG.tar.bz2" 2.12 @@ -37,8 +37,6 @@ 2.13 [ $(. $WOK/linux/receipt; printf "%d%02d%02d" ${VERSION//./ }) -le 20626 ] && 2.14 echo apply 0001-mdev-create-devices-from-sys-dev.patch && 2.15 patch -p1 -R < $stuff/0001-mdev-create-devices-from-sys-dev.patch 2.16 - [ "$(which advdef)" ] && 2.17 - sed -i 's|^cmd_gzip.*|& \&\& advdef -z4 $@|' scripts/Makefile.lib 2.18 cp $stuff/$PACKAGE-git.config .config 2.19 var="CONFIG_CROSS_COMPILER_PREFIX" 2.20 sed -i "s/.*$var.*/$var=\"uclibc-$TARGET-\"/" .config 2.21 @@ -75,19 +73,19 @@ 2.22 # Rules to gen a SliTaz package suitable for Tazpkg. 2.23 genpkg_rules() 2.24 { 2.25 - mkdir $fs/boot $fs/bin $fs/sbin 2.26 - cp -a $WOK/base-tiny/stuff/. $fs/ 2.27 - sed -i -e 's| *#.*$||' -e '/^$/d' $fs/etc/services 2.28 + mkdir -p $fs/boot $fs/bin $fs/sbin $fs/etc/init.d 2.29 + sed -e 's| *#.*$||' -e '/^$/d' < $stuff/services > $fs/etc/services 2.30 cp -a $src/_install/bin/busybox $fs/bin 2.31 for i in /bin/sh /bin/login /bin/false /sbin/mdev /init ; do 2.32 ln -f $fs/bin/busybox $fs$i 2.33 done 2.34 - sed '/hostname/{Nd}' -i $fs/etc/init.d/network.sh 2.35 2.36 # Busybox config files. 2.37 touch $fs/etc/resolv.conf 2.38 cp $stuff/inetd.conf $fs/etc 2.39 + cp $stuff/network.conf $fs/etc 2.40 cp $stuff/daemon $fs/etc/init.d 2.41 + cp $stuff/network.sh $fs/etc/init.d 2.42 for i in crond dnsd ftpd httpd inetd klogd ntpd syslogd telnetd tftpd \ 2.43 udhcpd zcip ; do 2.44 grep -qi config_$i=y $src/.config && 2.45 @@ -98,10 +96,8 @@ 2.46 cp $stuff/udhcp.script $fs/usr/share/udhcpc/default.script 2.47 chmod +x $fs/usr/share/udhcpc/default.script 2.48 2.49 - sed -i '2,$s/^#.*//;/^$/d' $fs/etc/init.d/rc* $fs/etc/init.d/daemon \ 2.50 - $fs/etc/init.d/*.sh 2.51 - sed -i 's/^#.*//;/^$/d' $fs/etc/*.conf $fs/etc/*tab \ 2.52 - $fs/etc/profile $fs/etc/securetty $fs/etc/shells 2.53 + sed -i '2,$s/^#.*//;/^$/d' $fs/etc/init.d/daemon $fs/etc/init.d/*.sh 2.54 + sed -i 's/^#.*//;/^$/d' $fs/etc/*.conf 2.55 find $fs -exec touch -r $fs {} \; 2.56 cp $stuff/busybox-net-git.config $fs/boot/config-busybox 2.57 } 2.58 @@ -149,6 +145,40 @@ 2.59 EOT 2.60 } 2.61 2.62 +config_note() 2.63 +{ 2.64 + cat <<EOT 2.65 +<script type="text/javascript"> 2.66 +function update_form() 2.67 +{ 2.68 + var hide = true 2.69 + for (var i = 0; i < document.forms.length; i++) { 2.70 + for (var j = 0; j < document.forms[i].elements.length; j++) { 2.71 + var obj = document.forms[i].elements[j] 2.72 + if (obj.name == "MODE" && obj.value == "STATIC") 2.73 + hide = false 2.74 + } 2.75 + } 2.76 + for (var i = 0; i < document.forms.length; i++) { 2.77 + for (var j = 0; j < document.forms[i].elements.length; j++) { 2.78 + var obj = document.forms[i].elements[j] 2.79 + switch (obj.name) { 2.80 + case "IP" : 2.81 + case "NETMASK" : 2.82 + case "GATEWAY" : 2.83 + case "DNS_SERVER" : 2.84 + obj.disabled = hide; break; 2.85 + } 2.86 + } 2.87 + } 2.88 +} 2.89 +update_form() 2.90 +window.onchange = update_form 2.91 +//--> 2.92 +</script> 2.93 +EOT 2.94 +} 2.95 + 2.96 post_install() 2.97 { 2.98 sed -i 's|local.sh|network.sh &|' $1/etc/rcS.conf
3.1 --- a/busybox-net/stuff/daemon Sat May 08 17:23:19 2021 +0000 3.2 +++ b/busybox-net/stuff/daemon Wed Jul 14 09:04:04 2021 +0000 3.3 @@ -9,7 +9,7 @@ 3.4 3.5 NAME=$(basename $0) 3.6 DESC="$NAME deamon" 3.7 -DAEMON=$(which $NAME || echo $NAME) 3.8 +DAEMON=$NAME 3.9 eval $(grep -i ^${NAME}_OPTIONS /etc/daemons.conf | sed 's/.*_OPT/OPT/') 3.10 PIDFILE=/var/run/$NAME.pid 3.11 3.12 @@ -47,7 +47,7 @@ 3.13 fi 3.14 echo -n "Starting $DESC: $NAME... " 3.15 $DAEMON $OPTIONS 3.16 - [ -f $PIDFILE ] || ps ax | sed "/$NAME/!d;/etc\/init/d;s| .*||" > $PIDFILE 3.17 + [ -f $PIDFILE ] || ps | sed "/$NAME/!d;/etc\/init/d;s| .*||" > $PIDFILE 3.18 active_pidfile $PIDFILE $NAME 3.19 status 3.20 ;; 3.21 @@ -73,7 +73,7 @@ 3.22 kill `cat $PIDFILE` 3.23 sleep 2 3.24 $DAEMON $OPTIONS 3.25 - [ -f $PIDFILE ] || ps ax | sed "/$NAME/!d;/etc\/init/d;s| .*||" > $PIDFILE 3.26 + [ -f $PIDFILE ] || ps | sed "/$NAME/!d;/etc\/init/d;s| .*||" > $PIDFILE 3.27 active_pidfile $PIDFILE $NAME 3.28 status 3.29 ;;
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/busybox-net/stuff/network.conf Wed Jul 14 09:04:04 2021 +0000 4.3 @@ -0,0 +1,24 @@ 4.4 +# /etc/network.conf: SliTaz system wide networking configuration. 4.5 +# Config file used by: /etc/init.d/network.sh 4.6 +# 4.7 + 4.8 +# Set default interface. 4.9 +INTERFACE="eth0" 4.10 + 4.11 +# Dynamic IP address. 4.12 +# Enable/disable DHCP client at boot time. 4.13 +DHCP="no" 4.14 + 4.15 +# Static IP address. 4.16 +# Enable/disable static IP at boot time. 4.17 +STATIC="yes" 4.18 + 4.19 +# Set IP address and netmask for a static IP. 4.20 +IP="192.168.0.6" 4.21 +NETMASK="255.255.255.0" 4.22 + 4.23 +# Set route gateway for a static IP. 4.24 +GATEWAY="192.168.0.1" 4.25 + 4.26 +# Set DNS server for a static IP. 4.27 +DNS_SERVER="192.168.0.1"
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/busybox-net/stuff/network.sh Wed Jul 14 09:04:04 2021 +0000 5.3 @@ -0,0 +1,54 @@ 5.4 +#!/bin/sh 5.5 +# /etc/init.d/network.sh - Network initialization boot script. 5.6 +# Config file is: /etc/network.conf 5.7 +# 5.8 +. /etc/init.d/rc.functions 5.9 +. /etc/network.conf 5.10 + 5.11 +# Stopping everything 5.12 +Stop() { 5.13 + echo "Stopping all interfaces" 5.14 + ifconfig $INTERFACE down 5.15 + 5.16 + echo "Killing all daemons" 5.17 + killall udhcpc 5.18 + 5.19 +} 5.20 + 5.21 +Start() { 5.22 + ifconfig $INTERFACE up 5.23 + if [ "$DHCP" = "yes" ] ; then 5.24 + echo "Starting udhcpc client on: $INTERFACE..." 5.25 + udhcpc -b -T 1 -A 12 -i $INTERFACE -p \ 5.26 + /var/run/udhcpc.$INTERFACE.pid 5.27 + fi 5.28 + if [ "$STATIC" = "yes" ] ; then 5.29 + echo "Configuring static IP on $INTERFACE: $IP..." 5.30 + ifconfig $INTERFACE $IP netmask $NETMASK up 5.31 + route add default gateway $GATEWAY 5.32 + # Multi-DNS server in $DNS_SERVER. 5.33 + mv /etc/resolv.conf /tmp/resolv.conf.$$ 5.34 + for NS in $DNS_SERVER 5.35 + do 5.36 + echo "nameserver $NS" >> /etc/resolv.conf 5.37 + done 5.38 + for HELPER in /etc/ipup.d/*; do 5.39 + [ -x $HELPER ] && $HELPER $INTERFACE $DNS_SERVER 5.40 + done 5.41 + fi 5.42 +} 5.43 + 5.44 +# looking for arguments: 5.45 +case $1 in 5.46 +'') 5.47 + ifconfig lo 127.0.0.1 up 5.48 + route add 127.0.0.1 lo 5.49 + Start ;; 5.50 +start) 5.51 + Start ;; 5.52 +stop) 5.53 + Stop ;; 5.54 +restart) 5.55 + Stop 5.56 + Start ;; 5.57 +esac
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/busybox-net/stuff/services Wed Jul 14 09:04:04 2021 +0000 6.3 @@ -0,0 +1,317 @@ 6.4 +# /etc/services: 6.5 +# $Id: services,v 1.4 2000/01/23 21:03:36 notting Exp $ 6.6 +# 6.7 +# Network services, Internet style 6.8 +# 6.9 +# Note that it is presently the policy of IANA to assign a single well-known 6.10 +# port number for both TCP and UDP; hence, most entries here have two entries 6.11 +# even if the protocol doesn't support UDP operations. 6.12 +# Updated from RFC 1700, ``Assigned Numbers'' (October 1994). Not all ports 6.13 +# are included, only the more common ones. 6.14 + 6.15 +tcpmux 1/tcp # TCP port service multiplexer 6.16 +echo 7/tcp 6.17 +echo 7/udp 6.18 +discard 9/tcp sink null 6.19 +discard 9/udp sink null 6.20 +systat 11/tcp users 6.21 +daytime 13/tcp 6.22 +daytime 13/udp 6.23 +netstat 15/tcp 6.24 +qotd 17/tcp quote 6.25 +msp 18/tcp # message send protocol 6.26 +msp 18/udp # message send protocol 6.27 +chargen 19/tcp ttytst source 6.28 +chargen 19/udp ttytst source 6.29 +ftp-data 20/tcp 6.30 +ftp 21/tcp 6.31 +fsp 21/udp fspd 6.32 +ssh 22/tcp # SSH Remote Login Protocol 6.33 +ssh 22/udp # SSH Remote Login Protocol 6.34 +telnet 23/tcp 6.35 +# 24 - private 6.36 +smtp 25/tcp mail 6.37 +# 26 - unassigned 6.38 +time 37/tcp timserver 6.39 +time 37/udp timserver 6.40 +rlp 39/udp resource # resource location 6.41 +nameserver 42/tcp name # IEN 116 6.42 +whois 43/tcp nicname 6.43 +re-mail-ck 50/tcp # Remote Mail Checking Protocol 6.44 +re-mail-ck 50/udp # Remote Mail Checking Protocol 6.45 +domain 53/tcp nameserver # name-domain server 6.46 +domain 53/udp nameserver 6.47 +mtp 57/tcp # deprecated 6.48 +bootps 67/tcp # BOOTP server 6.49 +bootps 67/udp 6.50 +bootpc 68/tcp # BOOTP client 6.51 +bootpc 68/udp 6.52 +tftp 69/udp 6.53 +gopher 70/tcp # Internet Gopher 6.54 +gopher 70/udp 6.55 +rje 77/tcp netrjs 6.56 +finger 79/tcp 6.57 +www 80/tcp http # WorldWideWeb HTTP 6.58 +www 80/udp # HyperText Transfer Protocol 6.59 +link 87/tcp ttylink 6.60 +kerberos 88/tcp kerberos5 krb5 # Kerberos v5 6.61 +kerberos 88/udp kerberos5 krb5 # Kerberos v5 6.62 +supdup 95/tcp 6.63 +# 100 - reserved 6.64 +hostnames 101/tcp hostname # usually from sri-nic 6.65 +iso-tsap 102/tcp tsap # part of ISODE. 6.66 +csnet-ns 105/tcp cso-ns # also used by CSO name server 6.67 +csnet-ns 105/udp cso-ns 6.68 +# unfortunately the poppassd (Eudora) uses a port which has already 6.69 +# been assigned to a different service. We list the poppassd as an 6.70 +# alias here. This should work for programs asking for this service. 6.71 +# (due to a bug in inetd the 3com-tsmux line is disabled) 6.72 +#3com-tsmux 106/tcp poppassd 6.73 +#3com-tsmux 106/udp poppassd 6.74 +rtelnet 107/tcp # Remote Telnet 6.75 +rtelnet 107/udp 6.76 +pop2 109/tcp pop-2 postoffice # POP version 2 6.77 +pop2 109/udp pop-2 6.78 +pop3 110/tcp pop-3 # POP version 3 6.79 +pop3 110/udp pop-3 6.80 +sunrpc 111/tcp portmapper # RPC 4.0 portmapper TCP 6.81 +sunrpc 111/udp portmapper # RPC 4.0 portmapper UDP 6.82 +auth 113/tcp authentication tap ident 6.83 +sftp 115/tcp 6.84 +uucp-path 117/tcp 6.85 +nntp 119/tcp readnews untp # USENET News Transfer Protocol 6.86 +ntp 123/tcp 6.87 +ntp 123/udp # Network Time Protocol 6.88 +netbios-ns 137/tcp # NETBIOS Name Service 6.89 +netbios-ns 137/udp 6.90 +netbios-dgm 138/tcp # NETBIOS Datagram Service 6.91 +netbios-dgm 138/udp 6.92 +netbios-ssn 139/tcp # NETBIOS session service 6.93 +netbios-ssn 139/udp 6.94 +imap2 143/tcp imap # Interim Mail Access Proto v2 6.95 +imap2 143/udp imap 6.96 +snmp 161/udp # Simple Net Mgmt Proto 6.97 +snmp-trap 162/udp snmptrap # Traps for SNMP 6.98 +cmip-man 163/tcp # ISO mgmt over IP (CMOT) 6.99 +cmip-man 163/udp 6.100 +cmip-agent 164/tcp 6.101 +cmip-agent 164/udp 6.102 +xdmcp 177/tcp # X Display Mgr. Control Proto 6.103 +xdmcp 177/udp 6.104 +nextstep 178/tcp NeXTStep NextStep # NeXTStep window 6.105 +nextstep 178/udp NeXTStep NextStep # server 6.106 +bgp 179/tcp # Border Gateway Proto. 6.107 +bgp 179/udp 6.108 +prospero 191/tcp # Cliff Neuman's Prospero 6.109 +prospero 191/udp 6.110 +irc 194/tcp # Internet Relay Chat 6.111 +irc 194/udp 6.112 +smux 199/tcp # SNMP Unix Multiplexer 6.113 +smux 199/udp 6.114 +at-rtmp 201/tcp # AppleTalk routing 6.115 +at-rtmp 201/udp 6.116 +at-nbp 202/tcp # AppleTalk name binding 6.117 +at-nbp 202/udp 6.118 +at-echo 204/tcp # AppleTalk echo 6.119 +at-echo 204/udp 6.120 +at-zis 206/tcp # AppleTalk zone information 6.121 +at-zis 206/udp 6.122 +qmtp 209/tcp # The Quick Mail Transfer Protocol 6.123 +qmtp 209/udp # The Quick Mail Transfer Protocol 6.124 +z3950 210/tcp wais # NISO Z39.50 database 6.125 +z3950 210/udp wais 6.126 +ipx 213/tcp # IPX 6.127 +ipx 213/udp 6.128 +imap3 220/tcp # Interactive Mail Access 6.129 +imap3 220/udp # Protocol v3 6.130 +rpc2portmap 369/tcp 6.131 +rpc2portmap 369/udp # Coda portmapper 6.132 +codaauth2 370/tcp 6.133 +codaauth2 370/udp # Coda authentication server 6.134 +ulistserv 372/tcp # UNIX Listserv 6.135 +ulistserv 372/udp 6.136 +ldap 389/tcp # Lightweight Directory Access Protocol 6.137 +ldap 389/udp # Lightweight Directory Access Protocol 6.138 +https 443/tcp # MCom 6.139 +https 443/udp # MCom 6.140 +snpp 444/tcp # Simple Network Paging Protocol 6.141 +snpp 444/udp # Simple Network Paging Protocol 6.142 +saft 487/tcp # Simple Asynchronous File Transfer 6.143 +saft 487/udp # Simple Asynchronous File Transfer 6.144 +npmp-local 610/tcp dqs313_qmaster # npmp-local / DQS 6.145 +npmp-local 610/udp dqs313_qmaster # npmp-local / DQS 6.146 +npmp-gui 611/tcp dqs313_execd # npmp-gui / DQS 6.147 +npmp-gui 611/udp dqs313_execd # npmp-gui / DQS 6.148 +hmmp-ind 612/tcp dqs313_intercell# HMMP Indication / DQS 6.149 +hmmp-ind 612/udp dqs313_intercell# HMMP Indication / DQS 6.150 +# 6.151 +# UNIX specific services 6.152 +# 6.153 +exec 512/tcp 6.154 +biff 512/udp comsat 6.155 +login 513/tcp 6.156 +who 513/udp whod 6.157 +shell 514/tcp cmd # no passwords used 6.158 +syslog 514/udp 6.159 +printer 515/tcp spooler # line printer spooler 6.160 +talk 517/udp 6.161 +ntalk 518/udp 6.162 +route 520/udp router routed # RIP 6.163 +timed 525/udp timeserver 6.164 +tempo 526/tcp newdate 6.165 +courier 530/tcp rpc 6.166 +conference 531/tcp chat 6.167 +netnews 532/tcp readnews 6.168 +netwall 533/udp # -for emergency broadcasts 6.169 +uucp 540/tcp uucpd # uucp daemon 6.170 +afpovertcp 548/tcp # AFP over TCP 6.171 +afpovertcp 548/udp # AFP over TCP 6.172 +remotefs 556/tcp rfs_server rfs # Brunhoff remote filesystem 6.173 +klogin 543/tcp # Kerberized `rlogin' (v5) 6.174 +kshell 544/tcp krcmd # Kerberized `rsh' (v5) 6.175 +kerberos-adm 749/tcp # Kerberos `kadmin' (v5) 6.176 +# 6.177 +webster 765/tcp # Network dictionary 6.178 +webster 765/udp 6.179 +swat 901/tcp # Samba Web Administration Tool 6.180 +# 6.181 +# From ``Assigned Numbers'': 6.182 +# 6.183 +#> The Registered Ports are not controlled by the IANA and on most systems 6.184 +#> can be used by ordinary user processes or programs executed by ordinary 6.185 +#> users. 6.186 +# 6.187 +#> Ports are used in the TCP [45,106] to name the ends of logical 6.188 +#> connections which carry long term conversations. For the purpose of 6.189 +#> providing services to unknown callers, a service contact port is 6.190 +#> defined. This list specifies the port used by the server process as its 6.191 +#> contact port. While the IANA can not control uses of these ports it 6.192 +#> does register or list uses of these ports as a convienence to the 6.193 +#> community. 6.194 +# 6.195 +ingreslock 1524/tcp 6.196 +ingreslock 1524/udp 6.197 +prospero-np 1525/tcp # Prospero non-privileged 6.198 +prospero-np 1525/udp 6.199 +datametrics 1645/tcp old-radius # datametrics / old radius entry 6.200 +datametrics 1645/udp old-radius # datametrics / old radius entry 6.201 +sa-msg-port 1646/tcp old-radacct # sa-msg-port / old radacct entry 6.202 +sa-msg-port 1646/udp old-radacct # sa-msg-port / old radacct entry 6.203 +radius 1812/tcp # Radius 6.204 +radius 1812/udp # Radius 6.205 +radacct 1813/tcp # Radius Accounting 6.206 +radacct 1813/udp # Radius Accounting 6.207 +cvspserver 2401/tcp # CVS client/server operations 6.208 +cvspserver 2401/udp # CVS client/server operations 6.209 +venus 2430/tcp # codacon port 6.210 +venus 2430/udp # Venus callback/wbc interface 6.211 +venus-se 2431/tcp # tcp side effects 6.212 +venus-se 2431/udp # udp sftp side effect 6.213 +codasrv 2432/tcp # not used 6.214 +codasrv 2432/udp # server port 6.215 +codasrv-se 2433/tcp # tcp side effects 6.216 +codasrv-se 2433/udp # udp sftp side effect 6.217 +mysql 3306/tcp # MySQL 6.218 +mysql 3306/udp # MySQL 6.219 +rfe 5002/tcp # Radio Free Ethernet 6.220 +rfe 5002/udp # Actually uses UDP only 6.221 +cfengine 5308/tcp # CFengine 6.222 +cfengine 5308/udp # CFengine 6.223 +bbs 7000/tcp # BBS service 6.224 +# 6.225 +# 6.226 +# Kerberos (Project Athena/MIT) services 6.227 +# Note that these are for Kerberos v4, and are unofficial. Sites running 6.228 +# v4 should uncomment these and comment out the v5 entries above. 6.229 +# 6.230 +kerberos4 750/udp kerberos-iv kdc # Kerberos (server) udp 6.231 +kerberos4 750/tcp kerberos-iv kdc # Kerberos (server) tcp 6.232 +kerberos_master 751/udp # Kerberos authentication 6.233 +kerberos_master 751/tcp # Kerberos authentication 6.234 +passwd_server 752/udp # Kerberos passwd server 6.235 +krb_prop 754/tcp # Kerberos slave propagation 6.236 +krbupdate 760/tcp kreg # Kerberos registration 6.237 +kpasswd 761/tcp kpwd # Kerberos "passwd" 6.238 +kpop 1109/tcp # Pop with Kerberos 6.239 +knetd 2053/tcp # Kerberos de-multiplexor 6.240 +zephyr-srv 2102/udp # Zephyr server 6.241 +zephyr-clt 2103/udp # Zephyr serv-hm connection 6.242 +zephyr-hm 2104/udp # Zephyr hostmanager 6.243 +eklogin 2105/tcp # Kerberos encrypted rlogin 6.244 +# 6.245 +# Unofficial but necessary (for NetBSD) services 6.246 +# 6.247 +supfilesrv 871/tcp # SUP server 6.248 +supfiledbg 1127/tcp # SUP debugging 6.249 +# 6.250 +# Datagram Delivery Protocol services 6.251 +# 6.252 +rtmp 1/ddp # Routing Table Maintenance Protocol 6.253 +nbp 2/ddp # Name Binding Protocol 6.254 +echo 4/ddp # AppleTalk Echo Protocol 6.255 +zip 6/ddp # Zone Information Protocol 6.256 +# 6.257 +# Services added for the Debian GNU/Linux distribution 6.258 +poppassd 106/tcp # Eudora 6.259 +poppassd 106/udp # Eudora 6.260 +mailq 174/tcp # Mailer transport queue for Zmailer 6.261 +mailq 174/udp # Mailer transport queue for Zmailer 6.262 +ssmtp 465/tcp # SMTP over SSL 6.263 +gdomap 538/tcp # GNUstep distributed objects 6.264 +gdomap 538/udp # GNUstep distributed objects 6.265 +snews 563/tcp # NNTP over SSL 6.266 +ssl-ldap 636/tcp # LDAP over SSL 6.267 +omirr 808/tcp omirrd # online mirror 6.268 +omirr 808/udp omirrd # online mirror 6.269 +rsync 873/tcp # rsync 6.270 +rsync 873/udp # rsync 6.271 +simap 993/tcp # IMAP over SSL 6.272 +spop3 995/tcp # POP-3 over SSL 6.273 +socks 1080/tcp # socks proxy server 6.274 +socks 1080/udp # socks proxy server 6.275 +rmtcfg 1236/tcp # Gracilis Packeten remote config server 6.276 +xtel 1313/tcp # french minitel 6.277 +support 1529/tcp # GNATS 6.278 +cfinger 2003/tcp # GNU Finger 6.279 +ninstall 2150/tcp # ninstall service 6.280 +ninstall 2150/udp # ninstall service 6.281 +afbackup 2988/tcp # Afbackup system 6.282 +afbackup 2988/udp # Afbackup system 6.283 +icp 3130/tcp # Internet Cache Protocol (Squid) 6.284 +icp 3130/udp # Internet Cache Protocol (Squid) 6.285 +postgres 5432/tcp # POSTGRES 6.286 +postgres 5432/udp # POSTGRES 6.287 +fax 4557/tcp # FAX transmission service (old) 6.288 +hylafax 4559/tcp # HylaFAX client-server protocol (new) 6.289 +noclog 5354/tcp # noclogd with TCP (nocol) 6.290 +noclog 5354/udp # noclogd with UDP (nocol) 6.291 +hostmon 5355/tcp # hostmon uses TCP (nocol) 6.292 +hostmon 5355/udp # hostmon uses TCP (nocol) 6.293 +ircd 6667/tcp # Internet Relay Chat 6.294 +ircd 6667/udp # Internet Relay Chat 6.295 +webcache 8080/tcp # WWW caching service 6.296 +webcache 8080/udp # WWW caching service 6.297 +tproxy 8081/tcp # Transparent Proxy 6.298 +tproxy 8081/udp # Transparent Proxy 6.299 +mandelspawn 9359/udp mandelbrot # network mandelbrot 6.300 +amanda 10080/udp # amanda backup services 6.301 +kamanda 10081/tcp # amanda backup services (Kerberos) 6.302 +kamanda 10081/udp # amanda backup services (Kerberos) 6.303 +amandaidx 10082/tcp # amanda backup services 6.304 +amidxtape 10083/tcp # amanda backup services 6.305 +isdnlog 20011/tcp # isdn logging system 6.306 +isdnlog 20011/udp # isdn logging system 6.307 +vboxd 20012/tcp # voice box system 6.308 +vboxd 20012/udp # voice box system 6.309 +binkp 24554/tcp # Binkley 6.310 +binkp 24554/udp # Binkley 6.311 +asp 27374/tcp # Address Search Protocol 6.312 +asp 27374/udp # Address Search Protocol 6.313 +tfido 60177/tcp # Ifmail 6.314 +tfido 60177/udp # Ifmail 6.315 +fido 60179/tcp # Ifmail 6.316 +fido 60179/udp # Ifmail 6.317 + 6.318 +# Local services 6.319 + 6.320 +linuxconf 98/tcp
7.1 --- a/busybox/receipt Sat May 08 17:23:19 2021 +0000 7.2 +++ b/busybox/receipt Wed Jul 14 09:04:04 2021 +0000 7.3 @@ -13,6 +13,7 @@ 7.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 7.5 WEB_SITE="http://www.busybox.net/" 7.6 WGET_URL="https://git.busybox.net/busybox/snapshot/busybox-$GIT_TAG.tar.bz2" 7.7 +CONFIG_FILES="/etc/rcS.conf /etc/hostname /etc/fstab /etc/init.d/local.sh" 7.8 AUTO_SELECTION="always" 7.9 7.10 apply_bb_patchs() 7.11 @@ -159,13 +160,13 @@ 7.12 fi 7.13 EOT 7.14 [ "$STUPID" ] && cat >> $1/boot/mkrootfs.pre_exec <<EOT 7.15 -for i in boot/bzImage boot/memtest boot/ipxe; do 7.16 +for i in boot/bzImage boot/memtest boot/ipxe boot/plop boot/x86test; do 7.17 [ -s \$i ] || continue 7.18 dd if=\$i bs=512 count=1 | \\ 7.19 sed "s|\$(echo -en '\x64\x66\x8F\x47\x78')|\$(echo -en '\x5E\x5E\x90\x90\x90')|" | \\ 7.20 sed "s|\$(echo -en '\x66\x8F\x47\x78')|\$(echo -en '\x5E\x5E\x90\x90')|" | \\ 7.21 sed "s|\$(echo -en '\x77\x02\xB0\x01')|\$(echo -en '\x90\x90\xB0\x01')|" | \\ 7.22 - sed "s|\$(echo -en '\x98\xCD\x13')|\$(echo -en '\x89\x90\x90')|" | \\ 7.23 + sed "s|\$(echo -en '\x98\xCD\x13')|\$(echo -en '\x98\x90\x90')|" | \\ 7.24 sed "s|\$(echo -en '\x60\xCD\x13')|\$(echo -en '\x60\x90\x90')|" | \\ 7.25 sed "s|\$(echo -en '\xB0\x31\x1C\x03\xB4\x0E')|\$(echo -en '\xB0\x31\x14\xFD\xB4\x0E')|" | \\ 7.26 dd of=\$i conv=notrunc
8.1 --- a/busybox/stuff/busybox-git.config Sat May 08 17:23:19 2021 +0000 8.2 +++ b/busybox/stuff/busybox-git.config Wed Jul 14 09:04:04 2021 +0000 8.3 @@ -1,7 +1,7 @@ 8.4 # 8.5 # Automatically generated make config: don't edit 8.6 # Busybox version: 1.28.0.git 8.7 -# Thu Feb 27 11:00:06 2020 8.8 +# Tue Jul 13 06:01:18 2021 8.9 # 8.10 CONFIG_HAVE_DOT_CONFIG=y 8.11 8.12 @@ -97,7 +97,7 @@ 8.13 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set 8.14 # CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set 8.15 # CONFIG_FEATURE_REVERSE_SEARCH is not set 8.16 -# CONFIG_FEATURE_TAB_COMPLETION is not set 8.17 +CONFIG_FEATURE_TAB_COMPLETION=y 8.18 # CONFIG_FEATURE_USERNAME_COMPLETION is not set 8.19 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y 8.20 # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
9.1 --- a/busybox/stuff/daemon Sat May 08 17:23:19 2021 +0000 9.2 +++ b/busybox/stuff/daemon Wed Jul 14 09:04:04 2021 +0000 9.3 @@ -9,7 +9,7 @@ 9.4 9.5 NAME=$(basename $0) 9.6 DESC="$NAME deamon" 9.7 -DAEMON=$(which $NAME || echo $NAME) 9.8 +DAEMON=$NAME 9.9 eval $(grep -i ^${NAME}_OPTIONS /etc/daemons.conf | sed 's/.*_OPT/OPT/') 9.10 PIDFILE=/var/run/$NAME.pid 9.11 9.12 @@ -22,7 +22,7 @@ 9.13 echo -n "Starting $DESC: $NAME... " 9.14 $DAEMON $OPTIONS 9.15 [ -f $PIDFILE ] || 9.16 - ps ax | grep $NAME | grep -v etc/init | cut -d ' ' -f1 > $PIDFILE 9.17 + ps | grep $NAME | grep -v etc/init | cut -d ' ' -f1 > $PIDFILE 9.18 active_pidfile $PIDFILE $NAME 9.19 status 9.20 ;; 9.21 @@ -45,7 +45,7 @@ 9.22 sleep 2 9.23 $DAEMON $OPTIONS 9.24 [ -f $PIDFILE ] || 9.25 - ps ax | grep $NAME | grep -v etc/init | cut -d ' ' -f1 > $PIDFILE 9.26 + ps | grep $NAME | grep -v etc/init | cut -d ' ' -f1 > $PIDFILE 9.27 active_pidfile $PIDFILE $NAME 9.28 status 9.29 ;;
10.1 --- a/ctorrent-dnh/receipt Sat May 08 17:23:19 2021 +0000 10.2 +++ b/ctorrent-dnh/receipt Wed Jul 14 09:04:04 2021 +0000 10.3 @@ -7,7 +7,7 @@ 10.4 MAINTAINER="pankso@slitaz.org" 10.5 LICENSE="GPL2" 10.6 [ -n "$TARGET" ] || TARGET="i486" 10.7 -DEPENDS="busybox-net" 10.8 +DEPENDS="busybox-net libc++ libm libgcc_s" 10.9 BUILD_DEPENDS="uclibc-cross-compiler-$TARGET" 10.10 TARBALL="${PACKAGE}$VERSION.tar.gz" 10.11 WEB_SITE="http://www.rahul.net/dholmes/ctorrent/" 10.12 @@ -20,6 +20,7 @@ 10.13 --prefix=/usr \ 10.14 --with-ssl=no \ 10.15 --host=$TARGET-pc-linux-gnu \ 10.16 + CXX=uclibc-$TARGET-c++ \ 10.17 CC=uclibc-$TARGET-cc && 10.18 make && 10.19 make DESTDIR=$DESTDIR install
11.1 --- a/ipxe/receipt Sat May 08 17:23:19 2021 +0000 11.2 +++ b/ipxe/receipt Wed Jul 14 09:04:04 2021 +0000 11.3 @@ -3,7 +3,7 @@ 11.4 PACKAGE="ipxe" 11.5 VERSION="1.0.0-20160119" 11.6 CATEGORY="system-tools" 11.7 -SHORT_DESC="Open source network boot firmware." 11.8 +SHORT_DESC="Open source network boot firmware (586+)." 11.9 MAINTAINER="pascal.bellard@slitaz.org" 11.10 LICENSE="GPL2" 11.11 WEB_SITE="http://ipxe.org/"
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/libc++/receipt Wed Jul 14 09:04:04 2021 +0000 12.3 @@ -0,0 +1,27 @@ 12.4 +# SliTaz package receipt. 12.5 + 12.6 +PACKAGE="libc++" 12.7 +VERSION="0.9.31" 12.8 +CATEGORY="base-system" 12.9 +GROUP="library" 12.10 +SHORT_DESC="C++ runtime library" 12.11 +MAINTAINER="pascal.bellard@slitaz.org" 12.12 +LICENSE="LGPL" 12.13 +[ -n "$TARGET" ] || TARGET="i486" 12.14 +DEPENDS="base-tiny" 12.15 +BUILD_DEPENDS="uclibc-cross-compiler-$TARGET" 12.16 +WEB_SITE="http://tiny.slitaz.org/" 12.17 + 12.18 +# Rules to configure and make the package. 12.19 +compile_rules() 12.20 +{ 12.21 + mkdir -p $DESTDIR/lib 12.22 + cp -a /usr/share/uclibc-cross-compiler-$TARGET/lib/libuClibc++**.so* $DESTDIR/lib 12.23 +} 12.24 + 12.25 +# Rules to gen a SliTaz package suitable for Tazpkg. 12.26 +genpkg_rules() 12.27 +{ 12.28 + cp -a $install/lib $fs/ 12.29 + chown 0.0 $fs/lib/* 12.30 +}
13.1 --- a/linux/receipt Sat May 08 17:23:19 2021 +0000 13.2 +++ b/linux/receipt Wed Jul 14 09:04:04 2021 +0000 13.3 @@ -29,20 +29,28 @@ 13.4 objcopy -O binary $1.o $1.bin 13.5 } 13.6 13.7 +rootfs() 13.8 +{ 13.9 + [ -s $stuff/root.cpio ] && cp $stuff/root.cpio . && 13.10 + sed -i 's|CONFIG_INITRAMFS_SOURCE="|&root.cpio|' .config 13.11 +} 13.12 + 13.13 # Rules to configure and make the package. 13.14 compile_rules() 13.15 { 13.16 + export CFLAGS="-march=i386 -Os -pipe -fomit-frame-pointer" 13.17 [ -s $SRC/$(basename $PATCH) ] || 13.18 wget --no-check-certificate -O $SRC/$(basename $PATCH) $PATCH 13.19 - bzcat $SRC/$(basename $PATCH) | patch -p1 13.20 + bzcat $SRC/$(basename $PATCH) | patch -p1 && 13.21 + sed '/DEBUG/,/* kstrdup/d' < mm/slab.c > mm/kstrdup.c && 13.22 + echo 'obj-y += kstrdup.o' >> mm/Makefile 13.23 patch -p0 < $stuff/linux-2.6.14-unpack.u 13.24 patch -p0 < $stuff/jsclipboard.u 13.25 sed -i 's|\([>\.]\)val|\1u.val|;s|\([>\.]\)next|\1u.next|;s|\t};|\t} u;|' \ 13.26 lib/inflate.c 13.27 - sed '/DEBUG/,/* kstrdup/d' < mm/slab.c > mm/kstrdup.c 13.28 - echo 'obj-y += kstrdup.o' >> mm/Makefile 13.29 sed -i 's|3.1024|11*256|' arch/i386/boot/compressed/misc.c 13.30 sed -i 's/O_CREAT/&|O_TRUNC/' init/initramfs.c 13.31 + sed -i 's|hostname|echo slitaz|' scripts/mkcompile_h 13.32 which advdef 2> /dev/null && ! which upx 2> /dev/null && 13.33 sed -i 's|gzip)|&\n advdef -z4 $@|' \ 13.34 usr/Makefile arch/i386/boot/compressed/Makefile 13.35 @@ -59,6 +67,7 @@ 13.36 sed -i 's/^config %config:/config:/' Makefile 13.37 13.38 cp $stuff/linux-$VERSION-slitaz.config .config 13.39 + rootfs 13.40 yes '' | make ARCH=i386 HOSTCC=gcc-2 config 13.41 make ARCH=i386 CC=gcc-2 HOSTCC=gcc-2 -j 4 bzImage 13.42 13.43 @@ -69,10 +78,13 @@ 13.44 cp $stuff/bundle . 13.45 sh ./bundle 13.46 S2bin cmdline 13.47 + [ $(upx --version 2> /dev/null | sed '/upx/!d;s|upx ||;s|\.||;q')0 -ge 3960 ] && 13.48 + upx --ultra-brute arch/i386/boot/bzImage 13.49 cp arch/i386/boot/bzImage arch/i386/boot/bzImage.386 13.50 cp .config .config.386 13.51 cp System.map System.map.386 13.52 cp $stuff/linux-$VERSION-slitaz.config.586 .config 13.53 + rootfs 13.54 yes '' | make ARCH=i386 HOSTCC=gcc-2 config 13.55 make ARCH=i386 CC=gcc-2 HOSTCC=gcc-2 -j 4 bzImage 13.56 which upx 2> /dev/null && upx --ultra-brute arch/i386/boot/bzImage 13.57 @@ -82,25 +94,28 @@ 13.58 genpkg_rules() 13.59 { 13.60 mkdir $fs/boot 13.61 - cp -a $src/arch/i386/boot/bzImage* $fs/boot/ 13.62 - dd if=$src/bootloader.bin of=$fs/boot/bzImage conv=notrunc 13.63 - dd if=$src/cmdline.bin bs=1 seek=560 of=$fs/boot/bzImage conv=notrunc 13.64 cp -a $src/pack $fs/boot/ 13.65 - cp -a $src/System.map* $fs/boot/ 13.66 - cp -a $src/.config $fs/boot/config 13.67 - [ -s $src/.config.386 ] && cp -a $src/.config.386 $fs/boot/config.386 13.68 cp -a $src/bundle.sh $fs/boot/bundle 13.69 + for i in '' .386 ; do 13.70 + [ -s $src/arch/i386/boot/bzImage$i ] || continue 13.71 + cp -a $src/arch/i386/boot/bzImage$i $fs/boot/ 13.72 + dd if=$src/bootloader.bin of=$fs/boot/bzImage$i conv=notrunc 13.73 + dd if=$src/cmdline.bin bs=1 seek=560 of=$fs/boot/bzImage$i conv=notrunc 13.74 + cp -a $src/System.map$i $fs/boot/ 13.75 + cp -a $src/.config$i $fs/boot/config$i 13.76 + done 13.77 } 13.78 13.79 config_form() 13.80 { 13.81 cat <<EOT 13.82 +<p> 13.83 +Tune the kernel according to the CPU type 13.84 +</p> 13.85 <table> 13.86 -<td>Tune the kernel according to the CPU type<td> 13.87 -<td> 13.88 -<input type="radio" name="CPU586" $([ "$CPU586" = "no" ] && echo "checked=checked ")value="no"> for any CPU starting from 386sx 13.89 -<input type="radio" name="CPU586" $([ "$CPU586" != "no" ] && echo "checked=checked ")value="yes"> optimized for pentium or newer CPU 13.90 -</td> 13.91 +<tr> 13.92 +<td><input type="radio" name="CPU586" $([ "$CPU586" = "no" ] && echo "checked=checked ")value="no"> for any CPU starting from 386sx</td> 13.93 +<td><input type="radio" name="CPU586" $([ "$CPU586" != "no" ] && echo "checked=checked ")value="yes"> optimized for pentium or newer CPU</td> 13.94 </tr> 13.95 </table> 13.96 EOT 13.97 @@ -112,7 +127,6 @@ 13.98 for i in $1/boot/*.386 ; do 13.99 [ "$CPU586" = "yes" ] && rm -f $i || mv -f $i ${i%.386} 13.100 done 2> /dev/null 13.101 - rm -f $1/boot/bzImage.noupx 13.102 [ -s $1/boot/cmdline ] && cat $1/boot/cmdline | sed 's/^ *//' | \ 13.103 dd of=$1/boot/bzImage conv=notrunc bs=1 seek=768 count=3072 13.104 $1/boot/pack $1/boot/bzImage
14.1 --- a/linux/stuff/bootloader.S Sat May 08 17:23:19 2021 +0000 14.2 +++ b/linux/stuff/bootloader.S Wed Jul 14 09:04:04 2021 +0000 14.3 @@ -47,6 +47,7 @@ 14.4 // #define NO_FLOPPY_TABLE_PATCH remove floppy parameter table patch 14.5 // #define NO_OUTPUT remove output code 14.6 14.7 + //.arch i386,nojumps 14.8 .code16 14.9 .org 0 14.10 14.11 @@ -83,21 +84,21 @@ 14.12 # length of bootsect + length of 14.13 # setup + room for stack; 14.14 # 12 is disk parm size. 14.15 - pushw $INITSEG 14.16 - popw %ss # %ss contain INITSEG 14.17 + movw $INITSEG, %ax 14.18 + movw %ax, %ss # %ss contain INITSEG 14.19 movw %di, %sp # put stack at INITSEG:stacktop-... 14.20 - pushw %ss 14.21 - popw %es # %es = %ss = INITSEG 14.22 - xorw %ax, %ax # %ax = 0 14.23 + movw %ax, %es # %es = %ss = INITSEG 14.24 + cbw # %ax = 0 14.25 + cld 14.26 #ifdef EXE_CMDLINE 14.27 movw $zeroed+1, %cx # clear gdt + offset, %ds, limits, cmdline="" 14.28 - rep # don't worry about cld 14.29 - stosb # already done above 14.30 + rep 14.31 + stosb 14.32 decw %di 14.33 #else 14.34 movw $zeroed/2, %cx # clear gdt + offset, %ds, limits 14.35 - rep # don't worry about cld 14.36 - stosw # already done above 14.37 + rep 14.38 + stosw 14.39 #endif 14.40 popw %bx # offset = 0 14.41 .endm 14.42 @@ -205,7 +206,6 @@ 14.43 # endif 14.44 #else 14.45 ldsw 0x78(%bx), %si # %ds:%bx+0x78 is parameter table address 14.46 - popw %di 14.47 pushw %es 14.48 pushw %di 14.49 # ifdef FLOPPY_CMDLINE 14.50 @@ -508,8 +508,12 @@ 14.51 14.52 #ifndef EXE_ONLY 14.53 14.54 -#define FLOPPY_CYLINDERS 80 14.55 -#define FLOPPY_HEADS 2 14.56 +# 720KB 800KB 880KB 1.04MB 1.12MB 1.2MB 1.44MB 1.6MB 1.68MB 1.76MB 14.57 +# 1.84MB 1.92MB 2.88MB 3.12MB 3.20MB 3.52MB 3.84MB support 14.58 +# do not support 820KB 830KB 1.48MB 1.49MB 1.72MB 1.74MB 14.59 +#define FLOPPY_CYLINDERS 80 14.60 +# do not support 360KB 410KB 420KB 14.61 +#define FLOPPY_HEADS 2 14.62 14.63 #if defined(MULTI_FLOPPY) && defined(COUNTER) 14.64 .macro putsmsg 14.65 @@ -529,7 +533,6 @@ 14.66 #endif 14.67 14.68 check_limits: 14.69 - popw %dx 14.70 cmpb %cl, %al # max sector known ? 14.71 jbe next_head # no -> store it 14.72 #.byte 0xd6 # SALC # sector by sector 14.73 @@ -556,16 +559,16 @@ 14.74 pushw %ax # save context 14.75 movb $2, %ah # cmd: read chs 14.76 int $0x13 14.77 - popw %dx # save %ax 14.78 + popw %bp # save %ax 14.79 popw %ax # limits 14.80 + popw %dx 14.81 jc check_limits 14.82 xchgw %ax, %bp 14.83 - addw %dx,%cx # next sector 14.84 + addw %ax,%cx # next sector 14.85 movw %cx, %gs 14.86 - addb %dl,%bh 14.87 - addb %dl,%bh # next location 14.88 - subw %dx,%di # update sector counter 14.89 - popw %dx 14.90 + addb %al,%bh 14.91 + addb %al,%bh # next location 14.92 + subw %ax,%di # update sector counter 14.93 jz putcdot 14.94 read_sectors: 14.95 movw %gs, %cx
15.1 --- a/linux/stuff/unlzma.S Sat May 08 17:23:19 2021 +0000 15.2 +++ b/linux/stuff/unlzma.S Wed Jul 14 09:04:04 2021 +0000 15.3 @@ -107,6 +107,7 @@ 15.4 15.5 mov $ws1, CX 15.6 #ifdef ONLY8086 15.7 + .arch i8086 15.8 movw $2048/2, %ax 15.9 lzd1: 15.10 pushw %ax 15.11 @@ -195,23 +196,31 @@ 15.12 # else 15.13 shrb $8-PROP_LC, %bl 15.14 # endif 15.15 +#else 15.16 + xor %bx,%bx 15.17 #endif 15.18 15.19 #if PROP_LP != 0 15.20 movb posState2(BP), %dl 15.21 -# ifdef ONLY8086 15.22 +# if PROP_LC != 0 15.23 +# ifdef ONLY8086 15.24 movb $PROP_LC, %cl 15.25 shl %cl, DX 15.26 -# else 15.27 +# else 15.28 shl $PROP_LC, DX 15.29 +# endif 15.30 + movb $0, %bh 15.31 # endif 15.32 - movb $0, %bh 15.33 add BX, DX 15.34 #endif 15.35 15.36 +#if PROP_LC == 0 && PROP_LP == 0 15.37 + mov $1846, AX 15.38 +#else 15.39 movb $3, %ah 15.40 mul BX // dx = 3*bh 15.41 add $1846, AX 15.42 +#endif 15.43 15.44 // int symbol = 1; 15.45
16.1 --- a/memtest/receipt Sat May 08 17:23:19 2021 +0000 16.2 +++ b/memtest/receipt Wed Jul 14 09:04:04 2021 +0000 16.3 @@ -13,6 +13,21 @@ 16.4 16.5 BUILD_DEPENDS="xz" 16.6 16.7 +tune_lzma() 16.8 +{ 16.9 + cp $stuff/*.S $stuff/pack . 16.10 + sed "s/VERSION/$VERSION/;s|lzma1=|&nice=$1,|" -i pack 16.11 + while [ -n "$2" ]; do 16.12 + sed "s|^#define PROP_$2 .*|#define PROP_$2 $3|" -i unlzma.S 16.13 + shift 2 16.14 + done 16.15 + for i in bootloader unpack ; do 16.16 + cc -o $i.o -Wa,-a=$i.lst -c $i.S 16.17 + objcopy -O binary $i.o $i.bin 16.18 + done 16.19 + ./pack --build bootloader.bin unpack.bin 16.20 +} 16.21 + 16.22 # Rules to configure and make the package. 16.23 compile_rules() 16.24 { 16.25 @@ -21,14 +36,16 @@ 16.26 patch -p1 < $i 16.27 done 16.28 make 16.29 - cp $stuff/*.S $stuff/pack . 16.30 - for i in bootloader unpack ; do 16.31 - cc -o $i.o -Wa,-a=$i.lst -c $i.S 16.32 - objcopy -O binary $i.o $i.bin 16.33 - done 16.34 - sed -i "s/VERSION/$VERSION/" pack 16.35 - ./pack --build bootloader.bin unpack.bin 16.36 + tune_lzma 127,mf=bt2 PB 3 16.37 ./pack memtest.bin memtest.packed 16.38 + mv memtest.bin memtest.bin.console 16.39 + sed -i -e 's/SERIAL_CONSOLE_DEFAULT 0/SERIAL_CONSOLE_DEFAULT 1/' \ 16.40 + -e 's/SERIAL_BAUD_RATE 9600/SERIAL_BAUD_RATE 115200/' config.h 16.41 + make clean 16.42 + make 16.43 + tune_lzma 172,mf=bt2 PB 3 16.44 + ./pack memtest.bin memtest.packed-115200 16.45 + mv memtest.bin memtest.bin.serial 16.46 } 16.47 16.48 # Rules to gen a SliTaz package suitable for Tazpkg.
17.1 --- a/memtest/stuff/pack Sat May 08 17:23:19 2021 +0000 17.2 +++ b/memtest/stuff/pack Wed Jul 14 09:04:04 2021 +0000 17.3 @@ -45,7 +45,7 @@ 17.4 17.5 compress() 17.6 { 17.7 - xz -z -e --format=raw --lzma1=mf=bt2,lc=$(bits LC),lp=$(bits LP),pb=$(bits PB),nice=127 --stdout 17.8 + xz -z -e --format=raw --lzma1=lc=$(bits LC),lp=$(bits LP),pb=$(bits PB) --stdout 17.9 } 17.10 17.11 main()
18.1 --- a/memtest/stuff/unlzma.S Sat May 08 17:23:19 2021 +0000 18.2 +++ b/memtest/stuff/unlzma.S Wed Jul 14 09:04:04 2021 +0000 18.3 @@ -18,7 +18,7 @@ 18.4 * Compression with : lzma e src dst -eos -pb2 -lp0 -lc3 18.5 */ 18.6 18.7 -#define PROP_PB 3 18.8 +#define PROP_PB 2 18.9 #define PROP_LP 0 18.10 #define PROP_LC 3 18.11 #define PROPS (PROP_LC+(PROP_LP*9)+(PROP_PB*45)) 18.12 @@ -107,6 +107,7 @@ 18.13 18.14 mov $ws1, CX 18.15 #ifdef ONLY8086 18.16 + .arch i8086 18.17 movw $2048/2, %ax 18.18 lzd1: 18.19 pushw %ax 18.20 @@ -213,9 +214,13 @@ 18.21 add BX, DX 18.22 #endif 18.23 18.24 +#if PROP_LC == 0 && PROP_LP == 0 18.25 + mov $1846, AX 18.26 +#else 18.27 movb $3, %ah 18.28 mul BX // dx = 3*bh 18.29 add $1846, AX 18.30 +#endif 18.31 18.32 // int symbol = 1; 18.33
19.1 --- a/plop/receipt Sat May 08 17:23:19 2021 +0000 19.2 +++ b/plop/receipt Wed Jul 14 09:04:04 2021 +0000 19.3 @@ -13,6 +13,21 @@ 19.4 19.5 BUILD_DEPENDS="xz wget" 19.6 19.7 +tune_lzma() 19.8 +{ 19.9 + cp $stuff/*.S $stuff/pack . 19.10 + sed "s/VERSION/$VERSION/;s|lzma1=|&nice=$1,|" -i pack 19.11 + while [ -n "$2" ]; do 19.12 + sed "s|^#define PROP_$2 .*|#define PROP_$2 $3|" -i unlzma.S 19.13 + shift 2 19.14 + done 19.15 + for i in bootloader unpack ; do 19.16 + cc -o $i.o -Wa,-a=$i.lst -c $i.S 19.17 + objcopy -O binary $i.o $i.bin 19.18 + done 19.19 + ./pack --build bootloader.bin unpack.bin 19.20 +} 19.21 + 19.22 # Rules to configure and make the package. 19.23 compile_rules() 19.24 { 19.25 @@ -25,13 +40,7 @@ 19.26 0299 01 font=bios 19.27 029A 00 zoomanimation=off 19.28 EOT 19.29 - cp $stuff/*.S $stuff/pack . 19.30 - for i in bootloader unpack ; do 19.31 - cc -o $i.o -Wa,-a=$i.lst -c $i.S 19.32 - objcopy -O binary $i.o $i.bin 19.33 - done 19.34 - sed -i "s/VERSION/$VERSION/" pack 19.35 - ./pack --build bootloader.bin unpack.bin 19.36 + tune_lzma 84,mf=bt2 PB 0 LC 0 19.37 ./pack plpbt.bin plop 19.38 } 19.39
20.1 --- a/plop/stuff/pack Sat May 08 17:23:19 2021 +0000 20.2 +++ b/plop/stuff/pack Wed Jul 14 09:04:04 2021 +0000 20.3 @@ -49,7 +49,7 @@ 20.4 20.5 compress() 20.6 { 20.7 - xz -z -e --format=raw --lzma1=mf=bt2,lc=$(bits LC),lp=$(bits LP),pb=$(bits PB),nice=84 --stdout 20.8 + xz -z -e --format=raw --lzma1=lc=$(bits LC),lp=$(bits LP),pb=$(bits PB) --stdout 20.9 } 20.10 20.11 main()
21.1 --- a/plop/stuff/unlzma.S Sat May 08 17:23:19 2021 +0000 21.2 +++ b/plop/stuff/unlzma.S Wed Jul 14 09:04:04 2021 +0000 21.3 @@ -18,11 +18,9 @@ 21.4 * Compression with : lzma e src dst -eos -pb2 -lp0 -lc3 21.5 */ 21.6 21.7 -//#define PROP_PB 2 21.8 -#define PROP_PB 0 21.9 +#define PROP_PB 2 21.10 #define PROP_LP 0 21.11 -//#define PROP_LC 3 21.12 -#define PROP_LC 0 21.13 +#define PROP_LC 3 21.14 #define PROPS (PROP_LC+(PROP_LP*9)+(PROP_PB*45)) 21.15 21.16 // static const Byte *Buffer; 21.17 @@ -109,6 +107,7 @@ 21.18 21.19 mov $ws1, CX 21.20 #ifdef ONLY8086 21.21 + .arch i8086 21.22 movw $2048/2, %ax 21.23 lzd1: 21.24 pushw %ax 21.25 @@ -215,9 +214,13 @@ 21.26 add BX, DX 21.27 #endif 21.28 21.29 +#if PROP_LC == 0 && PROP_LP == 0 21.30 + mov $1846, AX 21.31 +#else 21.32 movb $3, %ah 21.33 mul BX // dx = 3*bh 21.34 add $1846, AX 21.35 +#endif 21.36 21.37 // int symbol = 1; 21.38
22.1 --- a/tfttest/receipt Sat May 08 17:23:19 2021 +0000 22.2 +++ b/tfttest/receipt Wed Jul 14 09:04:04 2021 +0000 22.3 @@ -20,7 +20,7 @@ 22.4 cc -o $i.o -Wa,-a=$i.lst -c $i.S 22.5 objcopy -O binary $i.o $i.bin 22.6 done 22.7 - dd if=TFTTEST.COM of=bootloader.bin bs=16 seek=6 conv=notrunc 2> /dev/null 22.8 + dd if=TFTTEST.COM of=bootloader.bin bs=16 seek=9 conv=notrunc 2> /dev/null 22.9 umount mnt 22.10 } 22.11 22.12 @@ -35,5 +35,5 @@ 22.13 post_install() 22.14 { 22.15 grep -qs ^tfttest $1/boot/bootmenu || 22.16 - echo "tfttest Tfttest,pixel,tft Check dead pixels (may run under DOS if renamed to tfttest.com)" >> $1/boot/bootmenu 22.17 + echo "tfttest Tfttest,pixel,tft Check pixels" >> $1/boot/bootmenu 22.18 }
23.1 --- a/tfttest/stuff/bootloader.S Sat May 08 17:23:19 2021 +0000 23.2 +++ b/tfttest/stuff/bootloader.S Wed Jul 14 09:04:04 2021 +0000 23.3 @@ -5,40 +5,57 @@ 23.4 .globl _start 23.5 _start: 23.6 call start2 23.7 + 23.8 +BPB = 0x3E 23.9 +#define TINY_MENU Tiny SliTaz floppy boot menu 23.10 +#ifdef TINY_MENU 23.11 + .org BPB-12 23.12 + xchgw %ax, %di # 79 58 41 E8 23.13 + popw %ax 23.14 + incw %cx 23.15 + call called 23.16 +called: 23.17 + addw $0x20, %cs:bootseg+0x201 # code at 07C0:0200 23.18 + .org BPB, 0x90 23.19 +#endif 23.20 + 23.21 + .org BPB 23.22 start2: 23.23 - popw %bx 23.24 - cmpb $0x1, %bh 23.25 + popw %ax 23.26 +com_offset = 0x100 23.27 + cmpw $com_offset+3, %ax 23.28 je dotcom 23.29 - xorw %ax, %ax # %ax = 0 23.30 - movw %ax, %ds 23.31 - leaw int21-start2(%bx), %ax 23.32 - movw %ax,0x21*4 23.33 - movw %cs,0x21*4+2 23.34 - movw $0x7C0-0x10, %ax 23.35 - movw %ax, %ds 23.36 + cwd 23.37 +int21hook: 23.38 + movb $int21-_start, %al 23.39 + movw %dx, %ds 23.40 + movw %ax, 0x21*4 23.41 + movw %cs, 0x21*4+2 23.42 +bootseg: 23.43 + movw $0x7C0-com_offset/16, %ax 23.44 + .byte 0x3d # cmp $0xc88c, %ax 23.45 dotcom: 23.46 - movw %ds, %ax 23.47 - addw $6, %ax # addw $code/16, %ax 23.48 + movw %cs, %ax 23.49 +paragraphs = 9 23.50 + addw $paragraphs, %ax 23.51 movw %ax, %ds 23.52 movw %ax, %es 23.53 movw %ax, %ss 23.54 movw $0xFFFE, %sp 23.55 - pushw %ds 23.56 - movw $0x100, %ax 23.57 pushw %ax 23.58 - cbw 23.59 - xorw %bx, %bx 23.60 + movw $com_offset, %ax 23.61 + pushw %ax 23.62 + cbw # %ax = 0 23.63 retf 23.64 23.65 int21: 23.66 - cmpb $7, %ah 23.67 + subb $7, %ah 23.68 jne not_input 23.69 - movb $0, %ah 23.70 - int $0x16 23.71 + int $0x16 # %ah = 0 23.72 do_iret: 23.73 iret 23.74 not_input: 23.75 - cmpb $9, %ah 23.76 + cmpb $9-7, %ah 23.77 jne abort 23.78 movw %dx, %si 23.79 puts: 23.80 @@ -51,8 +68,8 @@ 23.81 jmp puts 23.82 abort: 23.83 ljmp $0xffff,$0 23.84 - 23.85 - .org 0x60 23.86 + 23.87 + .org paragraphs*16 23.88 code: 23.89 .org 510 23.90
24.1 --- a/x86test/receipt Sat May 08 17:23:19 2021 +0000 24.2 +++ b/x86test/receipt Wed Jul 14 09:04:04 2021 +0000 24.3 @@ -11,18 +11,27 @@ 24.4 24.5 BUILD_DEPENDS="xz" 24.6 24.7 +tune_lzma() 24.8 +{ 24.9 + cp $stuff/*.S $stuff/pack . 24.10 + sed "s/VERSION/$VERSION/;s|lzma1=|&nice=$1,|" -i pack 24.11 + sed -i '/#define ONLY8086/d' unpack.S 24.12 + while [ -n "$2" ]; do 24.13 + sed "s|^#define PROP_$2 .*|#define PROP_$2 $3|" -i unlzma.S 24.14 + shift 2 24.15 + done 24.16 + for i in bootloader unpack ; do 24.17 + cc -o $i.o -Wa,-a=$i.lst -c $i.S 24.18 + objcopy -O binary $i.o $i.bin 24.19 + done 24.20 + ./pack --build bootloader.bin unpack.bin 24.21 +} 24.22 + 24.23 # Rules to configure and make the package. 24.24 compile_rules() 24.25 { 24.26 mkdir -p $src && cd $src 24.27 - cp $stuff/x86test $stuff/*.S $stuff/pack . 24.28 - sed -i '/#define ONLY8086/d' unpack.S 24.29 - for i in bootloader unpack ; do 24.30 - cc -o $i.o -Wa,-a=$i.lst -c $i.S 24.31 - objcopy -O binary $i.o $i.bin 24.32 - done 24.33 - sed -i "s/VERSION/$VERSION/" pack 24.34 - ./pack --build bootloader.bin unpack.bin 24.35 + tune_lzma 36,mf=bt2 PB 0 24.36 ./pack x86test x86test.packed 24.37 dd if=bootloader.bin of=x86test conv=notrunc 2> /dev/null 24.38 }
25.1 --- a/x86test/stuff/unlzma.S Sat May 08 17:23:19 2021 +0000 25.2 +++ b/x86test/stuff/unlzma.S Wed Jul 14 09:04:04 2021 +0000 25.3 @@ -18,7 +18,7 @@ 25.4 * Compression with : lzma e src dst -eos -pb2 -lp0 -lc3 25.5 */ 25.6 25.7 -#define PROP_PB 0 25.8 +#define PROP_PB 2 25.9 #define PROP_LP 0 25.10 #define PROP_LC 3 25.11 #define PROPS (PROP_LC+(PROP_LP*9)+(PROP_PB*45)) 25.12 @@ -107,6 +107,7 @@ 25.13 25.14 mov $ws1, CX 25.15 #ifdef ONLY8086 25.16 + .arch i8086 25.17 movw $2048/2, %ax 25.18 lzd1: 25.19 pushw %ax 25.20 @@ -213,9 +214,13 @@ 25.21 add BX, DX 25.22 #endif 25.23 25.24 +#if PROP_LC == 0 && PROP_LP == 0 25.25 + mov $1846, AX 25.26 +#else 25.27 movb $3, %ah 25.28 mul BX // dx = 3*bh 25.29 add $1846, AX 25.30 +#endif 25.31 25.32 // int symbol = 1; 25.33