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>
This commit is contained in:
Armin Kuster
2015-06-05 18:48:18 -07:00
committed by Martin Jansa
parent 38f86f841b
commit b11f35a94c
4 changed files with 52 additions and 32 deletions
@@ -7,16 +7,20 @@ Instead of trying to automagically figure out CC, which breaks with OE
as CC has spaces in it, just skip it if one was already passed in. as CC has spaces in it, just skip it if one was already passed in.
Signed-off-by: Venture Research <tech@ventureresearch.com> Signed-off-by: Venture Research <tech@ventureresearch.com>
Update to work with 3.0.x
Signed-off-by: Armin Kuster <akuster808@gmail.com>
--- ---
deps/hiredis/Makefile | 2 +- deps/hiredis/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile Index: deps/hiredis/Makefile
index 16b8767..0b27c82 100644 ===================================================================
--- a/deps/hiredis/Makefile --- a/deps/hiredis/Makefile
+++ b/deps/hiredis/Makefile +++ b/deps/hiredis/Makefile
@@ -11,7 +11,7 @@ HIREDIS_MAJOR=0 @@ -24,7 +24,7 @@ endef
HIREDIS_MINOR=10 export REDIS_TEST_CONFIG
# Fallback to gcc when $CC is not in $PATH. # Fallback to gcc when $CC is not in $PATH.
-CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') -CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
@@ -24,6 +28,3 @@ index 16b8767..0b27c82 100644
OPTIMIZATION?=-O3 OPTIMIZATION?=-O3
WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
DEBUG?= -g -ggdb DEBUG?= -g -ggdb
--
1.8.1.2
@@ -7,14 +7,19 @@ OE-specific parameters, instead of overriding all of these simply use
the ones that are already passed in. Also configure for only Linux... the ones that are already passed in. Also configure for only Linux...
Signed-off-by: Venture Research <tech@ventureresearch.com> Signed-off-by: Venture Research <tech@ventureresearch.com>
Updated to work with 3.0.x
Signed-off-by: Armin Kuster <akust808@gmail.com>
--- ---
deps/lua/src/Makefile | 18 +++++++----------- deps/lua/src/Makefile | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-) 1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile Index: redis-3.0.2/deps/lua/src/Makefile
index 77d6a48..888d0da 100644 ===================================================================
--- a/deps/lua/src/Makefile --- redis-3.0.2.orig/deps/lua/src/Makefile
+++ b/deps/lua/src/Makefile +++ redis-3.0.2/deps/lua/src/Makefile
@@ -5,18 +5,14 @@ @@ -5,18 +5,14 @@
# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
@@ -22,7 +27,7 @@ index 77d6a48..888d0da 100644
-PLAT= none -PLAT= none
+PLAT= linux +PLAT= linux
-CC= gcc -CC?= gcc
-CFLAGS= -O2 -Wall $(MYCFLAGS) -CFLAGS= -O2 -Wall $(MYCFLAGS)
-AR= ar rcu -AR= ar rcu
-RANLIB= ranlib -RANLIB= ranlib
@@ -40,15 +45,27 @@ index 77d6a48..888d0da 100644
# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
@@ -48,7 +44,7 @@ o: $(ALL_O) Index: redis-3.0.2/deps/Makefile
a: $(ALL_A) ===================================================================
--- redis-3.0.2.orig/deps/Makefile
+++ redis-3.0.2/deps/Makefile
@@ -63,7 +63,6 @@ LUA_LDFLAGS+= $(LDFLAGS)
# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
# challenging to cross-compile lua (and redis). These defines make it easier
# to fit redis into cross-compilation environments, which typically set AR.
-AR=ar
ARFLAGS=rcu
$(LUA_A): $(CORE_O) $(LIB_O) lua: .make-prerequisites
- $(AR) $@ $? Index: redis-3.0.2/deps/lua/Makefile
+ $(AR) rcu $@ $? ===================================================================
$(RANLIB) $@ --- redis-3.0.2.orig/deps/lua/Makefile
+++ redis-3.0.2/deps/lua/Makefile
@@ -33,7 +33,6 @@ INSTALL_DATA= $(INSTALL) -m 0644
# Utilities.
MKDIR= mkdir -p
-RANLIB= ranlib
# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
$(LUA_T): $(LUA_O) $(LUA_A)
--
1.8.1.2
@@ -10,12 +10,16 @@ Note that this of course doesn't allow tcmalloc and jemalloc, however
jemalloc wasn't building correctly. jemalloc wasn't building correctly.
Signed-off-by: Venture Research <tech@ventureresearch.com> Signed-off-by: Venture Research <tech@ventureresearch.com>
Update to work with 3.0.x
Signed-off-by: Armin Kuster <akuster808@gmail.com>
--- ---
src/Makefile | 2 +- src/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile b/src/Makefile Index: src/Makefile
index 204a271..91b307d 100644 ===================================================================
--- a/src/Makefile --- a/src/Makefile
+++ b/src/Makefile +++ b/src/Makefile
@@ -13,7 +13,8 @@ @@ -13,7 +13,8 @@
@@ -28,6 +32,3 @@ index 204a271..91b307d 100644
OPTIMIZATION?=-O2 OPTIMIZATION?=-O2
DEPENDENCY_TARGETS=hiredis linenoise lua DEPENDENCY_TARGETS=hiredis linenoise lua
--
1.8.1.2
@@ -3,9 +3,10 @@ DESCRIPTION = "Redis is an open source, advanced key-value store."
HOMEPAGE = "http://redis.io" HOMEPAGE = "http://redis.io"
SECTION = "libs" SECTION = "libs"
LICENSE = "BSD" LICENSE = "BSD"
LIC_FILES_CHKSUM="file://COPYING;md5=673e0ac66aac758f8f2140c6fc7947d2" LIC_FILES_CHKSUM="file://COPYING;md5=3c01b49fed4df1a79843688fa3f7b9d6"
SRC_URI = "http://redis.googlecode.com/files/redis-${PV}.tar.gz \ DEPENDS = ""
SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
file://hiredis-use-default-CC-if-it-is-set.patch \ file://hiredis-use-default-CC-if-it-is-set.patch \
file://lua-update-Makefile-to-use-environment-build-setting.patch \ file://lua-update-Makefile-to-use-environment-build-setting.patch \
file://oe-use-libc-malloc.patch \ file://oe-use-libc-malloc.patch \
@@ -13,13 +14,13 @@ SRC_URI = "http://redis.googlecode.com/files/redis-${PV}.tar.gz \
file://init-redis-server \ file://init-redis-server \
" "
inherit update-rc.d inherit autotools-brokensep update-rc.d
INITSCRIPT_NAME = "redis-server" INITSCRIPT_NAME = "redis-server"
INITSCRIPT_PARAMS = "defaults 87" INITSCRIPT_PARAMS = "defaults 87"
SRC_URI[md5sum] = "5093fb7c5f763e828c857daf260665bc" SRC_URI[md5sum] = "87be8867447f62524b584813e5a7bd14"
SRC_URI[sha256sum] = "4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489" SRC_URI[sha256sum] = "93e422c0d584623601f89b956045be158889ebe594478a2c24e1bf218495633f"
do_install() { do_install() {
export PREFIX=${D}/${prefix} export PREFIX=${D}/${prefix}