diff options
author | Armin Kuster <akuster808@gmail.com> | 2015-06-05 18:48:18 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-06-23 12:43:12 +0200 |
commit | b11f35a94cdf100ef0b056449345a0ca094aeea6 (patch) | |
tree | 85f6993efe4f48b9abeda764413a72d02a2747e7 | |
parent | 38f86f841b92d65419af96c8492e3fa49bf3c125 (diff) | |
download | meta-openembedded-b11f35a94cdf100ef0b056449345a0ca094aeea6.tar.gz |
redis: update to version 3.0.2
This includes CVE-2015-4335.
LICENSE checksum changed do to copyright update.
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch | 15 | ||||
-rw-r--r-- | meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch | 47 | ||||
-rw-r--r-- | meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch | 11 | ||||
-rw-r--r-- | meta-oe/recipes-extended/redis/redis_3.0.2.bb (renamed from meta-oe/recipes-extended/redis/redis_2.6.9.bb) | 11 |
4 files changed, 52 insertions, 32 deletions
diff --git a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch index 8135fc28e3..f9f1c0dbd5 100644 --- a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch | |||
@@ -7,16 +7,20 @@ Instead of trying to automagically figure out CC, which breaks with OE | |||
7 | as CC has spaces in it, just skip it if one was already passed in. | 7 | as CC has spaces in it, just skip it if one was already passed in. |
8 | 8 | ||
9 | Signed-off-by: Venture Research <tech@ventureresearch.com> | 9 | Signed-off-by: Venture Research <tech@ventureresearch.com> |
10 | |||
11 | Update to work with 3.0.x | ||
12 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
13 | |||
10 | --- | 14 | --- |
11 | deps/hiredis/Makefile | 2 +- | 15 | deps/hiredis/Makefile | 2 +- |
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 17 | ||
14 | diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile | 18 | Index: deps/hiredis/Makefile |
15 | index 16b8767..0b27c82 100644 | 19 | =================================================================== |
16 | --- a/deps/hiredis/Makefile | 20 | --- a/deps/hiredis/Makefile |
17 | +++ b/deps/hiredis/Makefile | 21 | +++ b/deps/hiredis/Makefile |
18 | @@ -11,7 +11,7 @@ HIREDIS_MAJOR=0 | 22 | @@ -24,7 +24,7 @@ endef |
19 | HIREDIS_MINOR=10 | 23 | export REDIS_TEST_CONFIG |
20 | 24 | ||
21 | # Fallback to gcc when $CC is not in $PATH. | 25 | # Fallback to gcc when $CC is not in $PATH. |
22 | -CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') | 26 | -CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') |
@@ -24,6 +28,3 @@ index 16b8767..0b27c82 100644 | |||
24 | OPTIMIZATION?=-O3 | 28 | OPTIMIZATION?=-O3 |
25 | WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings | 29 | WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings |
26 | DEBUG?= -g -ggdb | 30 | DEBUG?= -g -ggdb |
27 | -- | ||
28 | 1.8.1.2 | ||
29 | |||
diff --git a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch index c4d1bc493b..7e62ae1316 100644 --- a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch | |||
@@ -7,14 +7,19 @@ OE-specific parameters, instead of overriding all of these simply use | |||
7 | the ones that are already passed in. Also configure for only Linux... | 7 | the ones that are already passed in. Also configure for only Linux... |
8 | 8 | ||
9 | Signed-off-by: Venture Research <tech@ventureresearch.com> | 9 | Signed-off-by: Venture Research <tech@ventureresearch.com> |
10 | |||
11 | Updated to work with 3.0.x | ||
12 | |||
13 | Signed-off-by: Armin Kuster <akust808@gmail.com> | ||
14 | |||
10 | --- | 15 | --- |
11 | deps/lua/src/Makefile | 18 +++++++----------- | 16 | deps/lua/src/Makefile | 18 +++++++----------- |
12 | 1 file changed, 7 insertions(+), 11 deletions(-) | 17 | 1 file changed, 7 insertions(+), 11 deletions(-) |
13 | 18 | ||
14 | diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile | 19 | Index: redis-3.0.2/deps/lua/src/Makefile |
15 | index 77d6a48..888d0da 100644 | 20 | =================================================================== |
16 | --- a/deps/lua/src/Makefile | 21 | --- redis-3.0.2.orig/deps/lua/src/Makefile |
17 | +++ b/deps/lua/src/Makefile | 22 | +++ redis-3.0.2/deps/lua/src/Makefile |
18 | @@ -5,18 +5,14 @@ | 23 | @@ -5,18 +5,14 @@ |
19 | # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= | 24 | # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= |
20 | 25 | ||
@@ -22,7 +27,7 @@ index 77d6a48..888d0da 100644 | |||
22 | -PLAT= none | 27 | -PLAT= none |
23 | +PLAT= linux | 28 | +PLAT= linux |
24 | 29 | ||
25 | -CC= gcc | 30 | -CC?= gcc |
26 | -CFLAGS= -O2 -Wall $(MYCFLAGS) | 31 | -CFLAGS= -O2 -Wall $(MYCFLAGS) |
27 | -AR= ar rcu | 32 | -AR= ar rcu |
28 | -RANLIB= ranlib | 33 | -RANLIB= ranlib |
@@ -40,15 +45,27 @@ index 77d6a48..888d0da 100644 | |||
40 | 45 | ||
41 | # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= | 46 | # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= |
42 | 47 | ||
43 | @@ -48,7 +44,7 @@ o: $(ALL_O) | 48 | Index: redis-3.0.2/deps/Makefile |
44 | a: $(ALL_A) | 49 | =================================================================== |
50 | --- redis-3.0.2.orig/deps/Makefile | ||
51 | +++ redis-3.0.2/deps/Makefile | ||
52 | @@ -63,7 +63,6 @@ LUA_LDFLAGS+= $(LDFLAGS) | ||
53 | # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more | ||
54 | # challenging to cross-compile lua (and redis). These defines make it easier | ||
55 | # to fit redis into cross-compilation environments, which typically set AR. | ||
56 | -AR=ar | ||
57 | ARFLAGS=rcu | ||
45 | 58 | ||
46 | $(LUA_A): $(CORE_O) $(LIB_O) | 59 | lua: .make-prerequisites |
47 | - $(AR) $@ $? | 60 | Index: redis-3.0.2/deps/lua/Makefile |
48 | + $(AR) rcu $@ $? | 61 | =================================================================== |
49 | $(RANLIB) $@ | 62 | --- redis-3.0.2.orig/deps/lua/Makefile |
63 | +++ redis-3.0.2/deps/lua/Makefile | ||
64 | @@ -33,7 +33,6 @@ INSTALL_DATA= $(INSTALL) -m 0644 | ||
65 | |||
66 | # Utilities. | ||
67 | MKDIR= mkdir -p | ||
68 | -RANLIB= ranlib | ||
69 | |||
70 | # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= | ||
50 | 71 | ||
51 | $(LUA_T): $(LUA_O) $(LUA_A) | ||
52 | -- | ||
53 | 1.8.1.2 | ||
54 | |||
diff --git a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch index b89c871290..b768a77491 100644 --- a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch +++ b/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch | |||
@@ -10,12 +10,16 @@ Note that this of course doesn't allow tcmalloc and jemalloc, however | |||
10 | jemalloc wasn't building correctly. | 10 | jemalloc wasn't building correctly. |
11 | 11 | ||
12 | Signed-off-by: Venture Research <tech@ventureresearch.com> | 12 | Signed-off-by: Venture Research <tech@ventureresearch.com> |
13 | |||
14 | Update to work with 3.0.x | ||
15 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
16 | |||
13 | --- | 17 | --- |
14 | src/Makefile | 2 +- | 18 | src/Makefile | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 20 | ||
17 | diff --git a/src/Makefile b/src/Makefile | 21 | Index: src/Makefile |
18 | index 204a271..91b307d 100644 | 22 | =================================================================== |
19 | --- a/src/Makefile | 23 | --- a/src/Makefile |
20 | +++ b/src/Makefile | 24 | +++ b/src/Makefile |
21 | @@ -13,7 +13,8 @@ | 25 | @@ -13,7 +13,8 @@ |
@@ -28,6 +32,3 @@ index 204a271..91b307d 100644 | |||
28 | OPTIMIZATION?=-O2 | 32 | OPTIMIZATION?=-O2 |
29 | DEPENDENCY_TARGETS=hiredis linenoise lua | 33 | DEPENDENCY_TARGETS=hiredis linenoise lua |
30 | 34 | ||
31 | -- | ||
32 | 1.8.1.2 | ||
33 | |||
diff --git a/meta-oe/recipes-extended/redis/redis_2.6.9.bb b/meta-oe/recipes-extended/redis/redis_3.0.2.bb index 8f009757fd..e439431b1b 100644 --- a/meta-oe/recipes-extended/redis/redis_2.6.9.bb +++ b/meta-oe/recipes-extended/redis/redis_3.0.2.bb | |||
@@ -3,9 +3,10 @@ DESCRIPTION = "Redis is an open source, advanced key-value store." | |||
3 | HOMEPAGE = "http://redis.io" | 3 | HOMEPAGE = "http://redis.io" |
4 | SECTION = "libs" | 4 | SECTION = "libs" |
5 | LICENSE = "BSD" | 5 | LICENSE = "BSD" |
6 | LIC_FILES_CHKSUM="file://COPYING;md5=673e0ac66aac758f8f2140c6fc7947d2" | 6 | LIC_FILES_CHKSUM="file://COPYING;md5=3c01b49fed4df1a79843688fa3f7b9d6" |
7 | 7 | ||
8 | SRC_URI = "http://redis.googlecode.com/files/redis-${PV}.tar.gz \ | 8 | DEPENDS = "" |
9 | SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ | ||
9 | file://hiredis-use-default-CC-if-it-is-set.patch \ | 10 | file://hiredis-use-default-CC-if-it-is-set.patch \ |
10 | file://lua-update-Makefile-to-use-environment-build-setting.patch \ | 11 | file://lua-update-Makefile-to-use-environment-build-setting.patch \ |
11 | file://oe-use-libc-malloc.patch \ | 12 | file://oe-use-libc-malloc.patch \ |
@@ -13,13 +14,13 @@ SRC_URI = "http://redis.googlecode.com/files/redis-${PV}.tar.gz \ | |||
13 | file://init-redis-server \ | 14 | file://init-redis-server \ |
14 | " | 15 | " |
15 | 16 | ||
16 | inherit update-rc.d | 17 | inherit autotools-brokensep update-rc.d |
17 | 18 | ||
18 | INITSCRIPT_NAME = "redis-server" | 19 | INITSCRIPT_NAME = "redis-server" |
19 | INITSCRIPT_PARAMS = "defaults 87" | 20 | INITSCRIPT_PARAMS = "defaults 87" |
20 | 21 | ||
21 | SRC_URI[md5sum] = "5093fb7c5f763e828c857daf260665bc" | 22 | SRC_URI[md5sum] = "87be8867447f62524b584813e5a7bd14" |
22 | SRC_URI[sha256sum] = "4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489" | 23 | SRC_URI[sha256sum] = "93e422c0d584623601f89b956045be158889ebe594478a2c24e1bf218495633f" |
23 | 24 | ||
24 | do_install() { | 25 | do_install() { |
25 | export PREFIX=${D}/${prefix} | 26 | export PREFIX=${D}/${prefix} |