wok rev 21754
Up firefox-official (67.0.3), tinyproxy (1.10.0)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Jun 19 17:26:14 2019 +0200 (2019-06-19) |
| parents | 2fdd74522103 |
| children | 39c5255f1c90 |
| files | firefox-official-de/receipt firefox-official-es/receipt firefox-official-fr/receipt firefox-official-it/receipt firefox-official-pt-BR/receipt firefox-official-ru/receipt firefox-official-uk/receipt firefox-official/receipt linld/stuff/src/CRTL.ASM linld/stuff/src/ISO9660.CPP linld/stuff/src/ISO9660.H linld/stuff/src/TAZBOOT.CPP linld/stuff/src/pipehole.awk tinyproxy/receipt |
line diff
1.1 --- a/firefox-official-de/receipt Wed Jun 19 14:43:09 2019 +0100 1.2 +++ b/firefox-official-de/receipt Wed Jun 19 17:26:14 2019 +0200 1.3 @@ -2,7 +2,7 @@ 1.4 1.5 PACKAGE="firefox-official-de" 1.6 lang="de" 1.7 -VERSION="66.0.4" 1.8 +VERSION="67.0.3" 1.9 CATEGORY="network" 1.10 TAGS="web-browser" 1.11 SHORT_DESC="Official Firefox build by the Mozilla foundation (German language)."
2.1 --- a/firefox-official-es/receipt Wed Jun 19 14:43:09 2019 +0100 2.2 +++ b/firefox-official-es/receipt Wed Jun 19 17:26:14 2019 +0200 2.3 @@ -2,7 +2,7 @@ 2.4 2.5 PACKAGE="firefox-official-es" 2.6 lang="es-ES" 2.7 -VERSION="66.0.4" 2.8 +VERSION="67.0.3" 2.9 CATEGORY="network" 2.10 TAGS="web-browser" 2.11 SHORT_DESC="Official Firefox build by the Mozilla foundation (Spanish language)."
3.1 --- a/firefox-official-fr/receipt Wed Jun 19 14:43:09 2019 +0100 3.2 +++ b/firefox-official-fr/receipt Wed Jun 19 17:26:14 2019 +0200 3.3 @@ -2,7 +2,7 @@ 3.4 3.5 PACKAGE="firefox-official-fr" 3.6 lang="fr" 3.7 -VERSION="66.0.4" 3.8 +VERSION="67.0.3" 3.9 CATEGORY="network" 3.10 TAGS="web-browser" 3.11 SHORT_DESC="Official Firefox build by the Mozilla foundation (French language)."
4.1 --- a/firefox-official-it/receipt Wed Jun 19 14:43:09 2019 +0100 4.2 +++ b/firefox-official-it/receipt Wed Jun 19 17:26:14 2019 +0200 4.3 @@ -2,7 +2,7 @@ 4.4 4.5 PACKAGE="firefox-official-it" 4.6 lang="it" 4.7 -VERSION="66.0.4" 4.8 +VERSION="67.0.3" 4.9 CATEGORY="network" 4.10 TAGS="web-browser" 4.11 SHORT_DESC="Official Firefox build by the Mozilla foundation (Italian language)."
5.1 --- a/firefox-official-pt-BR/receipt Wed Jun 19 14:43:09 2019 +0100 5.2 +++ b/firefox-official-pt-BR/receipt Wed Jun 19 17:26:14 2019 +0200 5.3 @@ -2,7 +2,7 @@ 5.4 5.5 PACKAGE="firefox-official-pt-BR" 5.6 lang="pt-BR" 5.7 -VERSION="66.0.4" 5.8 +VERSION="67.0.3" 5.9 CATEGORY="network" 5.10 TAGS="web-browser" 5.11 SHORT_DESC="Official Firefox build by the Mozilla foundation (Portuguese (Brazil) language)."
6.1 --- a/firefox-official-ru/receipt Wed Jun 19 14:43:09 2019 +0100 6.2 +++ b/firefox-official-ru/receipt Wed Jun 19 17:26:14 2019 +0200 6.3 @@ -2,7 +2,7 @@ 6.4 6.5 PACKAGE="firefox-official-ru" 6.6 lang="ru" 6.7 -VERSION="66.0.4" 6.8 +VERSION="67.0.3" 6.9 CATEGORY="network" 6.10 TAGS="web-browser" 6.11 SHORT_DESC="Official Firefox build by the Mozilla foundation (Russian language)."
7.1 --- a/firefox-official-uk/receipt Wed Jun 19 14:43:09 2019 +0100 7.2 +++ b/firefox-official-uk/receipt Wed Jun 19 17:26:14 2019 +0200 7.3 @@ -2,7 +2,7 @@ 7.4 7.5 PACKAGE="firefox-official-uk" 7.6 lang="uk" 7.7 -VERSION="66.0.4" 7.8 +VERSION="67.0.3" 7.9 CATEGORY="network" 7.10 TAGS="web-browser" 7.11 SHORT_DESC="Official Firefox build by the Mozilla foundation (Ukrainian language)."
8.1 --- a/firefox-official/receipt Wed Jun 19 14:43:09 2019 +0100 8.2 +++ b/firefox-official/receipt Wed Jun 19 17:26:14 2019 +0200 8.3 @@ -1,7 +1,7 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="firefox-official" 8.7 -VERSION="66.0.4" 8.8 +VERSION="67.0.3" 8.9 CATEGORY="network" 8.10 TAGS="web-browser" 8.11 SHORT_DESC="Official Firefox build by the Mozilla foundation (English language)."
9.1 --- a/linld/stuff/src/CRTL.ASM Wed Jun 19 14:43:09 2019 +0100 9.2 +++ b/linld/stuff/src/CRTL.ASM Wed Jun 19 17:26:14 2019 +0200 9.3 @@ -34,23 +34,27 @@ 9.4 ifdef EXTRA 9.5 ;typedef unsigned dirsizetype; 9.6 struc isostate ; struct isostate { 9.7 -fd dw ? ; 0 int fd; 9.8 -filemod dw ? ; 2 unsigned short filemod; 9.9 -fileofs dd ? ; 4 unsigned long fileofs; 9.10 -filesize dd ? ; 8 unsigned long filesize; 9.11 -filename dw ? ;12 char *filename; 9.12 -curdirsize dw ? ;14 dirsizetype curdirsize; 9.13 -dirsize dw ? ;16 dirsizetype dirsize; 9.14 -curdirofs dd ? ;18 unsigned long curdirofs; 9.15 -dirofs dd ? ;22 unsigned long dirofs; 9.16 -curpos dw ? ;26 unsigned curpos; 9.17 -filename2open dw ? ;28 char *filename2open; 9.18 +curpos dw ? ; 0 unsigned curpos; 9.19 +filename2open dw ? ; 2 char *filename2open; 9.20 +fd dw ? ; 4 int fd; 9.21 +filemod dw ? ; 6 unsigned short filemod; 9.22 +fileofs dd ? ; 8 unsigned long fileofs; 9.23 +filesize dd ? ;12 unsigned long filesize; 9.24 +filename dw ? ;16 char *filename; 9.25 +curdirsize dw ? ;18 dirsizetype curdirsize; 9.26 +dirsize dw ? ;20 dirsizetype dirsize; 9.27 +curdirofs dd ? ;22 unsigned long curdirofs; 9.28 +dirofs dd ? ;26 unsigned long dirofs; 9.29 +;overlap 9.30 entrysize dw ? ;30 int entrysize; 9.31 tmp dw ? ;32 const char *tmp; 9.32 -;buffer label ;34 char buffer[2048+512]; 9.33 +c db ? ;34 char c; 9.34 +_64bits db ? ;35 char _64bits; 9.35 +buffer db ? ;36 char buffer[2048+512]; 9.36 ends ; } isostate; 9.37 public _isostate 9.38 _isostate isostate <?> 9.39 + org $-7 9.40 endif 9.41 _xfer_buf db 4096 dup (?) 9.42 global _no_exit:byte 9.43 @@ -369,8 +373,7 @@ 9.44 call isolseek 9.45 jc doret 9.46 mov dx,2560 9.47 - ;mov bx,offset _isostate.buffer 9.48 - mov bx,offset _xfer_buf 9.49 + mov bx,offset _isostate.buffer 9.50 mov ax,[_isostate.fd] 9.51 jmp @read$dxbxax ; read(fd,buffer,2560) 9.52 9.53 @@ -957,9 +960,9 @@ 9.54 jnz @@next 9.55 mov [(image_himem di).next_chunk],offset next_chunk 9.56 @@next: 9.57 - push di 9.58 + ;push di 9.59 call [(image_himem di).next_chunk] ; m->next_chunk() 9.60 - pop di 9.61 + ;pop di 9.62 else 9.63 @@next: 9.64 call next_chunk 9.65 @@ -980,9 +983,9 @@ 9.66 jnz @@next 9.67 pop [(image_himem di).state] 9.68 ifdef EXTRA 9.69 - push di 9.70 + ;push di 9.71 call [(image_himem di).next_chunk] ; m->next_chunk() 9.72 - pop di 9.73 + ;pop di 9.74 else 9.75 call next_chunk 9.76 endif 9.77 @@ -1024,7 +1027,7 @@ 9.78 sub dx,si 9.79 mov bx,[di] 9.80 call @read$cxdxbx 9.81 - jc image_done 9.82 + jbe image_done 9.83 xor cx,cx 9.84 cwd ; ax < 8000h 9.85 ifndef NO386
10.1 --- a/linld/stuff/src/ISO9660.CPP Wed Jun 19 14:43:09 2019 +0100 10.2 +++ b/linld/stuff/src/ISO9660.CPP Wed Jun 19 17:26:14 2019 +0200 10.3 @@ -110,8 +110,8 @@ 10.4 // char _64bits = cpuhaslm(); 10.5 struct isostate *x=&isostate; 10.6 #define name (x->filename2open) 10.7 -#define c (((char *)&x->entrysize)[0]) 10.8 -#define _64bits (((char *)&x->entrysize)[1]) 10.9 +#define c (x->c) 10.10 +#define _64bits (x->_64bits) 10.11 char *s; 10.12 10.13 _64bits = cpuhaslm(); 10.14 @@ -121,7 +121,7 @@ 10.15 } 10.16 next: 10.17 name = s; 10.18 - do s++; while (*s != '/' && *s); 10.19 + do s++; while (*s && *s != '/'); 10.20 c = *s; *s = 0; 10.21 for (x->curdirsize = 0xFFFF; isoreaddir() != -1;) { 10.22 const char *n = name;
11.1 --- a/linld/stuff/src/ISO9660.H Wed Jun 19 14:43:09 2019 +0100 11.2 +++ b/linld/stuff/src/ISO9660.H Wed Jun 19 17:26:14 2019 +0200 11.3 @@ -7,18 +7,19 @@ 11.4 #define filesize2dirsize(x) (*(dirsizetype *)((char *)&(x)+1)) 11.5 #define DIRSECTORSZ (SECTORSZ/256) 11.6 extern struct isostate { 11.7 + unsigned curpos; 11.8 + char *filename2open; 11.9 int fd; 11.10 unsigned short filemod; 11.11 unsigned long fileofs; 11.12 unsigned long filesize; 11.13 char *filename; 11.14 -//private 11.15 dirsizetype curdirsize, dirsize; 11.16 unsigned long curdirofs, dirofs; 11.17 - unsigned curpos; 11.18 - char *filename2open; 11.19 int entrysize; 11.20 const char *tmp; 11.21 + char c; 11.22 + char _64bits; 11.23 #define SECTORSZ 2048 11.24 #define SECTORBITS 11 11.25 char buffer[SECTORSZ+512]; // RR overflow
12.1 --- a/linld/stuff/src/TAZBOOT.CPP Wed Jun 19 14:43:09 2019 +0100 12.2 +++ b/linld/stuff/src/TAZBOOT.CPP Wed Jun 19 17:26:14 2019 +0200 12.3 @@ -115,7 +115,7 @@ 12.4 addinitrd(); 12.5 } 12.6 } 12.7 - else if (magic > 0) { 12.8 + else if (magic != 0) { 12.9 char *initrdfilename = fallback; 12.10 static const unsigned long initrddesc = 18L; 12.11
13.1 --- a/linld/stuff/src/pipehole.awk Wed Jun 19 14:43:09 2019 +0100 13.2 +++ b/linld/stuff/src/pipehole.awk Wed Jun 19 17:26:14 2019 +0200 13.3 @@ -1,10 +1,16 @@ 13.4 -BEGIN { hold=0; is386=0; isload=0; isiso=0; istazboot=0; wascall=0 } 13.5 +BEGIN { hold=0; is386=0; isload=0; isiso=0; istazboot=0; wascall=0; label="none"; xlabel="" } 13.6 function isnum(n) { return match(n,/^[0-9+-]/) } 13.7 { 13.8 sub(/segment word public/,"segment byte public") 13.9 13.10 if (/^@.*:$/ || / endp$/) afterjmp=0 13.11 if (/dword ptr/) is386=1 13.12 + if (/void load_initrd\(\)/) isload=3 13.13 + if (isload == 3) { # LOAD.LST 13.14 + if(/push di/ || /pop di/) next 13.15 + sub(/\[di/,"[bx") 13.16 + sub(/\di,/,"bx,") 13.17 + } 13.18 if (/vid_mode = vid_mode/) isload=2 13.19 if (isload == 2) { # LOAD.LST 13.20 sub(/,0/,""); sub(/cmp /,"mov cx,") 13.21 @@ -22,42 +28,102 @@ 13.22 if (/ax,word ptr/) next 13.23 if (/^ call/) isload=0 13.24 } 13.25 + if (/CD001/) isiso=7 13.26 + if (isiso == 7) { # ISO9660.LST 13.27 + sub(/mov ax,-1/,"dec ax") 13.28 + if (/jmp/) isiso=0 13.29 + } 13.30 + if (/int len =/) isiso=6 13.31 + if (isiso == 6) { # ISO9660.LST 13.32 + if (/dx,ax/) next 13.33 + sub(/ax/,"dx") 13.34 + sub(/cx,di/,"bx,di") 13.35 + sub(/cx,dx/,"bx,ax") 13.36 + sub(/di,dx/,"di,ax") 13.37 + if (/while/) isiso=2 13.38 + } 13.39 + if (/entrysize =/) isiso=5 13.40 + if (isiso == 5) { # ISO9660.LST 13.41 + if (/ax,ax/) next 13.42 + sub(/ax/,"cx") 13.43 + sub(/je/,"jcxz") 13.44 + if (/return/) isiso=0 13.45 + } 13.46 if (/x->curdirsize == 0xFFFF/) isiso=4 13.47 if (isiso == 4) { # ISO9660.LST 13.48 - sub(/DGROUP:_isostate\+14/,"[si+14]") 13.49 - sub(/DGROUP:_isostate\+16/,"[si+16]") 13.50 + sub(/DGROUP:_isostate\+18/,"[si+18]") 13.51 + sub(/DGROUP:_isostate\+20/,"[si+20]") 13.52 if (/goto restarted/) isiso=0 13.53 } 13.54 - if (/c = \*s; \*s = 0;/) isiso=3 13.55 + if (/do s\+\+; while/) isiso=3 13.56 + if (/for \(p = s; \*s && \*s \!=/) isiso=3 13.57 if (isiso == 3) { # ISO9660.LST, TAZBOOT.LST 13.58 - if (/al,byte ptr/) { 13.59 - print " mov al,0" 13.60 - sub(/mov/,"xchg") 13.61 - } 13.62 - if (/byte ptr \[.*\],0/) { 13.63 - isiso=0 13.64 - next 13.65 - } 13.66 + sub(/cmp byte ptr \[.i\]/,"sub al") 13.67 + if (/mov byte ptr \[bp-5\],al/) $0=" push ax" 13.68 + if (/mov al,byte ptr \[bp-5\]/) $0=" pop ax" 13.69 + if (/inc /) { r=$2; print; next } 13.70 + if (/al,0/) print " mov al,[" r "]" 13.71 + if (/al,byte ptr/) sub(/mov/,"xchg") 13.72 + if (/byte ptr \[.*\],0/) next 13.73 + if (/jmp/) print " mov bx,si" 13.74 + if (/word ptr \[bp-4\]/) next 13.75 + if (/\) s\+\+;/ || /\],-1/) isiso=0 13.76 } 13.77 if (/endname = NULL/) isiso=2 13.78 if (isiso == 2) { # ISO9660.LST 13.79 if (/mov bx,cx/) next 13.80 gsub(/cx/,"bx") 13.81 - sub(/DGROUP:_isostate\+31/,"[si+31]") 13.82 + sub(/DGROUP:_isostate\+35/,"[si+35]") 13.83 } 13.84 if (/const char \*n = name/) isiso=1 13.85 if (isiso == 1) { # ISO9660.LST 13.86 if ((/mov word ptr \[si\+32\],ax/ ) || 13.87 - (/mov ax,word ptr \[si\+28\]/) || 13.88 + (/mov ax,word ptr \[si\+2\]/) || 13.89 (/bx,word ptr \[si\+32\]/) || (/ax,dx/)) next 13.90 if (/dx,/) sub(/dx/,"ax") 13.91 - if ((/sub ax,word ptr \[si\+28\]/) || 13.92 - (/\[si\+12\]/) || (/ax,di/)) sub(/ax/,"bx") 13.93 - if (/add word ptr \[si\+32\],ax/) $0=" add bx,word ptr [si+12]" 13.94 + if ((/sub ax,word ptr \[si\+2\]/) || 13.95 + (/\[si\+16\]/) || (/ax,di/)) sub(/ax/,"bx") 13.96 + if (/add word ptr \[si\+32\],ax/) $0=" add bx,word ptr [si+16]" 13.97 if (/al,/ || /,al/) sub(/al/,"cl") 13.98 - if (/cmp byte ptr \[si\+30\],0/) $0=" or cl,cl" 13.99 + if (/cmp byte ptr \[si\+34\],0/) $0=" or cl,cl" 13.100 if (/jne @@0$/) next 13.101 if (/jmp @3@58$/) $0=" je @3@58" 13.102 + sub(/mov ax,-1/,"dec ax") 13.103 + } 13.104 + if (/endp/) { xlabel = ""; goto2=0 } 13.105 + if (/isoopen\(s\+7\)/ && xlabel == "") goto2=1 13.106 + if (/_vid_mode,ax/ && xlabel == "") goto2=1 13.107 + if (/_base_himem\+2,/ && xlabel == "@") goto2=1 13.108 + if (/puts\(cmdline\)/ && xlabel == "@@") goto2=1 13.109 + if (goto2 == 1 && /jmp/) { # TAZBOOT.LST && LINLD.LST 13.110 + print $NF xlabel "@:" 13.111 + label=$NF 13.112 + } 13.113 + if (goto2 > 0 && label == $NF) { 13.114 + $0=$0 xlabel 13.115 + if (goto2++ == 1) xlabel=xlabel "@" 13.116 + } 13.117 + if (/cmdline=s\+=3/ || /magic \!= 0/ || /&root_dev =/) { isotazboot=10; j="" } 13.118 + if (isotazboot == 10) { # TAZBOOT.LST && LINLD.LST 13.119 + if (/je/ || /jne/) { j=$1; next } 13.120 + if (/jmp/) { 13.121 + if (j=="jne") sub(/jmp/,"je") 13.122 + else if (j=="je") sub(/jmp/,"jne") 13.123 + isotazboot=0 13.124 + } 13.125 + } 13.126 + if (/static const unsigned long initrddesc = 18L/) isotazboot=9 13.127 + if (isotazboot == 9) { # TAZBOOT.LST 13.128 + if (/,0/) { 13.129 + split($4,y,",") 13.130 + print " mov bx,offset " y[1] 13.131 + } 13.132 + if (/DGROUP:.*\+6,46/) { 13.133 + sub(/DGROUP:.*\+6,/,"[bx+6],") 13.134 + isotazboot=0 13.135 + } 13.136 + if (/mov/) $0=" mov si,bx" 13.137 + sub(/DGROUP:.*,/,"[bx],") 13.138 } 13.139 if (/isoopen\(s\+7\) != -1/) isotazboot=8 13.140 if (isotazboot == 8) { # TAZBOOT.LST 13.141 @@ -79,24 +145,28 @@ 13.142 isotazboot=0 13.143 } 13.144 } 13.145 - if (/initrd_state.info\[m->state\]/) isotazboot=5 13.146 - if (isotazboot == 5) { # TAZBOOT.LST 13.147 + if (/static void next_chunk/) isotazboot=5 13.148 + if (isotazboot == 5 || isotazboot == 500) { # TAZBOOT.LST 13.149 if (/cx,ax/) $0=" xchg ax,bx" 13.150 - if (/mov ax,word ptr \[si\]/) $0=" lodsw" 13.151 - if (/ax,word ptr \[si\+28\]/) next 13.152 + if (/ax,word ptr \[si\+28\]/ && isotazboot == 500) next 13.153 if (/bx,cx/) next 13.154 + if (/push/ || /pop/ || /bp,sp/ || /si,/) next 13.155 + sub(/\[si/,"[di") 13.156 + if (/initrd_info/) isotazboot=500 13.157 if (/endp/) isotazboot=0 13.158 } 13.159 if (/0x7FF0/) isotazboot=4 13.160 if (isotazboot == 4) { # TAZBOOT.LST 13.161 if (/ax,word ptr/) { 13.162 print " mov ax,32752" 13.163 + print " cwd" 13.164 sub(/mov/,"sub") 13.165 } 13.166 if (/bx,/ || /cx,/ || /dx,/) next 13.167 - sub(/,bx/,",0") 13.168 + sub(/,0/,",dx") 13.169 + sub(/,bx/,",dx") 13.170 sub(/,cx/,",ax") 13.171 - if (/short/) isotazboot=0 13.172 + if (/@addinitrd\$qv/) isotazboot=0 13.173 } 13.174 if (/c = x->filename/) isotazboot=3 13.175 if (isotazboot == 3) { # TAZBOOT.LST 13.176 @@ -104,15 +174,11 @@ 13.177 if (/\]$/) next 13.178 if (/@strcpy\$qpxzct1/) isotazboot=0 13.179 } 13.180 - if (/memtop/) isotazboot=2 13.181 + if (/base_himem = memtop/) isotazboot=2 13.182 if (isotazboot == 2) { # TAZBOOT.LST 13.183 - if (/DGROUP:_base_himem\+2,dx/) print " mov bx,offset _base_himem" 13.184 - sub(/DGROUP:_base_himem,/,"[bx],") 13.185 - sub(/DGROUP:_base_himem\+2,/,"[bx+2],") 13.186 - sub(/DGROUP:_base_himem\+3,/,"[bx+3],") 13.187 + if (/@6@226/ || /mov ax,1/ || /@6@254/ || /xor ax,ax/) next 13.188 if (/word ptr \[bx\+2\],0/) { 13.189 - print s 13.190 - hold=0 13.191 + print s; hold=0 13.192 print " mov bx,word ptr [bx+2]" 13.193 $0=" or bx,bx" 13.194 } 13.195 @@ -123,32 +189,31 @@ 13.196 if (/static void addinitrd/) isotazboot=100 13.197 if (isotazboot == 100) { # TAZBOOT.LST 13.198 if (/cx,ax/) { 13.199 - print " xchg ax,si" 13.200 - print " push di" 13.201 - print " mov di,offset _isostate+4" 13.202 + print " mov si,offset _isostate+8" 13.203 + print " xchg ax,di" 13.204 print " movsw" 13.205 print " movsw" 13.206 print " movsw" 13.207 print " movsw" 13.208 - $0=" pop di" 13.209 + $0=" xchg ax,di" 13.210 } 13.211 if (/mov/ && !/si/ && !/cl/) next 13.212 - if (/initrd.size \+=/) isotazboot=101 13.213 + if (/void load_initrds/) isotazboot=101 13.214 } 13.215 - if (isotazboot > 100) { # TAZBOOT.LST 13.216 - if (/m->next_chunk = next_chunk/) isotazboot=101 13.217 - if (/load_initrd/) isotazboot=102 13.218 - if (/push si/ && isotazboot == 102) next 13.219 - if (/pop si/ && isotazboot == 102) next 13.220 - sub(/\[si\]/,"[bx]") 13.221 - sub(/push si$/,"push bx") 13.222 + if (isotazboot == 101 || isotazboot == 102) { # TAZBOOT.LST 13.223 + sub(/\[si/,"[di"); sub(/si,/,"di,"); sub(/si$/,"di") 13.224 + sub(/DGROUP:_imgs\+38$/,"[di+38-32]") 13.225 + sub(/DGROUP:_imgs\+40$/,"[di+40-32]") 13.226 + if (/isofd/) isotazboot=102 13.227 + if (/push/ && isotazboot == 102) next 13.228 + if (/pop/ && isotazboot == 102) next 13.229 + if (/load_initrd/) isotazboot=101 13.230 + if (/isokernel/) isotazboot=103 13.231 + } 13.232 + if (isotazboot > 102) { # TAZBOOT.LST 13.233 + if (/push/ || /pop/) next 13.234 + sub(/\[si/,"[bx") 13.235 sub(/si,/,"bx,") 13.236 - sub(/si\+/,"bx+") 13.237 - if (/mov cx,ax/) $0=" xchg ax,bx" 13.238 - if (/bx,cx/) next 13.239 - sub(/cx/,"bx") 13.240 - sub(/DGROUP:_imgs\+38$/,"[bx+38-32]") 13.241 - sub(/DGROUP:_imgs\+40$/,"[bx+40-32]") 13.242 if (/static void bootiso/) isotazboot=0 13.243 } 13.244 if (wascall) { 13.245 @@ -480,5 +545,6 @@ 13.246 } 13.247 if (afterjmp) print ";" $0 13.248 else print 13.249 - if (/^ jmp /) afterjmp=1 13.250 + if (/^ jmp / || /^ call near ptr _boot_kernel/ || 13.251 + /^ call near ptr @die$qpxzc/) afterjmp=1 13.252 }
14.1 --- a/tinyproxy/receipt Wed Jun 19 14:43:09 2019 +0100 14.2 +++ b/tinyproxy/receipt Wed Jun 19 17:26:14 2019 +0200 14.3 @@ -1,21 +1,20 @@ 14.4 # SliTaz package receipt. 14.5 14.6 PACKAGE="tinyproxy" 14.7 -VERSION="1.8.3" 14.8 +VERSION="1.10.0" 14.9 CATEGORY="network" 14.10 SHORT_DESC="A light-weight HTTP proxy daemon for POSIX operating systems." 14.11 MAINTAINER="slaxemulator@gmail.com" 14.12 LICENSE="GPL2" 14.13 TARBALL="$PACKAGE-$VERSION.tar.bz2" 14.14 -WEB_SITE="https://banu.com/tinyproxy/" 14.15 -WGET_URL="https://banu.com/pub/$PACKAGE/${VERSION%.*}/$TARBALL" 14.16 +WEB_SITE="https://tinyproxy.github.io/" 14.17 +WGET_URL="https://github.com/tinyproxy/tinyproxy/archive/$VERSION.tar.gz" 14.18 14.19 BUILD_DEPENDS="wget" 14.20 14.21 # Rules to configure and make the package. 14.22 compile_rules() 14.23 { 14.24 - cd $src 14.25 patch -Np1 -i $stuff/no-docs-and-tests.diff 14.26 ./configure \ 14.27 --prefix=/usr \