diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-db/redis/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-db/redis/files')
20 files changed, 0 insertions, 637 deletions
diff --git a/dev-db/redis/files/configure.ac-2.2 b/dev-db/redis/files/configure.ac-2.2 deleted file mode 100644 index 3ff6650407ca..000000000000 --- a/dev-db/redis/files/configure.ac-2.2 +++ /dev/null @@ -1,58 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.63) -AC_INIT(redis, 2.0.0, antirez@gmail.com) -AM_CFLAGS="-std=c99 -pedantic -Wall -W -D__EXTENSIONS__ -D_XPG6" -if test x"$CFLAGS" = x""; then - AM_CFLAGS="$AM_CFLAGS -O2" -else - AM_CFLAGS="$AM_CFLAGS $CFLAGS" -fi - -# options -AC_MSG_CHECKING([whether to build with debug information]) -AC_ARG_ENABLE([debug], - [AS_HELP_STRING([--enable-debug], - [enable debug data generation (def=no)])], - [debugit="$enableval"], - [debugit=no]) -AC_MSG_RESULT([$debugit]) - -if test x"$debugit" = x"yes"; then - AC_DEFINE([DEBUG],[],[Debug Mode]) - AM_CFLAGS="$AM_CFLAGS -g -rdynamic -ggdb" -else - AC_DEFINE([NDEBUG],[],[No-debug Mode]) -fi -AC_SUBST([AM_CFLAGS]) - -# Checks for programs. -AC_PROG_CC - -# Checks for libraries. - -# Checks for header files. -AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_STDBOOL -AC_C_INLINE -AC_TYPE_INT16_T -AC_TYPE_INT32_T -AC_TYPE_OFF_T -AC_TYPE_PID_T -AC_TYPE_SIZE_T -AC_TYPE_SSIZE_T -AC_TYPE_UINT16_T -AC_TYPE_UINT32_T - -# Checks for library functions. -AC_FUNC_ERROR_AT_LINE -AC_FUNC_FORK -AC_FUNC_STRCOLL -AC_FUNC_STRTOD -AC_CHECK_FUNCS([dup2 gethostbyname gettimeofday inet_ntoa memchr memmove memset select socket strcasecmp strchr strerror strstr strtol]) - -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/dev-db/redis/files/configure.ac-3.2 b/dev-db/redis/files/configure.ac-3.2 deleted file mode 100644 index 3e2cf9267266..000000000000 --- a/dev-db/redis/files/configure.ac-3.2 +++ /dev/null @@ -1,66 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.63) -AC_INIT(redis, 3.2.3, antirez@gmail.com) -AM_CFLAGS="-std=c99 -pedantic -Wall -W -D__EXTENSIONS__ -D_XPG6" -if test x"$CFLAGS" = x""; then - AM_CFLAGS="$AM_CFLAGS -O2" -else - AM_CFLAGS="$AM_CFLAGS $CFLAGS" -fi - -# options -AC_MSG_CHECKING([whether to build with debug information]) -AC_ARG_ENABLE([debug], - [AS_HELP_STRING([--enable-debug], - [enable debug data generation (def=no)])], - [debugit="$enableval"], - [debugit=no]) -AC_MSG_RESULT([$debugit]) - -if test x"$debugit" = x"yes"; then - AC_DEFINE([DEBUG],[],[Debug Mode]) - AM_CFLAGS="$AM_CFLAGS -g -rdynamic -ggdb" -else - AC_DEFINE([NDEBUG],[],[No-debug Mode]) -fi -AC_SUBST([AM_CFLAGS]) - -# Checks for programs. -AC_PROG_CC - -# Checks for libraries. - -# Checks for header files. -AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_STDBOOL -AC_C_INLINE -AC_TYPE_INT16_T -AC_TYPE_INT32_T -AC_TYPE_OFF_T -AC_TYPE_PID_T -AC_TYPE_SIZE_T -AC_TYPE_SSIZE_T -AC_TYPE_UINT16_T -AC_TYPE_UINT32_T - -# Checks for library functions. -AC_FUNC_ERROR_AT_LINE -AC_FUNC_FORK -AC_FUNC_STRCOLL -AC_FUNC_STRTOD -AC_CHECK_FUNCS([dup2 gethostbyname gettimeofday inet_ntoa memchr memmove memset select socket strcasecmp strchr strerror strstr strtol]) - -# Check for lua-5.1 or luajit -AC_ARG_WITH([luajit], - AS_HELP_STRING([--with-luajit], [Use luajit instead of lua])) - -AS_IF([test "x$with_luajit" = "xyes"], - [PKG_CHECK_MODULES([LUA], [luajit >= 2], [], [AC_MSG_ERROR([luajit requested but not found])])], - [PKG_CHECK_MODULES([LUA], [lua5.1], [], [AC_MSG_ERROR([lua-5.1 required but not found])])]) - -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/dev-db/redis/files/redis-2.8.17-config.patch b/dev-db/redis/files/redis-2.8.17-config.patch deleted file mode 100644 index c9f6b2af172b..000000000000 --- a/dev-db/redis/files/redis-2.8.17-config.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/redis.conf 2014-12-02 16:22:38.722433643 +0100 -+++ b/redis.conf 2014-12-02 16:22:16.252249350 +0100 -@@ -38,7 +38,7 @@ - - # When running daemonized, Redis writes a pid file in /var/run/redis.pid by - # default. You can specify a custom pid file location here. --pidfile /var/run/redis.pid -+pidfile /run/redis/redis.pid - - # Accept connections on the specified port, default is 6379. - # If port 0 is specified Redis will not listen on a TCP socket. -@@ -61,7 +61,7 @@ - # Examples: - # - # bind 192.168.1.100 10.0.0.1 --# bind 127.0.0.1 -+bind 127.0.0.1 - - # Specify the path for the Unix socket that will be used to listen for - # incoming connections. There is no default, so Redis will not listen -@@ -100,7 +100,7 @@ - # Specify the log file name. Also the empty string can be used to force - # Redis to log on the standard output. Note that if you use standard - # output for logging but daemonize, logs will be sent to /dev/null --logfile "" -+logfile /var/log/redis/redis.log - - # To enable logging to the system logger, just set 'syslog-enabled' to yes, - # and optionally update the other syslog parameters to suit your needs. -@@ -184,7 +184,7 @@ - # The Append Only File will also be created inside this directory. - # - # Note that you must specify a directory here, not a file name. --dir ./ -+dir /var/lib/redis/ - - ################################# REPLICATION ################################# - -@@ -403,6 +403,7 @@ - # output buffers (but this is not needed if the policy is 'noeviction'). - # - # maxmemory <bytes> -+maxmemory 67108864 - - # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory - # is reached. You can select among five behaviors: diff --git a/dev-db/redis/files/redis-2.8.3-shared.patch b/dev-db/redis/files/redis-2.8.3-shared.patch deleted file mode 100644 index d32484f0cd18..000000000000 --- a/dev-db/redis/files/redis-2.8.3-shared.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 388a76f24c96767c831ee7682234fd9f2bc5b9ac -Author: Johan Bergström <bugs@bergstroem.nu> -Date: Mon Nov 25 09:17:14 2013 +1100 - - Use shared jemalloc - -diff --git src/Makefile src/Makefile -index c37549d..77e6255 100644 ---- src/Makefile -+++ src/Makefile -@@ -26,12 +26,7 @@ PREFIX?=/usr/local - INSTALL_BIN=$(PREFIX)/bin - INSTALL=install - --# Default allocator --ifeq ($(uname_S),Linux) -- MALLOC=jemalloc --else -- MALLOC=libc --endif -+MALLOC?=jemalloc - - # Backwards compatibility for selecting an allocator - ifeq ($(USE_TCMALLOC),yes) -@@ -79,9 +74,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) - endif - - ifeq ($(MALLOC),jemalloc) -- DEPENDENCY_TARGETS+= jemalloc -- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include -- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl -+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -+ FINAL_LIBS+= -ljemalloc -ldl - endif - - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) diff --git a/dev-db/redis/files/redis-3.0.0-sharedlua.patch b/dev-db/redis/files/redis-3.0.0-sharedlua.patch deleted file mode 100644 index ba983efafc7c..000000000000 --- a/dev-db/redis/files/redis-3.0.0-sharedlua.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit fd0fc43f6e0ea45bce0e1a68c1f736e481fc4429 -Author: Johan Bergström <bugs@bergstroem.nu> -Date: Thu Apr 2 14:33:51 2015 +1100 - - Use shared LUA - -diff --git src/Makefile src/Makefile -index a88f1d2..f71e7b5 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 -@@ -47,6 +47,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 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_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) diff --git a/dev-db/redis/files/redis-3.2.3-config.patch b/dev-db/redis/files/redis-3.2.3-config.patch deleted file mode 100644 index bde0ef7cbaf1..000000000000 --- a/dev-db/redis/files/redis-3.2.3-config.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/redis.conf b/redis.conf -index 22e00bc..b09de57 100644 ---- a/redis.conf -+++ b/redis.conf -@@ -147,7 +147,7 @@ supervised no - # - # Creating a pid file is best effort: if Redis is not able to create it - # nothing bad happens, the server will start and run normally. --pidfile /var/run/redis_6379.pid -+pidfile /run/redis/redis.pid - - # Specify the server verbosity level. - # This can be one of: -@@ -160,7 +160,7 @@ loglevel notice - # Specify the log file name. Also the empty string can be used to force - # Redis to log on the standard output. Note that if you use standard - # output for logging but daemonize, logs will be sent to /dev/null --logfile "" -+logfile /var/log/redis/redis.log - - # To enable logging to the system logger, just set 'syslog-enabled' to yes, - # and optionally update the other syslog parameters to suit your needs. -@@ -244,7 +244,7 @@ dbfilename dump.rdb - # The Append Only File will also be created inside this directory. - # - # Note that you must specify a directory here, not a file name. --dir ./ -+dir /var/lib/redis/ - - ################################# REPLICATION ################################# - -@@ -534,7 +534,7 @@ slave-priority 100 - # limit for maxmemory so that there is some free RAM on the system for slave - # output buffers (but this is not needed if the policy is 'noeviction'). - # --# maxmemory <bytes> -+maxmemory 64MB - - # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory - # is reached. You can select among five behaviors: diff --git a/dev-db/redis/files/redis-3.2.3-sharedlua.patch b/dev-db/redis/files/redis-3.2.3-sharedlua.patch deleted file mode 100644 index 52de9048463f..000000000000 --- a/dev-db/redis/files/redis-3.2.3-sharedlua.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c -index c26c0d7..fa50c41 100644 ---- a/deps/lua/src/lua_cjson.c -+++ b/deps/lua/src/lua_cjson.c -@@ -46,7 +46,7 @@ - #include "strbuf.h" - #include "fpconv.h" - --#include "../../../src/solarisfixes.h" -+#include "solarisfixes.h" - - #ifndef CJSON_MODNAME - #define CJSON_MODNAME "cjson" -diff --git a/src/Makefile b/src/Makefile -index 648127a..1f96d98 100644 ---- a/src/Makefile -+++ b/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 geohash-int -+DEPENDENCY_TARGETS=hiredis linenoise geohash-int - - # Default settings - STD=-std=c99 -pedantic -DREDIS_STATIC='' -@@ -56,6 +56,7 @@ endif - FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -I../deps/geohash-int - FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm -+FINAL_LIBS+=@LUA_LIBS@ - DEBUG=-g -ggdb - - ifeq ($(uname_S),SunOS) -@@ -80,7 +81,7 @@ endif - endif - endif - # Include paths to dependencies --FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise @LUA_CFLAGS@ - - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -118,6 +119,7 @@ endif - REDIS_SERVER_NAME=redis-server - REDIS_SENTINEL_NAME=redis-sentinel - 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 -+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o - REDIS_GEOHASH_OBJ=../deps/geohash-int/geohash.o ../deps/geohash-int/geohash_helper.o - REDIS_CLI_NAME=redis-cli - REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o -@@ -172,7 +174,7 @@ endif - - # redis-server - $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS) - - # redis-sentinel - $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/dev-db/redis/files/redis-3.2.5-shared.patch b/dev-db/redis/files/redis-3.2.5-shared.patch deleted file mode 100644 index 7ebff12b5196..000000000000 --- a/dev-db/redis/files/redis-3.2.5-shared.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index fdbe36a..df224ae 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -26,12 +26,7 @@ PREFIX?=/usr/local - INSTALL_BIN=$(PREFIX)/bin - INSTALL=install - --# Default allocator --ifeq ($(uname_S),Linux) -- MALLOC=jemalloc --else -- MALLOC=libc --endif -+MALLOC?=jemalloc - - # Backwards compatibility for selecting an allocator - ifeq ($(USE_TCMALLOC),yes) -@@ -103,9 +98,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) - endif - - ifeq ($(MALLOC),jemalloc) -- DEPENDENCY_TARGETS+= jemalloc -- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include -- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -+ FINAL_LIBS+= -ljemalloc -ldl - endif - - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) diff --git a/dev-db/redis/files/redis-4.0.1-shared.patch b/dev-db/redis/files/redis-4.0.1-shared.patch deleted file mode 100644 index 945d114ae2fb..000000000000 --- a/dev-db/redis/files/redis-4.0.1-shared.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 86e0b3fe..c7db0ee9 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -29,14 +29,7 @@ INSTALL_BIN=$(PREFIX)/bin - INSTALL=install - - # Default allocator defaults to Jemalloc if it's not an ARM --MALLOC=libc --ifneq ($(uname_M),armv6l) --ifneq ($(uname_M),armv7l) --ifeq ($(uname_S),Linux) -- MALLOC=jemalloc --endif --endif --endif -+MALLOC?=jemalloc - - # To get ARM stack traces if Redis crashes we need a special C flag. - ifneq (,$(findstring armv,$(uname_M))) -@@ -120,9 +113,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) - endif - - ifeq ($(MALLOC),jemalloc) -- DEPENDENCY_TARGETS+= jemalloc -- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include -- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -+ FINAL_LIBS+= -ljemalloc -ldl - endif - - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) diff --git a/dev-db/redis/files/redis-4.0.1-sharedlua.patch b/dev-db/redis/files/redis-4.0.1-sharedlua.patch deleted file mode 100644 index d2b572250e86..000000000000 --- a/dev-db/redis/files/redis-4.0.1-sharedlua.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c -index c26c0d7b..fa50c410 100644 ---- a/deps/lua/src/lua_cjson.c -+++ b/deps/lua/src/lua_cjson.c -@@ -46,7 +46,7 @@ - #include "strbuf.h" - #include "fpconv.h" - --#include "../../../src/solarisfixes.h" -+#include "solarisfixes.h" - - #ifndef CJSON_MODNAME - #define CJSON_MODNAME "cjson" -diff --git a/src/Makefile b/src/Makefile -index 86e0b3fe..09630321 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') - uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') - uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') - OPTIMIZATION?=-O2 --DEPENDENCY_TARGETS=hiredis linenoise lua -+DEPENDENCY_TARGETS=hiredis linenoise - NODEPS:=clean distclean - - # Default settings -@@ -66,6 +66,7 @@ endif - FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) - FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm -+FINAL_LIBS+=@LUA_LIBS@ - DEBUG=-g -ggdb - - ifeq ($(uname_S),SunOS) -@@ -107,7 +108,7 @@ endif - endif - endif - # Include paths to dependencies --FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise @LUA_CFLAGS@ - - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -145,6 +146,7 @@ endif - REDIS_SERVER_NAME=redis-server - REDIS_SENTINEL_NAME=redis-sentinel - 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 redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.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 adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o - REDIS_BENCHMARK_NAME=redis-benchmark -@@ -196,7 +198,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-sentinel-4.0.6-config.patch b/dev-db/redis/files/redis-sentinel-4.0.6-config.patch deleted file mode 100644 index f2a75814951c..000000000000 --- a/dev-db/redis/files/redis-sentinel-4.0.6-config.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/sentinel.conf b/sentinel.conf -index 0e1b266..869a4b9 100644 ---- a/sentinel.conf -+++ b/sentinel.conf -@@ -194,3 +194,4 @@ sentinel failover-timeout mymaster 180000 - # - # sentinel client-reconfig-script mymaster /var/redis/reconfig.sh - -+logfile "/var/log/redis/sentinel.log" diff --git a/dev-db/redis/files/redis-sentinel.confd b/dev-db/redis/files/redis-sentinel.confd deleted file mode 100644 index f465a5c3e91f..000000000000 --- a/dev-db/redis/files/redis-sentinel.confd +++ /dev/null @@ -1,16 +0,0 @@ -# Redis-sentinel user. -REDIS_SENTINEL_USER="redis" - -# Redis-sentinel group. -REDIS_SENTINEL_GROUP="redis" - -# Redis-sentinel configuration file. -REDIS_SENTINEL_CONF="/etc/sentinel.conf" - -# Redis-sentinel working directory. -REDIS_SENTINEL_DIR="/tmp" - -# Specify the network service that corresponds to the "bind" setting -# in your sentinel.conf. For example, if you bind to 127.0.0.1, this should -# be set to "net.lo" which provides the loopback interface. -rc_need="net.lo" diff --git a/dev-db/redis/files/redis-sentinel.initd b/dev-db/redis/files/redis-sentinel.initd deleted file mode 100644 index 6a22d08db697..000000000000 --- a/dev-db/redis/files/redis-sentinel.initd +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -: ${REDIS_SENTINEL_DIR:=/tmp} -: ${REDIS_SENTINEL_CONF:=/etc/sentinel.conf} -: ${REDIS_SENTINEL_USER:=redis} -: ${REDIS_SENTINEL_GROUP:=redis} -: ${REDIS_SENTINEL_TIMEOUT:=30} - -command="/usr/sbin/redis-sentinel" -command_args="${REDIS_SENTINEL_CONF}" -command_background="true" -command_user="${REDIS_SENTINEL_USER}:${REDIS_SENTINEL_GROUP}" -pidfile="/run/${RC_SVCNAME}.pid" -retry="${REDIS_SENTINEL_TIMEOUT}" -start_stop_daemon_args="--chdir \"${REDIS_SENTINEL_DIR}\"" - -depend() { - use localmount logger - after keepalived redis -} diff --git a/dev-db/redis/files/redis.confd b/dev-db/redis/files/redis.confd deleted file mode 100644 index 07585fa7a116..000000000000 --- a/dev-db/redis/files/redis.confd +++ /dev/null @@ -1,20 +0,0 @@ -# Redis user. -REDIS_USER="redis" - -# Redis group. -REDIS_GROUP="redis" - -# Redis configuration file. -REDIS_CONF="/etc/redis.conf" - -# Redis dump directory. -REDIS_DIR="/var/lib/redis" - -# Redis pid file. -# (Be sure to change the main redis configuration file as well if you change -# this from the default.) -REDIS_PID="/var/run/redis/redis.pid" - -# Redis options. -# (Redis expects the first argument to be the configuration file.) -REDIS_OPTS="${REDIS_CONF}" diff --git a/dev-db/redis/files/redis.confd-r1 b/dev-db/redis/files/redis.confd-r1 deleted file mode 100644 index 1f4ff23f211b..000000000000 --- a/dev-db/redis/files/redis.confd-r1 +++ /dev/null @@ -1,20 +0,0 @@ -# Redis user. -REDIS_USER="redis" - -# Redis group. -REDIS_GROUP="redis" - -# Redis configuration file. -REDIS_CONF="/etc/redis.conf" - -# Redis dump directory. -REDIS_DIR="/var/lib/redis" - -# Redis options. -# (Redis expects the first argument to be the configuration file.) -REDIS_OPTS="${REDIS_CONF}" - -# Specify the network service that corresponds to the "bind" setting -# in your redis.conf. For example, if you bind to 127.0.0.1, this should -# be set to "net.lo" which provides the loopback interface. -rc_need="net.lo" diff --git a/dev-db/redis/files/redis.initd-4 b/dev-db/redis/files/redis.initd-4 deleted file mode 100644 index 5c12fdc7c79d..000000000000 --- a/dev-db/redis/files/redis.initd-4 +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/openrc-run - -REDIS_DIR=${REDIS_DIR:-/var/lib/redis} -REDIS_CONF=${REDIS_CONF:-/etc/redis.conf} -REDIS_OPTS=${REDIS_OPTS:-"${REDIS_CONF}"} -REDIS_USER=${REDIS_USER:-redis} -REDIS_GROUP=${REDIS_GROUP:-redis} -REDIS_TIMEOUT=${REDIS_TIMEOUT:-30} - -command=/usr/sbin/redis-server -pidfile=${REDIS_PID:-/run/redis/redis.pid} -start_stop_daemon_args="--background --pidfile ${pidfile} --chdir \"${REDIS_DIR}\" --user ${REDIS_USER} --group ${REDIS_GROUP}" -command_args="${REDIS_OPTS}" - -depend() { - use net localmount logger - after keepalived -} - -start_pre() { - checkpath -d -m 0775 -o ${REDIS_USER}:${REDIS_GROUP} $(dirname ${REDIS_PID}) -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop \ - --exec ${command} \ - --retry ${REDIS_TIMEOUT} \ - --pidfile ${pidfile} - eend -} diff --git a/dev-db/redis/files/redis.initd-5 b/dev-db/redis/files/redis.initd-5 deleted file mode 100644 index bfeeb6925ec0..000000000000 --- a/dev-db/redis/files/redis.initd-5 +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -: ${REDIS_DIR:=/var/lib/redis} -: ${REDIS_CONF:=/etc/redis.conf} -: ${REDIS_OPTS:="${REDIS_CONF}"} -: ${REDIS_USER:=redis} -: ${REDIS_GROUP:=redis} -: ${REDIS_TIMEOUT:=30} - -# https://bugs.gentoo.org/631002#c10 -# Force '--daemonize no' to override the config file -command="/usr/sbin/redis-server" -command_args="${REDIS_OPTS} --daemonize no" -command_background="true" -command_user="${REDIS_USER}:${REDIS_GROUP}" -pidfile="/run/${RC_SVCNAME}.pid" -retry="${REDIS_TIMEOUT}" -start_stop_daemon_args="--chdir \"${REDIS_DIR}\"" - -depend() { - use localmount logger - after keepalived -} diff --git a/dev-db/redis/files/redis.logrotate b/dev-db/redis/files/redis.logrotate deleted file mode 100644 index 2df390c2d1b4..000000000000 --- a/dev-db/redis/files/redis.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/redis/redis.log /var/log/redis/sentinel.log { - compress - delaycompress - notifempty - missingok -} diff --git a/dev-db/redis/files/redis.service-2 b/dev-db/redis/files/redis.service-2 deleted file mode 100644 index c36d7960ef71..000000000000 --- a/dev-db/redis/files/redis.service-2 +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=A persistent key-value database -After=syslog.target network.target - -[Service] -Type=simple -PIDFile=/var/run/redis/redis.pid -ExecStart=/usr/sbin/redis-server /etc/redis.conf -User=redis -Group=redis - -[Install] -WantedBy=multi-user.target - diff --git a/dev-db/redis/files/redis.tmpfiles b/dev-db/redis/files/redis.tmpfiles deleted file mode 100644 index 657d8a551d4b..000000000000 --- a/dev-db/redis/files/redis.tmpfiles +++ /dev/null @@ -1,2 +0,0 @@ -# redis runtime directory -d /var/run/redis 0755 redis root - |