diff options
| author | Roy Li <rongqing.li@windriver.com> | 2015-05-19 20:32:01 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-20 21:40:14 +0100 |
| commit | 346505144a18b738846b9d5bc6f146426d3572ba (patch) | |
| tree | 5c92df8a449ac0c6c1f58274b0999ab4ddb0f487 /meta | |
| parent | e14f9f31d24c517e59f250cb79a536ed4b01bc5d (diff) | |
| download | openembedded-core-346505144a18b738846b9d5bc6f146426d3572ba.tar.gz openembedded-core-346505144a18b738846b9d5bc6f146426d3572ba.tar.bz2 openembedded-core-346505144a18b738846b9d5bc6f146426d3572ba.zip | |
sqlite3: upgrade to 3.8.10
upgrade to include CVE fixes:
CVE-2015-3414
CVE-2015-3415
CVE-2015-3416
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.patch | 30 | ||||
| -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 @@ +[PATCH] using the dynamic library + +Upstream-Status: Inappropriate [configuration] + +building statically-linked sqlite3 failed since sqlite3.o is generated in +different dir, even if link successes, the size of sqlite3 is become larger, +so use the dynamic link, ref: http://patchwork.openembedded.org/patch/93293/ + +Signed-off-by: Roy Li <rongqing.li@windriver.com> +--- + Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 88bc23d..fe50f20 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,8 @@ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 + + bin_PROGRAMS = sqlite3 + sqlite3_SOURCES = shell.c sqlite3.h +-sqlite3_LDADD = sqlite3.$(OBJEXT) @READLINE_LIBS@ ++sqlite3_LDADD = @READLINE_LIBS@ libsqlite3.la ++ + + include_HEADERS = sqlite3.h sqlite3ext.h + +-- +1.9.1 + 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): PE = "3" SQLITE_PV = "${@sqlite_download_version(d)}" -SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${SQLITE_PV}.tar.gz" +SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz \ + file://0001-using-the-dynamic-library.patch \ +" -SRC_URI[md5sum] = "33bb8db0038317ce1b0480ca1185c7ba" -SRC_URI[sha256sum] = "86370f139405fdfe03334fd618171a74e50f589f17ccbe5933361ed1f58359ec" +SRC_URI[md5sum] = "04d0311ef70818e8d914c1dc383eddff" +SRC_URI[sha256sum] = "c4b8f9eefbdf0b9bef2044bdc3510c8a3f3b0ddb0489661fb433034187f5a428" S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}" |