From 791bb999eef6da39d2160701f7d308e86113eefd Mon Sep 17 00:00:00 2001
From: Adrian Dudau <adrian.dudau@enea.com>
Date: Fri, 15 Jan 2016 17:17:43 +0100
Subject: initial commit for Enea Linux 5.0-ppc

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
---
 .../files/add-test-support-for-busybox.patch       | 61 ----------------------
 meta/recipes-connectivity/openssh/files/run-ptest  |  7 ---
 meta/recipes-connectivity/openssh/openssh_6.6p1.bb |  3 +-
 3 files changed, 2 insertions(+), 69 deletions(-)
 delete mode 100644 meta/recipes-connectivity/openssh/files/add-test-support-for-busybox.patch
 delete mode 100755 meta/recipes-connectivity/openssh/files/run-ptest

(limited to 'meta/recipes-connectivity/openssh')

diff --git a/meta/recipes-connectivity/openssh/files/add-test-support-for-busybox.patch b/meta/recipes-connectivity/openssh/files/add-test-support-for-busybox.patch
deleted file mode 100644
index 5913597dfd..0000000000
--- a/meta/recipes-connectivity/openssh/files/add-test-support-for-busybox.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Adjust test cases to work with busybox.
-
-- Replace dd parameter "obs" with "bs".
-- Replace "head -<num>" with "head -n <num>".
-
-Signed-off-by: Björn Stenberg <bjst@enea.com>
-Upstream-status: Pending
-
---- a/regress/cipher-speed.sh	2012-06-30 07:08:53.000000000 +0200
-+++ b/regress/cipher-speed.sh	2013-02-15 11:30:20.670022055 +0100
-@@ -26,7 +26,7 @@
- 		echon "$c/$m:\t"
- 		( ${SSH} -o 'compression no' \
- 			-F $OBJ/ssh_proxy -2 -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
-@@ -42,7 +42,7 @@
- 		echon "$c:\t"
- 		( ${SSH} -o 'compression no' \
- 			-F $OBJ/ssh_proxy -1 -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
- 			fail "ssh -1 failed with cipher $c"
---- a/regress/transfer.sh	2003-09-04 06:54:40.000000000 +0200
-+++ b/regress/transfer.sh	2013-02-15 11:25:34.666411185 +0100
-@@ -18,7 +18,7 @@
- 	for s in 10 100 1k 32k 64k 128k 256k; do
- 		trace "proto $p dd-size ${s}"
- 		rm -f ${COPY}
--		dd if=$DATA obs=${s} 2> /dev/null | \
-+		dd if=$DATA bs=${s} 2> /dev/null | \
- 			${SSH} -q -$p -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
- 		if [ $? -ne 0 ]; then
- 			fail "ssh cat $DATA failed"
---- a/regress/yes-head.sh	2005-11-28 06:41:03.000000000 +0100
-+++ b/regress/yes-head.sh	2013-02-15 11:55:11.413715068 +0100
-@@ -4,7 +4,7 @@
- tid="yes pipe head"
- 
- for p in 1 2; do
--	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)`
-+	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)`
- 	if [ $? -ne 0 ]; then
- 		fail "yes|head test failed"
- 		lines = 0;
---- a/regress/key-options.sh	2008-07-04 09:08:58.000000000 +0200
-+++ b/regress/key-options.sh	2013-02-15 12:06:05.109486098 +0100
-@@ -54,7 +54,7 @@
- 	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 proto $p $from"
- 	r=`${SSH} -$p -q -F $OBJ/ssh_proxy somehost 'echo true'`
- 	if [ "$r" = "true" ]; then
diff --git a/meta/recipes-connectivity/openssh/files/run-ptest b/meta/recipes-connectivity/openssh/files/run-ptest
deleted file mode 100755
index 3e725cf282..0000000000
--- a/meta/recipes-connectivity/openssh/files/run-ptest
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-export TEST_SHELL=sh
-
-cd regress
-make -k .OBJDIR=`pwd` .CURDIR=`pwd` tests \
-        | sed -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e 's/^failed/FAIL: /g'
diff --git a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
index f575665e4c..3807583d95 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.6p1.bb
@@ -25,7 +25,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
            file://run-ptest \
            file://openssh-CVE-2014-2532.patch \
            file://openssh-CVE-2014-2653.patch \
-           file://auth2-none.c-avoid-authenticate-empty-passwords-to-m.patch"
+           file://auth2-none.c-avoid-authenticate-empty-passwords-to-m.patch \
+           file://openssh-ptest-fix-sshconnect.patch"
 
 PAM_SRC_URI = "file://sshd"
 
-- 
cgit v1.2.3-54-g00ecf