summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Dudau <adrian.dudau@enea.com>2016-01-15 16:17:43 (GMT)
committerAdrian Dudau <adrian.dudau@enea.com>2016-01-15 16:17:43 (GMT)
commit791bb999eef6da39d2160701f7d308e86113eefd (patch)
treef4ca859a22b4e29f527f51c05b742b1968e9b6c8
parentcc1d3f0edb1a8d2bdd24aa34c654c2135e0854fe (diff)
downloadpoky-791bb999eef6da39d2160701f7d308e86113eefd.tar.gz
initial commit for Enea Linux 5.0-ppc
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
-rwxr-xr-xenea-init-build-env5
-rw-r--r--meta/files/toolchain-shar-template.sh2
-rw-r--r--meta/lib/oe/package_manager.py83
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch59
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb1
-rw-r--r--meta/recipes-connectivity/openssh/files/add-test-support-for-busybox.patch61
-rwxr-xr-xmeta/recipes-connectivity/openssh/files/run-ptest7
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.6p1.bb3
-rw-r--r--meta/recipes-devtools/python/python/python-2.7.3-CVE-2013-1752-httplib-fix.patch2
-rw-r--r--meta/recipes-support/gnutls/gnutls/CVE-2015-6251.patch27
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.3.5.bb1
11 files changed, 147 insertions, 104 deletions
diff --git a/enea-init-build-env b/enea-init-build-env
index 9bc5bab..ba545a9 100755
--- a/enea-init-build-env
+++ b/enea-init-build-env
@@ -200,10 +200,7 @@ else
200 echo "*** Info: Inheriting distrodata." 200 echo "*** Info: Inheriting distrodata."
201 fi 201 fi
202 202
203 echo -e '\nLICENSE_FLAGS_WHITELIST += "non-commercial"\n' >> conf/local.conf 203 if [[ -n $DISTRO ]]; then
204 echo "*** Info: Need to set LICENSE_FLAGS_WHITELIST for netperf"
205
206 if [[ -n $DISTRO ]]; then
207 sed -i -e "s|^DISTRO.*|DISTRO ?= \"$DISTRO\"|" conf/local.conf 204 sed -i -e "s|^DISTRO.*|DISTRO ?= \"$DISTRO\"|" conf/local.conf
208 sed -i -e 's|^PACKAGE_CLASSES ?= "package_rpm"|PACKAGE_CLASSES ?= "package_rpm package_ipk"|' conf/local.conf 205 sed -i -e 's|^PACKAGE_CLASSES ?= "package_rpm"|PACKAGE_CLASSES ?= "package_rpm package_ipk"|' conf/local.conf
209 echo "*** Info: Setting PACKAGE_CLASSES to ipk and rpm" 206 echo "*** Info: Setting PACKAGE_CLASSES to ipk and rpm"
diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-template.sh
index 4a7fbd5..b8c5685 100644
--- a/meta/files/toolchain-shar-template.sh
+++ b/meta/files/toolchain-shar-template.sh
@@ -1,5 +1,7 @@
1#!/bin/bash 1#!/bin/bash
2 2
3[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 "$0" "$@"
4
3INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") 5INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
4SDK_ARCH=$(echo @SDK_ARCH@ | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") 6SDK_ARCH=$(echo @SDK_ARCH@ | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
5 7
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 5055095..e4a935a 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -536,12 +536,12 @@ class PackageManager(object):
536 cmd.extend(['-x', exclude]) 536 cmd.extend(['-x', exclude])
537 try: 537 try:
538 bb.note("Installing complementary packages ...") 538 bb.note("Installing complementary packages ...")
539 bb.note('Running %s' % cmd)
539 complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT) 540 complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
540 except subprocess.CalledProcessError as e: 541 except subprocess.CalledProcessError as e:
541 bb.fatal("Could not compute complementary packages list. Command " 542 bb.fatal("Could not compute complementary packages list. Command "
542 "'%s' returned %d:\n%s" % 543 "'%s' returned %d:\n%s" %
543 (' '.join(cmd), e.returncode, e.output)) 544 (' '.join(cmd), e.returncode, e.output))
544
545 self.install(complementary_pkgs.split(), attempt_only=True) 545 self.install(complementary_pkgs.split(), attempt_only=True)
546 546
547 def deploy_dir_lock(self): 547 def deploy_dir_lock(self):
@@ -952,6 +952,35 @@ class RpmPM(PackageManager):
952 def update(self): 952 def update(self):
953 self._invoke_smart('update rpmsys') 953 self._invoke_smart('update rpmsys')
954 954
955 def get_rdepends_recursively(self, pkgs):
956 # pkgs will be changed during the loop, so use [:] to make a copy.
957 for pkg in pkgs[:]:
958 sub_data = oe.packagedata.read_subpkgdata(pkg, self.d)
959 sub_rdep = sub_data.get("RDEPENDS_" + pkg)
960 if not sub_rdep:
961 continue
962 done = bb.utils.explode_dep_versions2(sub_rdep).keys()
963 next = done
964 # Find all the rdepends on dependency chain
965 while next:
966 new = []
967 for sub_pkg in next:
968 sub_data = oe.packagedata.read_subpkgdata(sub_pkg, self.d)
969 sub_pkg_rdep = sub_data.get("RDEPENDS_" + sub_pkg)
970 if not sub_pkg_rdep:
971 continue
972 for p in bb.utils.explode_dep_versions2(sub_pkg_rdep):
973 # Already handled, skip it.
974 if p in done or p in pkgs:
975 continue
976 # It's a new dep
977 if oe.packagedata.has_subpkgdata(p, self.d):
978 done.append(p)
979 new.append(p)
980 next = new
981 pkgs.extend(done)
982 return pkgs
983
955 ''' 984 '''
956 Install pkgs with smart, the pkg name is oe format 985 Install pkgs with smart, the pkg name is oe format
957 ''' 986 '''
@@ -960,8 +989,58 @@ class RpmPM(PackageManager):
960 bb.note("Installing the following packages: %s" % ' '.join(pkgs)) 989 bb.note("Installing the following packages: %s" % ' '.join(pkgs))
961 if attempt_only and len(pkgs) == 0: 990 if attempt_only and len(pkgs) == 0:
962 return 991 return
992 if not attempt_only:
993 # Pull in multilib requires since rpm may not pull in them
994 # correctly, for example,
995 # lib32-packagegroup-core-standalone-sdk-target requires
996 # lib32-libc6, but rpm may pull in libc6 rather than lib32-libc6
997 # since it doesn't know mlprefix (lib32-), bitbake knows it and
998 # can handle it well, find out the RDEPENDS on the chain will
999 # fix the problem. Both do_rootfs and do_populate_sdk have this
1000 # issue.
1001 # The attempt_only packages don't need this since they are
1002 # based on the installed ones.
1003 #
1004 # Separate pkgs into two lists, one is multilib, the other one
1005 # is non-multilib.
1006 ml_pkgs = []
1007 non_ml_pkgs = pkgs[:]
1008 for pkg in pkgs:
1009 for mlib in (self.d.getVar("MULTILIB_VARIANTS", True) or "").split():
1010 if pkg.startswith(mlib + '-'):
1011 ml_pkgs.append(pkg)
1012 non_ml_pkgs.remove(pkg)
1013
1014 if len(ml_pkgs) > 0 and len(non_ml_pkgs) > 0:
1015 # Found both foo and lib-foo
1016 ml_pkgs = self.get_rdepends_recursively(ml_pkgs)
1017 non_ml_pkgs = self.get_rdepends_recursively(non_ml_pkgs)
1018 # Longer list makes smart slower, so only keep the pkgs
1019 # which have the same BPN, and smart can handle others
1020 # correctly.
1021 pkgs_new = []
1022 for pkg in non_ml_pkgs:
1023 for mlib in (self.d.getVar("MULTILIB_VARIANTS", True) or "").split():
1024 mlib_pkg = mlib + "-" + pkg
1025 if mlib_pkg in ml_pkgs:
1026 pkgs_new.append(pkg)
1027 pkgs_new.append(mlib_pkg)
1028 for pkg in pkgs:
1029 if pkg not in pkgs_new:
1030 pkgs_new.append(pkg)
1031 pkgs = pkgs_new
1032 new_depends = {}
1033 deps = bb.utils.explode_dep_versions2(" ".join(pkgs))
1034 for depend in deps:
1035 data = oe.packagedata.read_subpkgdata(depend, self.d)
1036 key = "PKG_%s" % depend
1037 if key in data:
1038 new_depend = data[key]
1039 else:
1040 new_depend = depend
1041 new_depends[new_depend] = deps[depend]
1042 pkgs = bb.utils.join_deps(new_depends, commasep=True).split(', ')
963 pkgs = self._pkg_translate_oe_to_smart(pkgs, attempt_only) 1043 pkgs = self._pkg_translate_oe_to_smart(pkgs, attempt_only)
964
965 if not attempt_only: 1044 if not attempt_only:
966 bb.note('to be installed: %s' % ' '.join(pkgs)) 1045 bb.note('to be installed: %s' % ' '.join(pkgs))
967 cmd = "%s %s install -y %s" % \ 1046 cmd = "%s %s install -y %s" % \
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 0000000..4ebf2dc
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-segfault-in-add_name.patch
@@ -0,0 +1,59 @@
1commit 25e83c2270b2d2966c992885faed0b79be09f474
2Author: Jeff Layton <jlayton@poochiereds.net>
3Date: Thu May 1 11:15:16 2014 -0400
4
5 mountd: fix segfault in add_name with newer gcc compilers
6
7 I hit a segfault in add_name with a mountd built with gcc-4.9.0. Some
8 NULL pointer checks got reordered such that a pointer was dereferenced
9 before checking to see whether it was NULL. The problem was due to
10 nfs-utils relying on undefined behavior, which tricked gcc into assuming
11 that the pointer would never be NULL.
12
13 At first I assumed that this was a compiler bug, but Jakub Jelinek and
14 Jeff Law pointed out:
15
16 "If old is NULL, then:
17
18 strncpy(new, old, cp-old);
19
20 is undefined behavior (even when cp == old == NULL in that case),
21 therefore gcc assumes that old is never NULL, as otherwise it would be
22 invalid.
23
24 Just guard
25 strncpy(new, old, cp-old);
26 new[cp-old] = 0;
27 with if (old) { ... }."
28
29 This patch does that. If old is NULL though, then we still need to
30 ensure that new is NULL terminated, lest the subsequent strcats walk off
31 the end of it.
32
33 Cc: Jeff Law <law@redhat.com>
34 Cc: Jakub Jelinek <jakub@redhat.com>
35 Signed-off-by: Jeff Layton <jlayton@poochiereds.net>
36 Signed-off-by: Steve Dickson <steved@redhat.com>
37
38 Upstream-Status:Backport
39 Signed-off-by: Tudor Florea <tudor.florea@enea.com>
40
41diff --git a/support/export/client.c b/support/export/client.c
42index dbf47b9..f85e11c 100644
43--- a/support/export/client.c
44+++ b/support/export/client.c
45@@ -482,8 +482,12 @@ add_name(char *old, const char *add)
46 else
47 cp = cp + strlen(cp);
48 }
49- strncpy(new, old, cp-old);
50- new[cp-old] = 0;
51+ if (old) {
52+ strncpy(new, old, cp-old);
53+ new[cp-old] = 0;
54+ } else {
55+ new[0] = 0;
56+ }
57 if (cp != old && !*cp)
58 strcat(new, ",");
59 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 6e6d09b..dcdb35e 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
31 file://nfs-statd.service \ 31 file://nfs-statd.service \
32 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ 32 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
33 file://0001-statd-fixed-the-with-statdpath-flag.patch \ 33 file://0001-statd-fixed-the-with-statdpath-flag.patch \
34 file://fix-segfault-in-add_name.patch \
34" 35"
35 36
36SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8" 37SRC_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 5913597..0000000
--- a/meta/recipes-connectivity/openssh/files/add-test-support-for-busybox.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1Adjust test cases to work with busybox.
2
3- Replace dd parameter "obs" with "bs".
4- Replace "head -<num>" with "head -n <num>".
5
6Signed-off-by: Björn Stenberg <bjst@enea.com>
7Upstream-status: Pending
8
9--- a/regress/cipher-speed.sh 2012-06-30 07:08:53.000000000 +0200
10+++ b/regress/cipher-speed.sh 2013-02-15 11:30:20.670022055 +0100
11@@ -26,7 +26,7 @@
12 echon "$c/$m:\t"
13 ( ${SSH} -o 'compression no' \
14 -F $OBJ/ssh_proxy -2 -m $m -c $c somehost \
15- exec sh -c \'"dd of=/dev/null obs=32k"\' \
16+ exec sh -c \'"dd of=/dev/null bs=32k"\' \
17 < ${DATA} ) 2>&1 | getbytes
18
19 if [ $? -ne 0 ]; then
20@@ -42,7 +42,7 @@
21 echon "$c:\t"
22 ( ${SSH} -o 'compression no' \
23 -F $OBJ/ssh_proxy -1 -c $c somehost \
24- exec sh -c \'"dd of=/dev/null obs=32k"\' \
25+ exec sh -c \'"dd of=/dev/null bs=32k"\' \
26 < ${DATA} ) 2>&1 | getbytes
27 if [ $? -ne 0 ]; then
28 fail "ssh -1 failed with cipher $c"
29--- a/regress/transfer.sh 2003-09-04 06:54:40.000000000 +0200
30+++ b/regress/transfer.sh 2013-02-15 11:25:34.666411185 +0100
31@@ -18,7 +18,7 @@
32 for s in 10 100 1k 32k 64k 128k 256k; do
33 trace "proto $p dd-size ${s}"
34 rm -f ${COPY}
35- dd if=$DATA obs=${s} 2> /dev/null | \
36+ dd if=$DATA bs=${s} 2> /dev/null | \
37 ${SSH} -q -$p -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
38 if [ $? -ne 0 ]; then
39 fail "ssh cat $DATA failed"
40--- a/regress/yes-head.sh 2005-11-28 06:41:03.000000000 +0100
41+++ b/regress/yes-head.sh 2013-02-15 11:55:11.413715068 +0100
42@@ -4,7 +4,7 @@
43 tid="yes pipe head"
44
45 for p in 1 2; 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)`
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)`
48 if [ $? -ne 0 ]; then
49 fail "yes|head test failed"
50 lines = 0;
51--- a/regress/key-options.sh 2008-07-04 09:08:58.000000000 +0200
52+++ b/regress/key-options.sh 2013-02-15 12:06:05.109486098 +0100
53@@ -54,7 +54,7 @@
54 fi
55
56 sed 's/.*/from="'"$f"'" &/' $origkeys >$authkeys
57- from=`head -1 $authkeys | cut -f1 -d ' '`
58+ from=`head -n 1 $authkeys | cut -f1 -d ' '`
59 verbose "key option proto $p $from"
60 r=`${SSH} -$p -q -F $OBJ/ssh_proxy somehost 'echo true'`
61 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 3e725cf..0000000
--- a/meta/recipes-connectivity/openssh/files/run-ptest
+++ /dev/null
@@ -1,7 +0,0 @@
1#!/bin/sh
2
3export TEST_SHELL=sh
4
5cd regress
6make -k .OBJDIR=`pwd` .CURDIR=`pwd` tests \
7 | 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 f575665..3807583 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.
25 file://run-ptest \ 25 file://run-ptest \
26 file://openssh-CVE-2014-2532.patch \ 26 file://openssh-CVE-2014-2532.patch \
27 file://openssh-CVE-2014-2653.patch \ 27 file://openssh-CVE-2014-2653.patch \
28 file://auth2-none.c-avoid-authenticate-empty-passwords-to-m.patch" 28 file://auth2-none.c-avoid-authenticate-empty-passwords-to-m.patch \
29 file://openssh-ptest-fix-sshconnect.patch"
29 30
30PAM_SRC_URI = "file://sshd" 31PAM_SRC_URI = "file://sshd"
31 32
diff --git a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2013-1752-httplib-fix.patch b/meta/recipes-devtools/python/python/python-2.7.3-CVE-2013-1752-httplib-fix.patch
index e68f53f..c9abe85 100644
--- a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2013-1752-httplib-fix.patch
+++ b/meta/recipes-devtools/python/python/python-2.7.3-CVE-2013-1752-httplib-fix.patch
@@ -1,6 +1,6 @@
1Upstream-Status: Backport 1Upstream-Status: Backport
2 2
3CVE-2013-1752: httplib: HTTPMessage.readheaders() raises an HTTPException 3CVE-2013-1752: httplib: HTTPMessage.readheaders() raises an HTTPException
4when more than 100 headers are read. 4when more than 100 headers are read.
5Patch by Jyrki Pulliainen and Daniel Eriksson. 5Patch by Jyrki Pulliainen and Daniel Eriksson.
6 6
diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2015-6251.patch b/meta/recipes-support/gnutls/gnutls/CVE-2015-6251.patch
deleted file mode 100644
index 5a29a96..0000000
--- a/meta/recipes-support/gnutls/gnutls/CVE-2015-6251.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 272854367efc130fbd4f1a51840d80c630214e12 Mon Sep 17 00:00:00 2001
2From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
3Date: Mon, 20 Jul 2015 21:49:28 +0200
4Subject: [PATCH] Reset the output value on error in _gnutls_x509_dn_to_string()
5
6Fixes CVE-2015-6251.
7Upstream-Status: Backport
8
9Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
10---
11 lib/x509/common.c | 1 +
12 1 file changed, 1 insertion(+), 0 deletions(-)
13
14diff --git a/lib/x509/common.c b/lib/x509/common.c
15index 94b6bbc..9a4b96f 100644
16--- a/lib/x509/common.c
17+++ b/lib/x509/common.c
18@@ -469,6 +469,7 @@ _gnutls_x509_dn_to_string(const char *oid, void *value,
19 if (ret < 0) {
20 gnutls_assert();
21 gnutls_free(str->data);
22+ str->data = NULL;
23 return ret;
24 }
25 str->size = size;
26--
27libgit2 0.23.4
diff --git a/meta/recipes-support/gnutls/gnutls_3.3.5.bb b/meta/recipes-support/gnutls/gnutls_3.3.5.bb
index ce1da89..9f26470 100644
--- a/meta/recipes-support/gnutls/gnutls_3.3.5.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.3.5.bb
@@ -3,7 +3,6 @@ require gnutls.inc
3SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ 3SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
4 file://eliminated-double-free-CVE-2015-3308.patch \ 4 file://eliminated-double-free-CVE-2015-3308.patch \
5 file://better-fix-for-double-free-CVE-2015-3308.patch \ 5 file://better-fix-for-double-free-CVE-2015-3308.patch \
6 file://CVE-2015-6251.patch \
7 " 6 "
8 7
9SRC_URI[md5sum] = "1f396dcf3c14ea67de7243821006d1a2" 8SRC_URI[md5sum] = "1f396dcf3c14ea67de7243821006d1a2"