summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-05-19 20:32:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-20 21:41:10 +0100
commitb5ba70b47fff227e4381fcac93defccb79e3d8f1 (patch)
tree87893716a9a11ac44312b55b35b17d96fdad76d5 /meta
parent2af30090ce04d8eeb9b76ab065dba3a58e29f0de (diff)
downloadpoky-b5ba70b47fff227e4381fcac93defccb79e3d8f1.tar.gz
sqlite3: upgrade to 3.8.10
upgrade to include CVE fixes: CVE-2015-3414 CVE-2015-3415 CVE-2015-3416 (From OE-Core rev: 346505144a18b738846b9d5bc6f146426d3572ba) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch30
-rw-r--r--meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb (renamed from meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb)8
2 files changed, 35 insertions, 3 deletions
diff --git a/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch b/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
new file mode 100644
index 0000000000..e3bfd5f656
--- /dev/null
+++ b/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
@@ -0,0 +1,30 @@
1[PATCH] using the dynamic library
2
3Upstream-Status: Inappropriate [configuration]
4
5building statically-linked sqlite3 failed since sqlite3.o is generated in
6different dir, even if link successes, the size of sqlite3 is become larger,
7so use the dynamic link, ref: http://patchwork.openembedded.org/patch/93293/
8
9Signed-off-by: Roy Li <rongqing.li@windriver.com>
10---
11 Makefile.am | 3 ++-
12 1 file changed, 2 insertions(+), 1 deletion(-)
13
14diff --git a/Makefile.am b/Makefile.am
15index 88bc23d..fe50f20 100644
16--- a/Makefile.am
17+++ b/Makefile.am
18@@ -7,7 +7,8 @@ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
19
20 bin_PROGRAMS = sqlite3
21 sqlite3_SOURCES = shell.c sqlite3.h
22-sqlite3_LDADD = sqlite3.$(OBJEXT) @READLINE_LIBS@
23+sqlite3_LDADD = @READLINE_LIBS@ libsqlite3.la
24+
25
26 include_HEADERS = sqlite3.h sqlite3ext.h
27
28--
291.9.1
30
diff --git a/meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb b/meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb
index 4c73d304da..d7f72d9abc 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb
@@ -8,10 +8,12 @@ def sqlite_download_version(d):
8 8
9PE = "3" 9PE = "3"
10SQLITE_PV = "${@sqlite_download_version(d)}" 10SQLITE_PV = "${@sqlite_download_version(d)}"
11SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${SQLITE_PV}.tar.gz" 11SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz \
12 file://0001-using-the-dynamic-library.patch \
13"
12 14
13SRC_URI[md5sum] = "33bb8db0038317ce1b0480ca1185c7ba" 15SRC_URI[md5sum] = "04d0311ef70818e8d914c1dc383eddff"
14SRC_URI[sha256sum] = "86370f139405fdfe03334fd618171a74e50f589f17ccbe5933361ed1f58359ec" 16SRC_URI[sha256sum] = "c4b8f9eefbdf0b9bef2044bdc3510c8a3f3b0ddb0489661fb433034187f5a428"
15 17
16S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}" 18S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}"
17 19