# HG changeset patch # User Pascal Bellard # Date 1560957974 -7200 # Node ID 8b9f768b711e21f0266dca23a103fc3f58b75a84 # Parent 2fdd74522103ed051c24c59adc655b2f8338f3a2 Up firefox-official (67.0.3), tinyproxy (1.10.0) diff -r 2fdd74522103 -r 8b9f768b711e firefox-official-de/receipt --- a/firefox-official-de/receipt Wed Jun 19 14:43:09 2019 +0100 +++ b/firefox-official-de/receipt Wed Jun 19 17:26:14 2019 +0200 @@ -2,7 +2,7 @@ PACKAGE="firefox-official-de" lang="de" -VERSION="66.0.4" +VERSION="67.0.3" CATEGORY="network" TAGS="web-browser" SHORT_DESC="Official Firefox build by the Mozilla foundation (German language)." diff -r 2fdd74522103 -r 8b9f768b711e firefox-official-es/receipt --- a/firefox-official-es/receipt Wed Jun 19 14:43:09 2019 +0100 +++ b/firefox-official-es/receipt Wed Jun 19 17:26:14 2019 +0200 @@ -2,7 +2,7 @@ PACKAGE="firefox-official-es" lang="es-ES" -VERSION="66.0.4" +VERSION="67.0.3" CATEGORY="network" TAGS="web-browser" SHORT_DESC="Official Firefox build by the Mozilla foundation (Spanish language)." diff -r 2fdd74522103 -r 8b9f768b711e firefox-official-fr/receipt --- a/firefox-official-fr/receipt Wed Jun 19 14:43:09 2019 +0100 +++ b/firefox-official-fr/receipt Wed Jun 19 17:26:14 2019 +0200 @@ -2,7 +2,7 @@ PACKAGE="firefox-official-fr" lang="fr" -VERSION="66.0.4" +VERSION="67.0.3" CATEGORY="network" TAGS="web-browser" SHORT_DESC="Official Firefox build by the Mozilla foundation (French language)." diff -r 2fdd74522103 -r 8b9f768b711e firefox-official-it/receipt --- a/firefox-official-it/receipt Wed Jun 19 14:43:09 2019 +0100 +++ b/firefox-official-it/receipt Wed Jun 19 17:26:14 2019 +0200 @@ -2,7 +2,7 @@ PACKAGE="firefox-official-it" lang="it" -VERSION="66.0.4" +VERSION="67.0.3" CATEGORY="network" TAGS="web-browser" SHORT_DESC="Official Firefox build by the Mozilla foundation (Italian language)." diff -r 2fdd74522103 -r 8b9f768b711e firefox-official-pt-BR/receipt --- a/firefox-official-pt-BR/receipt Wed Jun 19 14:43:09 2019 +0100 +++ b/firefox-official-pt-BR/receipt Wed Jun 19 17:26:14 2019 +0200 @@ -2,7 +2,7 @@ PACKAGE="firefox-official-pt-BR" lang="pt-BR" -VERSION="66.0.4" +VERSION="67.0.3" CATEGORY="network" TAGS="web-browser" SHORT_DESC="Official Firefox build by the Mozilla foundation (Portuguese (Brazil) language)." diff -r 2fdd74522103 -r 8b9f768b711e firefox-official-ru/receipt --- a/firefox-official-ru/receipt Wed Jun 19 14:43:09 2019 +0100 +++ b/firefox-official-ru/receipt Wed Jun 19 17:26:14 2019 +0200 @@ -2,7 +2,7 @@ PACKAGE="firefox-official-ru" lang="ru" -VERSION="66.0.4" +VERSION="67.0.3" CATEGORY="network" TAGS="web-browser" SHORT_DESC="Official Firefox build by the Mozilla foundation (Russian language)." diff -r 2fdd74522103 -r 8b9f768b711e firefox-official-uk/receipt --- a/firefox-official-uk/receipt Wed Jun 19 14:43:09 2019 +0100 +++ b/firefox-official-uk/receipt Wed Jun 19 17:26:14 2019 +0200 @@ -2,7 +2,7 @@ PACKAGE="firefox-official-uk" lang="uk" -VERSION="66.0.4" +VERSION="67.0.3" CATEGORY="network" TAGS="web-browser" SHORT_DESC="Official Firefox build by the Mozilla foundation (Ukrainian language)." diff -r 2fdd74522103 -r 8b9f768b711e firefox-official/receipt --- a/firefox-official/receipt Wed Jun 19 14:43:09 2019 +0100 +++ b/firefox-official/receipt Wed Jun 19 17:26:14 2019 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="firefox-official" -VERSION="66.0.4" +VERSION="67.0.3" CATEGORY="network" TAGS="web-browser" SHORT_DESC="Official Firefox build by the Mozilla foundation (English language)." diff -r 2fdd74522103 -r 8b9f768b711e linld/stuff/src/CRTL.ASM --- a/linld/stuff/src/CRTL.ASM Wed Jun 19 14:43:09 2019 +0100 +++ b/linld/stuff/src/CRTL.ASM Wed Jun 19 17:26:14 2019 +0200 @@ -34,23 +34,27 @@ ifdef EXTRA ;typedef unsigned dirsizetype; struc isostate ; struct isostate { -fd dw ? ; 0 int fd; -filemod dw ? ; 2 unsigned short filemod; -fileofs dd ? ; 4 unsigned long fileofs; -filesize dd ? ; 8 unsigned long filesize; -filename dw ? ;12 char *filename; -curdirsize dw ? ;14 dirsizetype curdirsize; -dirsize dw ? ;16 dirsizetype dirsize; -curdirofs dd ? ;18 unsigned long curdirofs; -dirofs dd ? ;22 unsigned long dirofs; -curpos dw ? ;26 unsigned curpos; -filename2open dw ? ;28 char *filename2open; +curpos dw ? ; 0 unsigned curpos; +filename2open dw ? ; 2 char *filename2open; +fd dw ? ; 4 int fd; +filemod dw ? ; 6 unsigned short filemod; +fileofs dd ? ; 8 unsigned long fileofs; +filesize dd ? ;12 unsigned long filesize; +filename dw ? ;16 char *filename; +curdirsize dw ? ;18 dirsizetype curdirsize; +dirsize dw ? ;20 dirsizetype dirsize; +curdirofs dd ? ;22 unsigned long curdirofs; +dirofs dd ? ;26 unsigned long dirofs; +;overlap entrysize dw ? ;30 int entrysize; tmp dw ? ;32 const char *tmp; -;buffer label ;34 char buffer[2048+512]; +c db ? ;34 char c; +_64bits db ? ;35 char _64bits; +buffer db ? ;36 char buffer[2048+512]; ends ; } isostate; public _isostate _isostate isostate + org $-7 endif _xfer_buf db 4096 dup (?) global _no_exit:byte @@ -369,8 +373,7 @@ call isolseek jc doret mov dx,2560 - ;mov bx,offset _isostate.buffer - mov bx,offset _xfer_buf + mov bx,offset _isostate.buffer mov ax,[_isostate.fd] jmp @read$dxbxax ; read(fd,buffer,2560) @@ -957,9 +960,9 @@ jnz @@next mov [(image_himem di).next_chunk],offset next_chunk @@next: - push di + ;push di call [(image_himem di).next_chunk] ; m->next_chunk() - pop di + ;pop di else @@next: call next_chunk @@ -980,9 +983,9 @@ jnz @@next pop [(image_himem di).state] ifdef EXTRA - push di + ;push di call [(image_himem di).next_chunk] ; m->next_chunk() - pop di + ;pop di else call next_chunk endif @@ -1024,7 +1027,7 @@ sub dx,si mov bx,[di] call @read$cxdxbx - jc image_done + jbe image_done xor cx,cx cwd ; ax < 8000h ifndef NO386 diff -r 2fdd74522103 -r 8b9f768b711e linld/stuff/src/ISO9660.CPP --- a/linld/stuff/src/ISO9660.CPP Wed Jun 19 14:43:09 2019 +0100 +++ b/linld/stuff/src/ISO9660.CPP Wed Jun 19 17:26:14 2019 +0200 @@ -110,8 +110,8 @@ // char _64bits = cpuhaslm(); struct isostate *x=&isostate; #define name (x->filename2open) -#define c (((char *)&x->entrysize)[0]) -#define _64bits (((char *)&x->entrysize)[1]) +#define c (x->c) +#define _64bits (x->_64bits) char *s; _64bits = cpuhaslm(); @@ -121,7 +121,7 @@ } next: name = s; - do s++; while (*s != '/' && *s); + do s++; while (*s && *s != '/'); c = *s; *s = 0; for (x->curdirsize = 0xFFFF; isoreaddir() != -1;) { const char *n = name; diff -r 2fdd74522103 -r 8b9f768b711e linld/stuff/src/ISO9660.H --- a/linld/stuff/src/ISO9660.H Wed Jun 19 14:43:09 2019 +0100 +++ b/linld/stuff/src/ISO9660.H Wed Jun 19 17:26:14 2019 +0200 @@ -7,18 +7,19 @@ #define filesize2dirsize(x) (*(dirsizetype *)((char *)&(x)+1)) #define DIRSECTORSZ (SECTORSZ/256) extern struct isostate { + unsigned curpos; + char *filename2open; int fd; unsigned short filemod; unsigned long fileofs; unsigned long filesize; char *filename; -//private dirsizetype curdirsize, dirsize; unsigned long curdirofs, dirofs; - unsigned curpos; - char *filename2open; int entrysize; const char *tmp; + char c; + char _64bits; #define SECTORSZ 2048 #define SECTORBITS 11 char buffer[SECTORSZ+512]; // RR overflow diff -r 2fdd74522103 -r 8b9f768b711e linld/stuff/src/TAZBOOT.CPP --- a/linld/stuff/src/TAZBOOT.CPP Wed Jun 19 14:43:09 2019 +0100 +++ b/linld/stuff/src/TAZBOOT.CPP Wed Jun 19 17:26:14 2019 +0200 @@ -115,7 +115,7 @@ addinitrd(); } } - else if (magic > 0) { + else if (magic != 0) { char *initrdfilename = fallback; static const unsigned long initrddesc = 18L; diff -r 2fdd74522103 -r 8b9f768b711e linld/stuff/src/pipehole.awk --- a/linld/stuff/src/pipehole.awk Wed Jun 19 14:43:09 2019 +0100 +++ b/linld/stuff/src/pipehole.awk Wed Jun 19 17:26:14 2019 +0200 @@ -1,10 +1,16 @@ -BEGIN { hold=0; is386=0; isload=0; isiso=0; istazboot=0; wascall=0 } +BEGIN { hold=0; is386=0; isload=0; isiso=0; istazboot=0; wascall=0; label="none"; xlabel="" } function isnum(n) { return match(n,/^[0-9+-]/) } { sub(/segment word public/,"segment byte public") if (/^@.*:$/ || / endp$/) afterjmp=0 if (/dword ptr/) is386=1 + if (/void load_initrd\(\)/) isload=3 + if (isload == 3) { # LOAD.LST + if(/push di/ || /pop di/) next + sub(/\[di/,"[bx") + sub(/\di,/,"bx,") + } if (/vid_mode = vid_mode/) isload=2 if (isload == 2) { # LOAD.LST sub(/,0/,""); sub(/cmp /,"mov cx,") @@ -22,42 +28,102 @@ if (/ax,word ptr/) next if (/^ call/) isload=0 } + if (/CD001/) isiso=7 + if (isiso == 7) { # ISO9660.LST + sub(/mov ax,-1/,"dec ax") + if (/jmp/) isiso=0 + } + if (/int len =/) isiso=6 + if (isiso == 6) { # ISO9660.LST + if (/dx,ax/) next + sub(/ax/,"dx") + sub(/cx,di/,"bx,di") + sub(/cx,dx/,"bx,ax") + sub(/di,dx/,"di,ax") + if (/while/) isiso=2 + } + if (/entrysize =/) isiso=5 + if (isiso == 5) { # ISO9660.LST + if (/ax,ax/) next + sub(/ax/,"cx") + sub(/je/,"jcxz") + if (/return/) isiso=0 + } if (/x->curdirsize == 0xFFFF/) isiso=4 if (isiso == 4) { # ISO9660.LST - sub(/DGROUP:_isostate\+14/,"[si+14]") - sub(/DGROUP:_isostate\+16/,"[si+16]") + sub(/DGROUP:_isostate\+18/,"[si+18]") + sub(/DGROUP:_isostate\+20/,"[si+20]") if (/goto restarted/) isiso=0 } - if (/c = \*s; \*s = 0;/) isiso=3 + if (/do s\+\+; while/) isiso=3 + if (/for \(p = s; \*s && \*s \!=/) isiso=3 if (isiso == 3) { # ISO9660.LST, TAZBOOT.LST - if (/al,byte ptr/) { - print " mov al,0" - sub(/mov/,"xchg") - } - if (/byte ptr \[.*\],0/) { - isiso=0 - next - } + sub(/cmp byte ptr \[.i\]/,"sub al") + if (/mov byte ptr \[bp-5\],al/) $0=" push ax" + if (/mov al,byte ptr \[bp-5\]/) $0=" pop ax" + if (/inc /) { r=$2; print; next } + if (/al,0/) print " mov al,[" r "]" + if (/al,byte ptr/) sub(/mov/,"xchg") + if (/byte ptr \[.*\],0/) next + if (/jmp/) print " mov bx,si" + if (/word ptr \[bp-4\]/) next + if (/\) s\+\+;/ || /\],-1/) isiso=0 } if (/endname = NULL/) isiso=2 if (isiso == 2) { # ISO9660.LST if (/mov bx,cx/) next gsub(/cx/,"bx") - sub(/DGROUP:_isostate\+31/,"[si+31]") + sub(/DGROUP:_isostate\+35/,"[si+35]") } if (/const char \*n = name/) isiso=1 if (isiso == 1) { # ISO9660.LST if ((/mov word ptr \[si\+32\],ax/ ) || - (/mov ax,word ptr \[si\+28\]/) || + (/mov ax,word ptr \[si\+2\]/) || (/bx,word ptr \[si\+32\]/) || (/ax,dx/)) next if (/dx,/) sub(/dx/,"ax") - if ((/sub ax,word ptr \[si\+28\]/) || - (/\[si\+12\]/) || (/ax,di/)) sub(/ax/,"bx") - if (/add word ptr \[si\+32\],ax/) $0=" add bx,word ptr [si+12]" + if ((/sub ax,word ptr \[si\+2\]/) || + (/\[si\+16\]/) || (/ax,di/)) sub(/ax/,"bx") + if (/add word ptr \[si\+32\],ax/) $0=" add bx,word ptr [si+16]" if (/al,/ || /,al/) sub(/al/,"cl") - if (/cmp byte ptr \[si\+30\],0/) $0=" or cl,cl" + if (/cmp byte ptr \[si\+34\],0/) $0=" or cl,cl" if (/jne @@0$/) next if (/jmp @3@58$/) $0=" je @3@58" + sub(/mov ax,-1/,"dec ax") + } + if (/endp/) { xlabel = ""; goto2=0 } + if (/isoopen\(s\+7\)/ && xlabel == "") goto2=1 + if (/_vid_mode,ax/ && xlabel == "") goto2=1 + if (/_base_himem\+2,/ && xlabel == "@") goto2=1 + if (/puts\(cmdline\)/ && xlabel == "@@") goto2=1 + if (goto2 == 1 && /jmp/) { # TAZBOOT.LST && LINLD.LST + print $NF xlabel "@:" + label=$NF + } + if (goto2 > 0 && label == $NF) { + $0=$0 xlabel + if (goto2++ == 1) xlabel=xlabel "@" + } + if (/cmdline=s\+=3/ || /magic \!= 0/ || /&root_dev =/) { isotazboot=10; j="" } + if (isotazboot == 10) { # TAZBOOT.LST && LINLD.LST + if (/je/ || /jne/) { j=$1; next } + if (/jmp/) { + if (j=="jne") sub(/jmp/,"je") + else if (j=="je") sub(/jmp/,"jne") + isotazboot=0 + } + } + if (/static const unsigned long initrddesc = 18L/) isotazboot=9 + if (isotazboot == 9) { # TAZBOOT.LST + if (/,0/) { + split($4,y,",") + print " mov bx,offset " y[1] + } + if (/DGROUP:.*\+6,46/) { + sub(/DGROUP:.*\+6,/,"[bx+6],") + isotazboot=0 + } + if (/mov/) $0=" mov si,bx" + sub(/DGROUP:.*,/,"[bx],") } if (/isoopen\(s\+7\) != -1/) isotazboot=8 if (isotazboot == 8) { # TAZBOOT.LST @@ -79,24 +145,28 @@ isotazboot=0 } } - if (/initrd_state.info\[m->state\]/) isotazboot=5 - if (isotazboot == 5) { # TAZBOOT.LST + if (/static void next_chunk/) isotazboot=5 + if (isotazboot == 5 || isotazboot == 500) { # TAZBOOT.LST if (/cx,ax/) $0=" xchg ax,bx" - if (/mov ax,word ptr \[si\]/) $0=" lodsw" - if (/ax,word ptr \[si\+28\]/) next + if (/ax,word ptr \[si\+28\]/ && isotazboot == 500) next if (/bx,cx/) next + if (/push/ || /pop/ || /bp,sp/ || /si,/) next + sub(/\[si/,"[di") + if (/initrd_info/) isotazboot=500 if (/endp/) isotazboot=0 } if (/0x7FF0/) isotazboot=4 if (isotazboot == 4) { # TAZBOOT.LST if (/ax,word ptr/) { print " mov ax,32752" + print " cwd" sub(/mov/,"sub") } if (/bx,/ || /cx,/ || /dx,/) next - sub(/,bx/,",0") + sub(/,0/,",dx") + sub(/,bx/,",dx") sub(/,cx/,",ax") - if (/short/) isotazboot=0 + if (/@addinitrd\$qv/) isotazboot=0 } if (/c = x->filename/) isotazboot=3 if (isotazboot == 3) { # TAZBOOT.LST @@ -104,15 +174,11 @@ if (/\]$/) next if (/@strcpy\$qpxzct1/) isotazboot=0 } - if (/memtop/) isotazboot=2 + if (/base_himem = memtop/) isotazboot=2 if (isotazboot == 2) { # TAZBOOT.LST - if (/DGROUP:_base_himem\+2,dx/) print " mov bx,offset _base_himem" - sub(/DGROUP:_base_himem,/,"[bx],") - sub(/DGROUP:_base_himem\+2,/,"[bx+2],") - sub(/DGROUP:_base_himem\+3,/,"[bx+3],") + if (/@6@226/ || /mov ax,1/ || /@6@254/ || /xor ax,ax/) next if (/word ptr \[bx\+2\],0/) { - print s - hold=0 + print s; hold=0 print " mov bx,word ptr [bx+2]" $0=" or bx,bx" } @@ -123,32 +189,31 @@ if (/static void addinitrd/) isotazboot=100 if (isotazboot == 100) { # TAZBOOT.LST if (/cx,ax/) { - print " xchg ax,si" - print " push di" - print " mov di,offset _isostate+4" + print " mov si,offset _isostate+8" + print " xchg ax,di" print " movsw" print " movsw" print " movsw" print " movsw" - $0=" pop di" + $0=" xchg ax,di" } if (/mov/ && !/si/ && !/cl/) next - if (/initrd.size \+=/) isotazboot=101 + if (/void load_initrds/) isotazboot=101 } - if (isotazboot > 100) { # TAZBOOT.LST - if (/m->next_chunk = next_chunk/) isotazboot=101 - if (/load_initrd/) isotazboot=102 - if (/push si/ && isotazboot == 102) next - if (/pop si/ && isotazboot == 102) next - sub(/\[si\]/,"[bx]") - sub(/push si$/,"push bx") + if (isotazboot == 101 || isotazboot == 102) { # TAZBOOT.LST + sub(/\[si/,"[di"); sub(/si,/,"di,"); sub(/si$/,"di") + sub(/DGROUP:_imgs\+38$/,"[di+38-32]") + sub(/DGROUP:_imgs\+40$/,"[di+40-32]") + if (/isofd/) isotazboot=102 + if (/push/ && isotazboot == 102) next + if (/pop/ && isotazboot == 102) next + if (/load_initrd/) isotazboot=101 + if (/isokernel/) isotazboot=103 + } + if (isotazboot > 102) { # TAZBOOT.LST + if (/push/ || /pop/) next + sub(/\[si/,"[bx") sub(/si,/,"bx,") - sub(/si\+/,"bx+") - if (/mov cx,ax/) $0=" xchg ax,bx" - if (/bx,cx/) next - sub(/cx/,"bx") - sub(/DGROUP:_imgs\+38$/,"[bx+38-32]") - sub(/DGROUP:_imgs\+40$/,"[bx+40-32]") if (/static void bootiso/) isotazboot=0 } if (wascall) { @@ -480,5 +545,6 @@ } if (afterjmp) print ";" $0 else print - if (/^ jmp /) afterjmp=1 + if (/^ jmp / || /^ call near ptr _boot_kernel/ || + /^ call near ptr @die$qpxzc/) afterjmp=1 } diff -r 2fdd74522103 -r 8b9f768b711e tinyproxy/receipt --- a/tinyproxy/receipt Wed Jun 19 14:43:09 2019 +0100 +++ b/tinyproxy/receipt Wed Jun 19 17:26:14 2019 +0200 @@ -1,21 +1,20 @@ # SliTaz package receipt. PACKAGE="tinyproxy" -VERSION="1.8.3" +VERSION="1.10.0" CATEGORY="network" SHORT_DESC="A light-weight HTTP proxy daemon for POSIX operating systems." MAINTAINER="slaxemulator@gmail.com" LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="https://banu.com/tinyproxy/" -WGET_URL="https://banu.com/pub/$PACKAGE/${VERSION%.*}/$TARBALL" +WEB_SITE="https://tinyproxy.github.io/" +WGET_URL="https://github.com/tinyproxy/tinyproxy/archive/$VERSION.tar.gz" BUILD_DEPENDS="wget" # Rules to configure and make the package. compile_rules() { - cd $src patch -Np1 -i $stuff/no-docs-and-tests.diff ./configure \ --prefix=/usr \