summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/icu/icu
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
commit972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch)
tree97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-support/icu/icu
downloadpoky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-support/icu/icu')
-rw-r--r--meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch28
-rw-r--r--meta/recipes-support/icu/icu/icu-CVE-2014-8146-CVE-2014-8147.patch49
-rw-r--r--meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch29
3 files changed, 106 insertions, 0 deletions
diff --git a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
new file mode 100644
index 0000000000..2968d571bb
--- /dev/null
+++ b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
@@ -0,0 +1,28 @@
1From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 15 Feb 2014 21:06:42 +0000
4Subject: [PATCH] Disable LDFLAGSICUDT for Linux
5
6Upstream-Status: Inappropriate [ OE Configuration ]
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 source/config/mh-linux | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/config/mh-linux b/config/mh-linux
14index 366f0cc..2689aab 100644
15--- a/config/mh-linux
16+++ b/config/mh-linux
17@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
18 LD_RPATH_PRE = -Wl,-rpath,
19
20 ## These are the library specific LDFLAGS
21-LDFLAGSICUDT=-nodefaultlibs -nostdlib
22+# LDFLAGSICUDT=-nodefaultlibs -nostdlib
23
24 ## Compiler switch to embed a library name
25 # The initial tab in the next line is to prevent icu-config from reading it.
26--
271.7.10.4
28
diff --git a/meta/recipes-support/icu/icu/icu-CVE-2014-8146-CVE-2014-8147.patch b/meta/recipes-support/icu/icu/icu-CVE-2014-8146-CVE-2014-8147.patch
new file mode 100644
index 0000000000..2460357f10
--- /dev/null
+++ b/meta/recipes-support/icu/icu/icu-CVE-2014-8146-CVE-2014-8147.patch
@@ -0,0 +1,49 @@
1icu: CVE-2014-8146-CVE-2014-8147
2
3CVE-2014-8146 icu: heap overflow via incorrect isolateCount
4CVE-2014-8147 icu: integer truncation in the resolveImplicitLevels function
5
6References:
7[1] https://github.com/pedrib/PoC/raw/master/generic/i-c-u-fail.7z
8[2] https://www.kb.cert.org/vuls/id/602540
9[3] http://bugs.icu-project.org/trac/changeset/37080
10[4] http://bugs.icu-project.org/trac/changeset/37162
11
12Upstream-Status: Backport
13
14Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
15---
16diff -ruN a/common/ubidi.c b/common/ubidi.c
17--- a/common/ubidi.c 2014-10-03 18:11:20.000000000 +0200
18+++ b/common/ubidi.c 2015-08-28 08:22:39.455906194 +0200
19@@ -2138,7 +2138,7 @@
20 /* The isolates[] entries contain enough information to
21 resume the bidi algorithm in the same state as it was
22 when it was interrupted by an isolate sequence. */
23- if(dirProps[start]==PDI) {
24+ if(dirProps[start]==PDI && pBiDi->isolateCount >= 0) {
25 levState.startON=pBiDi->isolates[pBiDi->isolateCount].startON;
26 start1=pBiDi->isolates[pBiDi->isolateCount].start1;
27 stateImp=pBiDi->isolates[pBiDi->isolateCount].stateImp;
28diff -ruN a/common/ubidiimp.h b/common/ubidiimp.h
29--- a/common/ubidiimp.h 2014-10-03 18:11:16.000000000 +0200
30+++ b/common/ubidiimp.h 2015-08-28 08:28:24.069163845 +0200
31@@ -1,7 +1,7 @@
32 /*
33 ******************************************************************************
34 *
35-* Copyright (C) 1999-2014, International Business Machines
36+* Copyright (C) 1999-2015, International Business Machines
37 * Corporation and others. All Rights Reserved.
38 *
39 ******************************************************************************
40@@ -184,8 +184,8 @@
41 typedef struct Isolate {
42 int32_t startON;
43 int32_t start1;
44+ int32_t state;
45 int16_t stateImp;
46- int16_t state;
47 } Isolate;
48
49 typedef struct Run {
diff --git a/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch b/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
new file mode 100644
index 0000000000..6e40659227
--- /dev/null
+++ b/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
@@ -0,0 +1,29 @@
1pkgdata.cpp: use LARGE_BUFFER_MAX_SIZE for cmd
2
3Use LARGE_BUFFER_MAX_SIZE for cmd rather than SMALL_BUFFER_MAX_SIZE,
4otherwise there was a Segmentation fault error when the command line is
5long, this should be a misplay since other cmd uses
6LARGE_BUFFER_MAX_SIZE.
7
8Upstream-Status: Pending
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11---
12 tools/pkgdata/pkgdata.cpp | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp
16--- a/tools/pkgdata/pkgdata.cpp
17+++ b/tools/pkgdata/pkgdata.cpp
18@@ -1019,7 +1019,7 @@ normal_symlink_mode:
19
20 static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, UBool noVersion) {
21 int32_t result = 0;
22- char cmd[SMALL_BUFFER_MAX_SIZE];
23+ char cmd[LARGE_BUFFER_MAX_SIZE];
24
25 sprintf(cmd, "cd %s && %s %s %s%s%s",
26 targetDir,
27--
281.7.10.4
29