initial commit for Enea Linux 5.0-ppc

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>

5 files changed, 62 insertions, 69 deletions

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch
new file mode 100644
index 0000000000..4ebf2dcee4
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch
@@ -0,0 +1,59 @@
+commit 25e83c2270b2d2966c992885faed0b79be09f474
+Author: Jeff Layton <jlayton@poochiereds.net>
+Date:   Thu May 1 11:15:16 2014 -0400
+
+    mountd: fix segfault in add_name with newer gcc compilers
+    
+    I hit a segfault in add_name with a mountd built with gcc-4.9.0. Some
+    NULL pointer checks got reordered such that a pointer was dereferenced
+    before checking to see whether it was NULL. The problem was due to
+    nfs-utils relying on undefined behavior, which tricked gcc into assuming
+    that the pointer would never be NULL.
+    
+    At first I assumed that this was a compiler bug, but Jakub Jelinek and
+    Jeff Law pointed out:
+    
+    "If old is NULL, then:
+    
+        strncpy(new, old, cp-old);
+    
+    is undefined behavior (even when cp == old == NULL in that case),
+    therefore gcc assumes that old is never NULL, as otherwise it would be
+    invalid.
+    
+    Just guard
+        strncpy(new, old, cp-old);
+        new[cp-old] = 0;
+    with if (old) { ... }."
+    
+    This patch does that. If old is NULL though, then we still need to
+    ensure that new is NULL terminated, lest the subsequent strcats walk off
+    the end of it.
+    
+    Cc: Jeff Law <law@redhat.com>
+    Cc: Jakub Jelinek <jakub@redhat.com>
+    Signed-off-by: Jeff Layton <jlayton@poochiereds.net>
+    Signed-off-by: Steve Dickson <steved@redhat.com>
+
+    Upstream-Status:Backport
+    Signed-off-by: Tudor Florea <tudor.florea@enea.com>
+
+diff --git a/support/export/client.c b/support/export/client.c
+index dbf47b9..f85e11c 100644
+--- a/support/export/client.c
++++ b/support/export/client.c
+@@ -482,8 +482,12 @@ add_name(char *old, const char *add)
+                else
+                        cp = cp + strlen(cp);
+        }
+-       strncpy(new, old, cp-old);
+-       new[cp-old] = 0;
++       if (old) {
++               strncpy(new, old, cp-old);
++               new[cp-old] = 0;
++       } else {
++               new[0] = 0;
++       }
+        if (cp != old && !*cp)
+                strcat(new, ",");
+        strcat(new, add);
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
index 6e6d09bf42..dcdb35e51c 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
@@ -31,6 +31,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
            file://nfs-statd.service \
            file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
            file://0001-statd-fixed-the-with-statdpath-flag.patch \
+           file://fix-segfault-in-add_name.patch \
 "
 
 SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8"
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"