# HG changeset patch # User Pascal Bellard # Date 1473415588 -7200 # Node ID 4ebd023252ac7a2385fad945a317b4c9238b1d12 # Parent fd3dadf90ba9f0bfd51c2c54379215570d89b21d Up openssh (7.3p1) diff -r fd3dadf90ba9 -r 4ebd023252ac memtest/stuff/pack --- a/memtest/stuff/pack Mon Sep 05 18:15:15 2016 +0200 +++ b/memtest/stuff/pack Fri Sep 09 12:06:28 2016 +0200 @@ -3,17 +3,22 @@ set -- ${2:-bootloader.bin} ${3:-unpack.bin} x=$(grep -s packed_syssize$ ${2/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') [ -n "$x" ] && sed -i "s/XXXP/$((513+0x$x))/" $0 || sed -i "/XXXP$/d" $0 - x=$(grep -s original_syssize$ ${2/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') - [ -n "$x" ] && sed -i "s/XXXO/$((513+0x$x))/" $0 || sed -i "/XXXO$/d" $0 - x=$(grep -s original_setupsize$ ${2/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') - [ -n "$x" ] && sed -i "s/XXXS/$((516+0x$x))/" $0 || sed -i "/XXXS$/d" $0 - grep -q 83C60D ${3/.bin/.lst} && sed -i 's/ | dd bs=1 skip=13//' $0 + x=$(grep -s setup_byte$ ${2/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') + [ -n "$x" ] && sed -i "s/XXXSB/$((513+0x$x))/" $0 || sed -i "/XXXSB/d" $0 + x=$(grep -s setup_word$ ${2/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') + [ -n "$x" ] && sed -i "s/XXXSW/$((514+0x$x))/" $0 || sed -i "/XXXSW/d" $0 + x=$(grep -s setup_para$ ${2/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') + [ -n "$x" ] && sed -i "s/XXXSP/$((514+0x$x))/" $0 || sed -i "/XXXSP/d" $0 + x=$(grep -s setup_seg$ ${2/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') + [ -n "$x" ] && sed -i "s/XXXSS/$((513+0x$x))/" $0 || sed -i "/XXXSS/d" $0 + grep -q BFF401 ${2/.bin/.lst} && sed -i 's/512 skip/500 skip/;s/1000 -/&32 - /' $0 + grep -q 83C60D ${2/.bin/.lst} && sed -i 's/ | dd bs=1 skip=13//' $0 helpmsg=$(sed '/helpmsg:/!d{n;s/ [0-9]* \([^ ]*\).*/\1/}' ${1/.bin/.lst} | sed '$!d') helpend=$(sed '/helpend:/!d{n;s/ [0-9]* \([^ ]*\).*/\1/}' ${1/.bin/.lst} | sed '$!d') sed -i "s/YYY/$((0x$helpmsg))/" $0 sed -i "s/ZZZ/$((0x$helpend-0x$helpmsg-1))/" $0 cat >> $0 < /dev/null | cat - $2 | gzip -9 | uuencode -m -) EOT EOM sed -i '/--build/,/^fi/d' $0 @@ -42,12 +47,13 @@ [ $setup -eq 0 ] && setup=4 syssize="$(echo $(od -j 500 -N 2 -dAn $1))" [ $syssize -eq 0 ] && syssize=$((($(stat -c %s $1) + 15 - 512*($setup + 1))/16)) - store $syssize $2 XXXO - store $setup $2 XXXS 1 - dd if=$1 bs=512 count=$setup skip=1 | compress >>$2 - dd if=$1 bs=16 count=$syssize skip=$((32*(1+$setup))) | compress >>$2 + store $setup $2 XXXSB 1 + store $setup $2 XXXSW 1 + store $((32 * $setup)) $2 XXXSP + store $((0x1000 - 32*$setup)) $2 XXXSS + dd if=$1 bs=512 skip=1 | compress >>$2 size=$(stat -c %s $2) - store $((($size-2560+15)/16)) $2 XXXP + store $((($size-2560+15)/16 + 0x1000)) $2 XXXP store $((($size-2560+15)/16)) $2 500 store 4 $2 497 1 store $((($size+511)/512)) $2 4 diff -r fd3dadf90ba9 -r 4ebd023252ac memtest/stuff/unpack.S --- a/memtest/stuff/unpack.S Mon Sep 05 18:15:15 2016 +0200 +++ b/memtest/stuff/unpack.S Fri Sep 09 12:06:28 2016 +0200 @@ -1,17 +1,16 @@ #define TOP (0x90000+_start-end) #define SYSTEM 0x10000 -#define SETUP 4 +#define SETUP 14 #define SYSSIZE 0x1F4 #define SETUPSIZE 0x1F1 -#define CHANGE_STACK 0 #define LINUX_HEADER 0 #define UPDATE_SYSSIZE 1 #define HARDCODED_SYSSIZE 1 #define HARDCODED_SETUPSIZE 1 -#define HARDCODED_IP 1 #define FLAT16 1 //#define FLAT16OUT 0 +#define SAVEREGS 0 .text .code16 @@ -35,173 +34,176 @@ .long 0 // 220 bootsect_kludge start2: #endif - pushf +#if SAVEREGS + pushfw pushw %cs -#if HARDCODED_IP pushw $0 + pushal + pushw %ds #else - call getip -getip: + pushw %cs + pushw $0 #endif - pushal -#if !FLAT16 -#undef FLAT16 -#if HARDCODED_SYSSIZE -packed_syssize: - movw $0, %bx // system size +#if UPDATE_SYSSIZE + pushw %ds #else - movw SYSSIZE, %bx + pushw %es + pushw %cs #endif -#endif -#if HARDCODED_SETUPSIZE == 0 - xorw %dx, %dx - movb SETUPSIZE, %dh -#endif -#if HARDCODED_IP + cld +#if FLAT16 +# 1- move 9020..9020+stp -> 8000 +# if HARDCODED_SETUPSIZE +setup_word: + movw $SETUP*256, %cx +# else + xorw %cx, %cx + movb SETUPSIZE, %ch + movw %cx, %dx +# endif + pushw %cx + pushw $0x8000 + popw %es xorw %si, %si -#else - movw %sp, %bp -#define START_IP 32(%bp) - subw $getip-_start, START_IP - movw START_IP, %si -#endif - pushw %ds + xorw %di, %di + rep + movsw %cs:(%si),%es:(%di) pushw %es - - cld - -#if FLAT16 -flat16mv: -#if CHANGE_STACK -STKSZ=0x9000-0x0990 - pushw $(TOP-STKSZ)/16-0x1000 -#else - pushw $TOP/16-0x1000 -#endif - popw %es - pushw %es // moved - .byte 0x6A, moved-_start // unpack code - pushw %cs - popw %ds - xorw %di, %di -#if HARDCODED_SETUPSIZE - movw $SETUP*256, %cx -#else - xorw %cx, %cx - movw SETUPSIZE, %ch -#endif - pushw %si - rep - movsw // move header part - movw $0x1000, %bp - movw %bp, %ds + // pushw $cont + .byte 0x6A, cont + lret +cont: +# 2- move 1000..1000+sys -> 8000+stp + pushw $0x1000 + popw %ds xorw %si, %si subw %di, %cx rep - movsb // move system part - popw %di - movw $end-_start, %si -#else -#if CHANGE_STACK -STKSZ=0x9000-0x0990 - movw $(TOP-STKSZ)/16, %ax + movsb +# 3- unlz(8000+stp:end, 1000-stp:0) + pushw %es +# if HARDCODED_SETUPSIZE +setup_seg: +# if UPDATE_SYSSIZE + pushw $0x1000-(SETUP*32)-32 +# else + pushw $0x1000-(SETUP*32) +# endif + popw %es +# else +# if UPDATE_SYSSIZE + incb %dh +# endif + shrw $3, %dx + movw %ds, %ax + subw %dx, %ax + movw %ax, %es +# endif #else - movw $TOP/16, %ax -#endif - movw %ax, %es - pushw %es // moved - .byte 0x6A, moved-_start // unpack code - pushw %cs - popw %ds +# 1- move 1000..1000+sys -> 9000-sys +# if HARDCODED_SYSSIZE +packed_syssize: + movw $0x1000+0, %ax +# else + movw SYSSIZE, %ax + addw $0x1000, %ax +# endif + movw %ds, %dx +mvsys: + decw %ax + decw %dx + movw %ax, %ds + movw %dx, %es + xorw %si, %si + xorw %di, %di + movw $8, %cx + rep + movsw + cmpw $0x1000, %ax + jne mvsys +# 2- move 9020..9020+stp -> 9000-sys-stp + +# if HARDCODED_SETUPSIZE +setup_byte: + movb $SETUP, %ch +setup_para: + subw $SETUP*32, %dx +# else + movb %ss:SETUPSIZE, %ch + movw %cx, %ax + shrw $3, %ax + subw %ax, %dx +# endif + pushw %cx + movw %dx, %es + xorw %si, %si + xorw %di, %di + rep + movsw %cs:(%si),%es:(%di) + pushw %es +# 3- reloc itself in 0x7C00 + pushw $0x07C0 + popw %es + xorw %si, %si xorw %di, %di movw $end-_start, %cx - pushw %cx - pushw %si rep - movsb // move upack code to $TOP - - leaw SYSTEM/16(%bx), %bp -movlp: - decw %bp - movw %bp, %ds - decw %ax + movsb %cs:(%si),%es:(%di) + pushw %es + // pushw $cont + .byte 0x6A, cont + lret +cont: +# 4- unlz(9000-sys-stp:end, 1000-stp:0) +# if HARDCODED_SETUPSIZE +setup_seg: +# if UPDATE_SYSSIZE + pushw $0x1000-(SETUP*32)-32 +# else + pushw $0x1000-(SETUP*32) +# endif + popw %es +# else + negw %ax +# if UPDATE_SYSSIZE + addw $0x1000-32, %ax +# else + addw $0x1000, %ax +# endif movw %ax, %es - xorw %si, %si +# endif +#endif + popw %ds + movw $end-_start, %si +#if UPDATE_SYSSIZE + movw $SYSSIZE, %di +#else xorw %di, %di - movb $8, %cl - rep - movsw // move system part - decw %bx - jnz movlp - - pushw %cs +#endif + pushw %di + pushw %es + call unpack popw %ds popw %si - xorw %di, %di -#if HARDCODED_SETUPSIZE - movb $SETUP, %ch - subw $SETUP*32, %ax -#else - movb %dh, %ch - shrw $3, %dx - subw %dx, %ax -#endif - movw %ax, %es - pushw %si - rep - movsw // move header part - popw %di - popw %si -#endif - pushw %es - popw %ds - pushw %cs - popw %es // restore setup seg - retf - -moved: -#if CHANGE_STACK - movw $STKSZ, %ax // trick: %ss = %sp - movw %ss, %bx - pushw %ax - popw %ss - xchgw %ax, %sp - pushw %bx // %ss - pushw %ax // %sp -#endif - pushw %bp // SYSTEM/16 - call unpack // unpack setup - popw %es - xorw %di,%di - call unpack // unpack system -#if CHANGE_STACK - popw %ax // %sp - popw %ss - xchgw %ax, %sp -#endif + movw %si, %di + popw %cx #if UPDATE_SYSSIZE -# if HARDCODED_SYSSIZE -original_syssize: - movw $0, %ax -# else - addw $15, %di - shrw $4, %di - movw %es, %ax - addw %di, %ax - subw $SYSTEM/16, %ax -# endif +// not need with memtest movb $(512-SYSSIZE)/2, %cl #endif popw %es +# 5- move 1000-stp..1000 -> 9020 + rep + movsw +#if UPDATE_SYSSIZE == 0 + popw %es +#endif +#if SAVEREGS popw %ds -#if UPDATE_SYSSIZE - movw %ax, SYSSIZE -# if HARDCODED_SETUPSIZE -original_setupsize: - movb $4, SETUPSIZE -# endif -#endif popal iret +#else + lret +#endif unpack: #define NO_LZMA_HEADER diff -r fd3dadf90ba9 -r 4ebd023252ac openssh-pam/receipt --- a/openssh-pam/receipt Mon Sep 05 18:15:15 2016 +0200 +++ b/openssh-pam/receipt Fri Sep 09 12:06:28 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="openssh-pam" -VERSION="7.1p2" +VERSION="7.3p1" CATEGORY="security" SHORT_DESC="Openbsd Secure Shell using PAM." MAINTAINER="pascal.bellard@slitaz.org" diff -r fd3dadf90ba9 -r 4ebd023252ac openssh/receipt --- a/openssh/receipt Mon Sep 05 18:15:15 2016 +0200 +++ b/openssh/receipt Fri Sep 09 12:06:28 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="openssh" -VERSION="7.2p2" +VERSION="7.3p1" CATEGORY="security" SHORT_DESC="Openbsd Secure Shell." MAINTAINER="pascal.bellard@slitaz.org" diff -r fd3dadf90ba9 -r 4ebd023252ac sftp-server/receipt --- a/sftp-server/receipt Mon Sep 05 18:15:15 2016 +0200 +++ b/sftp-server/receipt Fri Sep 09 12:06:28 2016 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="sftp-server" -VERSION="7.2p2" +VERSION="7.3p1" CATEGORY="security" SHORT_DESC="Openbsd Secure FTP server." MAINTAINER="pascal.bellard@slitaz.org"