summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
blob: b8402a4dee015f82a7e2ebb20313c6cfa6c297d1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
Adjust test cases to work with busybox.

- Replace dd parameter "obs" with "bs".
- Replace "head -<num>" with "head -n <num>".

Signed-off-by: Maxin B. John <maxin.john@enea.com>
Upstream-Status: Pending

Index: openssh-7.6p1/regress/cipher-speed.sh
===================================================================
--- openssh-7.6p1.orig/regress/cipher-speed.sh
+++ openssh-7.6p1/regress/cipher-speed.sh
@@ -17,7 +17,7 @@ for c in `${SSH} -Q cipher`; do n=0; for
 		printf "%-60s" "$c/$m:"
 		( ${SSH} -o 'compression no' \
 			-F $OBJ/ssh_proxy -m $m -c $c somehost \
-			exec sh -c \'"dd of=/dev/null obs=32k"\' \
+			exec sh -c \'"dd of=/dev/null bs=32k"\' \
 		< ${DATA} ) 2>&1 | getbytes
 
 		if [ $? -ne 0 ]; then
Index: openssh-7.6p1/regress/transfer.sh
===================================================================
--- openssh-7.6p1.orig/regress/transfer.sh
+++ openssh-7.6p1/regress/transfer.sh
@@ -13,7 +13,7 @@ cmp ${DATA} ${COPY}		|| fail "corrupted
 for s in 10 100 1k 32k 64k 128k 256k; do
 	trace "dd-size ${s}"
 	rm -f ${COPY}
-	dd if=$DATA obs=${s} 2> /dev/null | \
+	dd if=$DATA bs=${s} 2> /dev/null | \
 		${SSH} -q -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
 	if [ $? -ne 0 ]; then
 		fail "ssh cat $DATA failed"
Index: openssh-7.6p1/regress/key-options.sh
===================================================================
--- openssh-7.6p1.orig/regress/key-options.sh
+++ openssh-7.6p1/regress/key-options.sh
@@ -47,7 +47,7 @@ for f in 127.0.0.1 '127.0.0.0\/8'; do
 	fi
 
 	sed 's/.*/from="'"$f"'" &/' $origkeys >$authkeys
-	from=`head -1 $authkeys | cut -f1 -d ' '`
+	from=`head -n 1 $authkeys | cut -f1 -d ' '`
 	verbose "key option $from"
 	r=`${SSH} -q -F $OBJ/ssh_proxy somehost 'echo true'`
 	if [ "$r" = "true" ]; then