| 1 |
commit: 1549caced8940fffc49201959ade20270dc89d87 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Nov 22 17:19:38 2017 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 23 22:21:13 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1549cace |
| 7 |
|
| 8 |
dev-db/redis: remove unused patches |
| 9 |
|
| 10 |
Fixes: https://github.com/gentoo/gentoo/pull/6261 |
| 11 |
(cherry picked from commit 870779cd6f1a6bc312c2d3772e9d067b8c057d18) |
| 12 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-db/redis/files/redis-3.2.0-config.patch | 37 -------------------------- |
| 15 |
dev-db/redis/files/redis-3.2.0-sharedlua.patch | 36 ------------------------- |
| 16 |
2 files changed, 73 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-db/redis/files/redis-3.2.0-config.patch b/dev-db/redis/files/redis-3.2.0-config.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 8d93a0e7b62..00000000000 |
| 21 |
--- a/dev-db/redis/files/redis-3.2.0-config.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,37 +0,0 @@ |
| 24 |
---- a/redis.conf 2016-05-06 09:11:36.000000000 +0200 |
| 25 |
-+++ b/redis.conf 2016-06-14 09:20:05.980855432 +0200 |
| 26 |
-@@ -146,7 +146,7 @@ |
| 27 |
- # |
| 28 |
- # Creating a pid file is best effort: if Redis is not able to create it |
| 29 |
- # nothing bad happens, the server will start and run normally. |
| 30 |
--pidfile /var/run/redis.pid |
| 31 |
-+pidfile /run/redis/redis.pid |
| 32 |
- |
| 33 |
- # Specify the server verbosity level. |
| 34 |
- # This can be one of: |
| 35 |
-@@ -159,7 +159,7 @@ |
| 36 |
- # Specify the log file name. Also the empty string can be used to force |
| 37 |
- # Redis to log on the standard output. Note that if you use standard |
| 38 |
- # output for logging but daemonize, logs will be sent to /dev/null |
| 39 |
--logfile "" |
| 40 |
-+logfile /var/log/redis/redis.log |
| 41 |
- |
| 42 |
- # To enable logging to the system logger, just set 'syslog-enabled' to yes, |
| 43 |
- # and optionally update the other syslog parameters to suit your needs. |
| 44 |
-@@ -243,7 +243,7 @@ |
| 45 |
- # The Append Only File will also be created inside this directory. |
| 46 |
- # |
| 47 |
- # Note that you must specify a directory here, not a file name. |
| 48 |
--dir ./ |
| 49 |
-+dir /var/lib/redis/ |
| 50 |
- |
| 51 |
- ################################# REPLICATION ################################# |
| 52 |
- |
| 53 |
-@@ -505,6 +505,7 @@ |
| 54 |
- # output buffers (but this is not needed if the policy is 'noeviction'). |
| 55 |
- # |
| 56 |
- # maxmemory <bytes> |
| 57 |
-+maxmemory 67108864 |
| 58 |
- |
| 59 |
- # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory |
| 60 |
- # is reached. You can select among five behaviors: |
| 61 |
|
| 62 |
diff --git a/dev-db/redis/files/redis-3.2.0-sharedlua.patch b/dev-db/redis/files/redis-3.2.0-sharedlua.patch |
| 63 |
deleted file mode 100644 |
| 64 |
index 248e990cf59..00000000000 |
| 65 |
--- a/dev-db/redis/files/redis-3.2.0-sharedlua.patch |
| 66 |
+++ /dev/null |
| 67 |
@@ -1,36 +0,0 @@ |
| 68 |
---- a/src/Makefile 2016-06-14 09:21:51.613721601 +0200 |
| 69 |
-+++ b/src/Makefile 2016-06-14 09:25:21.262442026 +0200 |
| 70 |
-@@ -15,7 +15,7 @@ |
| 71 |
- release_hdr := $(shell sh -c './mkreleasehdr.sh') |
| 72 |
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
| 73 |
- OPTIMIZATION?=-O2 |
| 74 |
--DEPENDENCY_TARGETS=hiredis linenoise lua geohash-int |
| 75 |
-+DEPENDENCY_TARGETS=hiredis linenoise geohash-int |
| 76 |
- |
| 77 |
- # Default settings |
| 78 |
- STD=-std=c99 -pedantic -DREDIS_STATIC='' |
| 79 |
-@@ -51,6 +51,7 @@ |
| 80 |
- FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -I../deps/geohash-int |
| 81 |
- FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) |
| 82 |
- FINAL_LIBS=-lm |
| 83 |
-+FINAL_LIBS+=$(shell pkg-config --libs lua) |
| 84 |
- DEBUG=-g -ggdb |
| 85 |
- |
| 86 |
- ifeq ($(uname_S),SunOS) |
| 87 |
-@@ -112,6 +113,7 @@ |
| 88 |
- REDIS_SERVER_NAME=redis-server |
| 89 |
- REDIS_SENTINEL_NAME=redis-sentinel |
| 90 |
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.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 cluster.o crc16.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 blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o geo.o |
| 91 |
-+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o |
| 92 |
- REDIS_GEOHASH_OBJ=../deps/geohash-int/geohash.o ../deps/geohash-int/geohash_helper.o |
| 93 |
- REDIS_CLI_NAME=redis-cli |
| 94 |
- REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o |
| 95 |
-@@ -166,7 +168,7 @@ |
| 96 |
- |
| 97 |
- # redis-server |
| 98 |
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) |
| 99 |
-- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS) |
| 100 |
-+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS) |
| 101 |
- |
| 102 |
- # redis-sentinel |
| 103 |
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) |
Archives