From 41b9d561263e88d302fd0c2266954334864fe7ba Mon Sep 17 00:00:00 2001 From: Ultrabug Date: Fri, 10 Feb 2017 14:09:01 +0100 Subject: dev-db/redis: cleanup old and vulnerable wrt #565188 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- dev-db/redis/files/redis-2.8.13-sharedlua.patch | 44 ------------------------- dev-db/redis/files/redis-2.8.19-sharedlua.patch | 44 ------------------------- 2 files changed, 88 deletions(-) delete mode 100644 dev-db/redis/files/redis-2.8.13-sharedlua.patch delete mode 100644 dev-db/redis/files/redis-2.8.19-sharedlua.patch (limited to 'dev-db/redis/files') diff --git a/dev-db/redis/files/redis-2.8.13-sharedlua.patch b/dev-db/redis/files/redis-2.8.13-sharedlua.patch deleted file mode 100644 index e13c62f07a11..000000000000 --- a/dev-db/redis/files/redis-2.8.13-sharedlua.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit de0d4973ddb629dcc80f0724769a0e997fe644ba -Author: Johan Bergström -Date: Wed Jul 16 09:47:44 2014 +1000 - - Use a shared lua - -diff --git src/Makefile src/Makefile -index 134694c..a09832e 100644 ---- src/Makefile -+++ src/Makefile -@@ -15,7 +15,7 @@ - release_hdr := $(shell sh -c './mkreleasehdr.sh') - uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') - OPTIMIZATION?=-O2 --DEPENDENCY_TARGETS=hiredis linenoise lua -+DEPENDENCY_TARGETS=hiredis linenoise - - # Default settings - STD=-std=c99 -pedantic -@@ -52,6 +52,7 @@ endif - FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) - FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm -+FINAL_LIBS+=$(shell pkg-config --libs lua) - DEBUG=-g -ggdb - - ifeq ($(uname_S),SunOS) -@@ -108,6 +109,7 @@ endif - REDIS_SERVER_NAME=redis-server - REDIS_SENTINEL_NAME=redis-sentinel - REDIS_SERVER_OBJ=adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o hyperloglog.o latency.o sparkline.o -+REDIS_SERVER_OBJ+=lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o - REDIS_CLI_NAME=redis-cli - REDIS_CLI_OBJ=anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o - REDIS_BENCHMARK_NAME=redis-benchmark -@@ -162,7 +164,7 @@ endif - - # redis-server - $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) - - # redis-sentinel - $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/dev-db/redis/files/redis-2.8.19-sharedlua.patch b/dev-db/redis/files/redis-2.8.19-sharedlua.patch deleted file mode 100644 index 2e45cf2b31fa..000000000000 --- a/dev-db/redis/files/redis-2.8.19-sharedlua.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit de0d4973ddb629dcc80f0724769a0e997fe644ba -Author: Johan Bergström -Date: Wed Jul 16 09:47:44 2014 +1000 - - Use a shared lua - -diff --git src/Makefile src/Makefile -index 134694c..a09832e 100644 ---- src/Makefile -+++ src/Makefile -@@ -15,7 +15,7 @@ - release_hdr := $(shell sh -c './mkreleasehdr.sh') - uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') - OPTIMIZATION?=-O2 --DEPENDENCY_TARGETS=hiredis linenoise lua -+DEPENDENCY_TARGETS=hiredis linenoise - - # Default settings - STD=-std=c99 -pedantic -@@ -52,6 +52,7 @@ endif - FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) - FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm -+FINAL_LIBS+=$(shell pkg-config --libs lua) - DEBUG=-g -ggdb - - ifeq ($(uname_S),SunOS) -@@ -108,6 +109,7 @@ endif - REDIS_SERVER_NAME=redis-server - REDIS_SENTINEL_NAME=redis-sentinel - REDIS_SERVER_OBJ=adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o hyperloglog.o latency.o sparkline.o -+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o - REDIS_CLI_NAME=redis-cli - REDIS_CLI_OBJ=anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o - REDIS_BENCHMARK_NAME=redis-benchmark -@@ -162,7 +164,7 @@ endif - - # redis-server - $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) - - # redis-sentinel - $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) -- cgit v1.2.3-65-gdbad