summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2017-11-03 12:54:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-07 13:25:31 +0000
commite2d49ce3c4fb7186de6589231193a18102b68447 (patch)
tree3a7b9f3d37ea2122dedec7595975b4277248005b /meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
parentf5aa5aaa32ae14780ec35ecb13a2bbb244c5c207 (diff)
downloadpoky-e2d49ce3c4fb7186de6589231193a18102b68447.tar.gz
openssh: update to 7.6
LICENSE changed do to name being added removed patches included in some form (From OE-Core rev: 88770be201678bf1906e27d72e840de2cd4c43f0) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch')
-rw-r--r--meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch64
1 files changed, 21 insertions, 43 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch b/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
index adc25c668f..b8402a4dee 100644
--- a/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
+++ b/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
@@ -6,64 +6,42 @@ Adjust test cases to work with busybox.
6Signed-off-by: Maxin B. John <maxin.john@enea.com> 6Signed-off-by: Maxin B. John <maxin.john@enea.com>
7Upstream-Status: Pending 7Upstream-Status: Pending
8 8
9Index: openssh-6.8p1/regress/cipher-speed.sh 9Index: openssh-7.6p1/regress/cipher-speed.sh
10=================================================================== 10===================================================================
11--- openssh-6.8p1.orig/regress/cipher-speed.sh 11--- openssh-7.6p1.orig/regress/cipher-speed.sh
12+++ openssh-6.8p1/regress/cipher-speed.sh 12+++ openssh-7.6p1/regress/cipher-speed.sh
13@@ -17,7 +17,7 @@ for c in `${SSH} -Q cipher`; do n=0; for 13@@ -17,7 +17,7 @@ for c in `${SSH} -Q cipher`; do n=0; for
14 printf "%-60s" "$c/$m:" 14 printf "%-60s" "$c/$m:"
15 ( ${SSH} -o 'compression no' \ 15 ( ${SSH} -o 'compression no' \
16 -F $OBJ/ssh_proxy -2 -m $m -c $c somehost \ 16 -F $OBJ/ssh_proxy -m $m -c $c somehost \
17- exec sh -c \'"dd of=/dev/null obs=32k"\' \ 17- exec sh -c \'"dd of=/dev/null obs=32k"\' \
18+ exec sh -c \'"dd of=/dev/null bs=32k"\' \ 18+ exec sh -c \'"dd of=/dev/null bs=32k"\' \
19 < ${DATA} ) 2>&1 | getbytes 19 < ${DATA} ) 2>&1 | getbytes
20 20
21 if [ $? -ne 0 ]; then 21 if [ $? -ne 0 ]; then
22@@ -42,7 +42,7 @@ for c in $ciphers; do 22Index: openssh-7.6p1/regress/transfer.sh
23 printf "%-60s" "$c:"
24 ( ${SSH} -o 'compression no' \
25 -F $OBJ/ssh_proxy -1 -c $c somehost \
26- exec sh -c \'"dd of=/dev/null obs=32k"\' \
27+ exec sh -c \'"dd of=/dev/null bs=32k"\' \
28 < ${DATA} ) 2>&1 | getbytes
29 if [ $? -ne 0 ]; then
30 fail "ssh -1 failed with cipher $c"
31Index: openssh-6.8p1/regress/transfer.sh
32===================================================================
33--- openssh-6.8p1.orig/regress/transfer.sh
34+++ openssh-6.8p1/regress/transfer.sh
35@@ -15,7 +15,7 @@ for p in ${SSH_PROTOCOLS}; do
36 for s in 10 100 1k 32k 64k 128k 256k; do
37 trace "proto $p dd-size ${s}"
38 rm -f ${COPY}
39- dd if=$DATA obs=${s} 2> /dev/null | \
40+ dd if=$DATA bs=${s} 2> /dev/null | \
41 ${SSH} -q -$p -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
42 if [ $? -ne 0 ]; then
43 fail "ssh cat $DATA failed"
44Index: openssh-6.8p1/regress/yes-head.sh
45=================================================================== 23===================================================================
46--- openssh-6.8p1.orig/regress/yes-head.sh 24--- openssh-7.6p1.orig/regress/transfer.sh
47+++ openssh-6.8p1/regress/yes-head.sh 25+++ openssh-7.6p1/regress/transfer.sh
48@@ -4,7 +4,7 @@ 26@@ -13,7 +13,7 @@ cmp ${DATA} ${COPY} || fail "corrupted
49 tid="yes pipe head" 27 for s in 10 100 1k 32k 64k 128k 256k; do
50 28 trace "dd-size ${s}"
51 for p in ${SSH_PROTOCOLS}; do 29 rm -f ${COPY}
52- lines=`${SSH} -$p -F $OBJ/ssh_proxy thishost 'sh -c "while true;do echo yes;done | _POSIX2_VERSION=199209 head -2000"' | (sleep 3 ; wc -l)` 30- dd if=$DATA obs=${s} 2> /dev/null | \
53+ lines=`${SSH} -$p -F $OBJ/ssh_proxy thishost 'sh -c "while true;do echo yes;done | _POSIX2_VERSION=199209 head -n 2000"' | (sleep 3 ; wc -l)` 31+ dd if=$DATA bs=${s} 2> /dev/null | \
32 ${SSH} -q -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
54 if [ $? -ne 0 ]; then 33 if [ $? -ne 0 ]; then
55 fail "yes|head test failed" 34 fail "ssh cat $DATA failed"
56 lines = 0; 35Index: openssh-7.6p1/regress/key-options.sh
57Index: openssh-6.8p1/regress/key-options.sh
58=================================================================== 36===================================================================
59--- openssh-6.8p1.orig/regress/key-options.sh 37--- openssh-7.6p1.orig/regress/key-options.sh
60+++ openssh-6.8p1/regress/key-options.sh 38+++ openssh-7.6p1/regress/key-options.sh
61@@ -54,7 +54,7 @@ for p in ${SSH_PROTOCOLS}; do 39@@ -47,7 +47,7 @@ for f in 127.0.0.1 '127.0.0.0\/8'; do
62 fi 40 fi
63 41
64 sed 's/.*/from="'"$f"'" &/' $origkeys >$authkeys 42 sed 's/.*/from="'"$f"'" &/' $origkeys >$authkeys
65- from=`head -1 $authkeys | cut -f1 -d ' '` 43- from=`head -1 $authkeys | cut -f1 -d ' '`
66+ from=`head -n 1 $authkeys | cut -f1 -d ' '` 44+ from=`head -n 1 $authkeys | cut -f1 -d ' '`
67 verbose "key option proto $p $from" 45 verbose "key option $from"
68 r=`${SSH} -$p -q -F $OBJ/ssh_proxy somehost 'echo true'` 46 r=`${SSH} -q -F $OBJ/ssh_proxy somehost 'echo true'`
69 if [ "$r" = "true" ]; then 47 if [ "$r" = "true" ]; then
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-01 08:49:46 +0000