summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch38
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.8p1.bb (renamed from meta/recipes-connectivity/openssh/openssh_6.7p1.bb)4
2 files changed, 25 insertions, 17 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 07af667869..adc25c668f 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,10 +6,12 @@ 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
9--- a/regress/cipher-speed.sh 2012-06-30 07:08:53.000000000 +0200 9Index: openssh-6.8p1/regress/cipher-speed.sh
10+++ b/regress/cipher-speed.sh 2013-02-15 11:30:20.670022055 +0100 10===================================================================
11@@ -26,7 +26,7 @@ 11--- openssh-6.8p1.orig/regress/cipher-speed.sh
12 echon "$c/$m:\t" 12+++ openssh-6.8p1/regress/cipher-speed.sh
13@@ -17,7 +17,7 @@ for c in `${SSH} -Q cipher`; do n=0; for
14 printf "%-60s" "$c/$m:"
13 ( ${SSH} -o 'compression no' \ 15 ( ${SSH} -o 'compression no' \
14 -F $OBJ/ssh_proxy -2 -m $m -c $c somehost \ 16 -F $OBJ/ssh_proxy -2 -m $m -c $c somehost \
15- exec sh -c \'"dd of=/dev/null obs=32k"\' \ 17- exec sh -c \'"dd of=/dev/null obs=32k"\' \
@@ -17,8 +19,8 @@ Upstream-Status: Pending
17 < ${DATA} ) 2>&1 | getbytes 19 < ${DATA} ) 2>&1 | getbytes
18 20
19 if [ $? -ne 0 ]; then 21 if [ $? -ne 0 ]; then
20@@ -42,7 +42,7 @@ 22@@ -42,7 +42,7 @@ for c in $ciphers; do
21 echon "$c:\t" 23 printf "%-60s" "$c:"
22 ( ${SSH} -o 'compression no' \ 24 ( ${SSH} -o 'compression no' \
23 -F $OBJ/ssh_proxy -1 -c $c somehost \ 25 -F $OBJ/ssh_proxy -1 -c $c somehost \
24- exec sh -c \'"dd of=/dev/null obs=32k"\' \ 26- exec sh -c \'"dd of=/dev/null obs=32k"\' \
@@ -26,9 +28,11 @@ Upstream-Status: Pending
26 < ${DATA} ) 2>&1 | getbytes 28 < ${DATA} ) 2>&1 | getbytes
27 if [ $? -ne 0 ]; then 29 if [ $? -ne 0 ]; then
28 fail "ssh -1 failed with cipher $c" 30 fail "ssh -1 failed with cipher $c"
29--- a/regress/transfer.sh 2003-09-04 06:54:40.000000000 +0200 31Index: openssh-6.8p1/regress/transfer.sh
30+++ b/regress/transfer.sh 2013-02-15 11:25:34.666411185 +0100 32===================================================================
31@@ -18,7 +18,7 @@ 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
32 for s in 10 100 1k 32k 64k 128k 256k; do 36 for s in 10 100 1k 32k 64k 128k 256k; do
33 trace "proto $p dd-size ${s}" 37 trace "proto $p dd-size ${s}"
34 rm -f ${COPY} 38 rm -f ${COPY}
@@ -37,20 +41,24 @@ Upstream-Status: Pending
37 ${SSH} -q -$p -F $OBJ/ssh_proxy somehost "cat > ${COPY}" 41 ${SSH} -q -$p -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
38 if [ $? -ne 0 ]; then 42 if [ $? -ne 0 ]; then
39 fail "ssh cat $DATA failed" 43 fail "ssh cat $DATA failed"
40--- a/regress/yes-head.sh 2005-11-28 06:41:03.000000000 +0100 44Index: openssh-6.8p1/regress/yes-head.sh
41+++ b/regress/yes-head.sh 2013-02-15 11:55:11.413715068 +0100 45===================================================================
46--- openssh-6.8p1.orig/regress/yes-head.sh
47+++ openssh-6.8p1/regress/yes-head.sh
42@@ -4,7 +4,7 @@ 48@@ -4,7 +4,7 @@
43 tid="yes pipe head" 49 tid="yes pipe head"
44 50
45 for p in 1 2; do 51 for p in ${SSH_PROTOCOLS}; do
46- 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)` 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)`
47+ 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)` 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)`
48 if [ $? -ne 0 ]; then 54 if [ $? -ne 0 ]; then
49 fail "yes|head test failed" 55 fail "yes|head test failed"
50 lines = 0; 56 lines = 0;
51--- a/regress/key-options.sh 2008-07-04 09:08:58.000000000 +0200 57Index: openssh-6.8p1/regress/key-options.sh
52+++ b/regress/key-options.sh 2013-02-15 12:06:05.109486098 +0100 58===================================================================
53@@ -54,7 +54,7 @@ 59--- openssh-6.8p1.orig/regress/key-options.sh
60+++ openssh-6.8p1/regress/key-options.sh
61@@ -54,7 +54,7 @@ for p in ${SSH_PROTOCOLS}; do
54 fi 62 fi
55 63
56 sed 's/.*/from="'"$f"'" &/' $origkeys >$authkeys 64 sed 's/.*/from="'"$f"'" &/' $origkeys >$authkeys
diff --git a/meta/recipes-connectivity/openssh/openssh_6.7p1.bb b/meta/recipes-connectivity/openssh/openssh_6.8p1.bb
index a2726291fe..8e07e00029 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.7p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.8p1.bb
@@ -25,8 +25,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
25 25
26PAM_SRC_URI = "file://sshd" 26PAM_SRC_URI = "file://sshd"
27 27
28SRC_URI[md5sum] = "3246aa79317b1d23cae783a3bf8275d6" 28SRC_URI[md5sum] = "08f72de6751acfbd0892b5f003922701"
29SRC_URI[sha256sum] = "b2f8394eae858dabbdef7dac10b99aec00c95462753e80342e530bbb6f725507" 29SRC_URI[sha256sum] = "3ff64ce73ee124480b5bf767b9830d7d3c03bbcb6abe716b78f0192c37ce160e"
30 30
31inherit useradd update-rc.d update-alternatives systemd 31inherit useradd update-rc.d update-alternatives systemd
32 32
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-11 21:57:37 +0000