wok rev 20520
Up sshguard (2.2.0)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Nov 05 11:52:27 2018 +0100 (2018-11-05) |
parents | cef3758eccf6 |
children | 5ac54b83c335 |
files | linld/stuff/src/CRTL.ASM linld/stuff/src/JUMP.ASM linld/stuff/src/MEMCPY32.ASM linld/stuff/src/pipehole.awk sshguard/receipt |
line diff
1.1 --- a/linld/stuff/src/CRTL.ASM Fri Nov 02 16:25:35 2018 +0100 1.2 +++ b/linld/stuff/src/CRTL.ASM Mon Nov 05 11:52:27 2018 +0100 1.3 @@ -430,8 +430,8 @@ 1.4 1.5 pop ax ;caller return address 1.6 pop bx ; s 1.7 - push bx 1.8 - push ax 1.9 + ;push bx 1.10 + ;push ax 1.11 global die:near ; die(bx) 1.12 die: 1.13 call puts 1.14 @@ -878,18 +878,15 @@ 1.15 and al,0FCh 1.16 add [(image_himem di).size],eax ; m->size += m->chunk_size 1.17 or eax,eax 1.18 - jnz @@next 1.19 else 1.20 - mov cx,ax 1.21 - or cx,dx 1.22 add ax,3 1.23 adc dx,0 1.24 and al,0FCh 1.25 add [word (image_himem di).size],ax ; m->size += m->chunk_size 1.26 adc [word ((image_himem di).size)+2],dx 1.27 - inc cx ; jcxnz 1.28 - loop @@next 1.29 + or ax,dx 1.30 endif 1.31 + jnz @@next 1.32 pop [(image_himem di).state] 1.33 call [(image_himem di).next_chunk] ; m->next_chunk() 1.34 pop di
2.1 --- a/linld/stuff/src/JUMP.ASM Fri Nov 02 16:25:35 2018 +0100 2.2 +++ b/linld/stuff/src/JUMP.ASM Mon Nov 05 11:52:27 2018 +0100 2.3 @@ -105,11 +105,10 @@ 2.4 else 2.5 p386 2.6 mov ax,[_heap_top] 2.7 - ;shr ax,4 2.8 - db 0C1h,0E8h 2.9 -sssp: 2.10 - db 4 2.11 + shr ax,4 2.12 mov bx,9000h 2.13 + org $-4 2.14 +sssp dd ? 2.15 endif 2.16 mov es,bx 2.17 mov dx,cs
3.1 --- a/linld/stuff/src/MEMCPY32.ASM Fri Nov 02 16:25:35 2018 +0100 3.2 +++ b/linld/stuff/src/MEMCPY32.ASM Mon Nov 05 11:52:27 2018 +0100 3.3 @@ -122,10 +122,15 @@ 3.4 and di,[word dstofs] 3.5 inc cx 3.6 sub [word sz],cx 3.7 + ;jae @@movpara 3.8 + sbb [word sz+2],0 3.9 + jae @@movpara 3.10 + add cx,[word sz] 3.11 + ;stc 3.12 +@@movpara: 3.13 rep movsb 3.14 jae @@movlp 3.15 - dec [word sz+2] 3.16 - jns @@movlp ; mov 1-16 more bytes... 3.17 + dec cx ; set S 3.18 pop di 3.19 @@pmcopy: 3.20 pop si
4.1 --- a/linld/stuff/src/pipehole.awk Fri Nov 02 16:25:35 2018 +0100 4.2 +++ b/linld/stuff/src/pipehole.awk Mon Nov 05 11:52:27 2018 +0100 4.3 @@ -4,6 +4,7 @@ 4.4 if (hold == 0) { 4.5 s=$0 4.6 if (/^ mov .x,bx$/ || /^ mov .x,.i$/) { 4.7 + r=$2 4.8 hold=1; split($2,regs,","); next 4.9 } 4.10 if (/^ inc e?.[ix]/ || /^ dec e?.[ix]/) { 4.11 @@ -13,11 +14,10 @@ 4.12 hold=3; split($2,regs,","); next 4.13 } 4.14 if (/^ movzx eax,ax$/) { hold=4; next } 4.15 -if (0) { 4.16 - if (/^ cmp dx,-1$/) { hold=10; next } 4.17 -} 4.18 + if (/^ mov cl,4$/) { hold=8; next } 4.19 } 4.20 else if (hold == 1) { 4.21 + if (/^ ;/) { print; next } 4.22 hold=0; split($2,args,","); op="" 4.23 if ($1 == "add") op="+" 4.24 if ($1 == "sub") op="-" 4.25 @@ -25,7 +25,10 @@ 4.26 print "\tlea\t" regs[1] ",[" regs[2] op args[2] "]" 4.27 next 4.28 } 4.29 - print "\tmov\t" regs[1] "," regs[2] 4.30 + if (/^ pop [ds]i/ && regs[2] ~ /^[ds]i$/) { 4.31 + print " xchg " r 4.32 + } 4.33 + else print "\tmov\t" regs[1] "," regs[2] 4.34 } 4.35 else if (hold == 2) { 4.36 hold=0; split($2,args,","); print s 4.37 @@ -49,19 +52,14 @@ 4.38 print " push 0"; print " push ax"; next 4.39 } else { print s } 4.40 } 4.41 - else if (hold == 10) { 4.42 - if ($1 == "je" || $1 == "jne") { s2=$0; cmp=$1; hold++; next } 4.43 - hold=0; print s 4.44 - } 4.45 - else if (hold == 11) { 4.46 - if (/^ cmp ax,-1$/) { s3=$0; hold++; next } 4.47 - hold=0; print s; print s2 4.48 - } 4.49 - else if (hold == 12) { 4.50 - if (($1 == "je" || $1 == "jne") && $1 != cmp) { 4.51 - print " and ax,dx"; print " inc ax" 4.52 - } else { print s; print s2; print s3 } 4.53 + else if (hold == 8) { 4.54 hold=0 4.55 + if (/^ call near ptr N_LXURSH@$/) { 4.56 + print " extrn N_LXURSH@4:near" 4.57 + print " call near ptr N_LXURSH@4" 4.58 + next 4.59 + } 4.60 + print s 4.61 } 4.62 s=$0 4.63 # These optimisation may break ZF or CF
5.1 --- a/sshguard/receipt Fri Nov 02 16:25:35 2018 +0100 5.2 +++ b/sshguard/receipt Mon Nov 05 11:52:27 2018 +0100 5.3 @@ -1,14 +1,14 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="sshguard" 5.7 -VERSION="1.5" 5.8 +VERSION="2.2.0" 5.9 CATEGORY="security" 5.10 SHORT_DESC="Protects networked hosts from brute force attacks" 5.11 MAINTAINER="pascal.bellard@slitaz.org" 5.12 LICENSE="BSD" 5.13 -TARBALL="$PACKAGE-$VERSION.tar.bz2" 5.14 +TARBALL="$PACKAGE-$VERSION.tar.gz" 5.15 WEB_SITE="http://www.sshguard.net/" 5.16 -WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$PACKAGE-$VERSION/$TARBALL" 5.17 +WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$VERSION/$TARBALL" 5.18 TAGS="ssh" 5.19 5.20 DEPENDS="iptables" 5.21 @@ -17,7 +17,6 @@ 5.22 # Rules to configure and make the package. 5.23 compile_rules() 5.24 { 5.25 - cd $src 5.26 ./configure --prefix=/usr \ 5.27 --sysconfdir=/etc \ 5.28 --mandir=/usr/share/man \ 5.29 @@ -32,4 +31,5 @@ 5.30 { 5.31 mkdir -p $fs/usr 5.32 cp -a $install/usr/sbin $fs/usr 5.33 + cp -a $install/usr/libexec $fs/usr 5.34 }