diff options
| author | Petr Vaněk <arkamar@atlas.cz> | 2022-07-10 11:58:27 +0200 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-07-10 13:53:32 +0100 |
| commit | 03485050cb1becab6da142ab138b15d3fd118ccd (patch) | |
| tree | e118e75f3beef31617ae27260fba1859cbb28a0a /dev-db/redis/files | |
| parent | 4fb6f8404a2427cc49668ca9741dc26c0dbf79f3 (diff) | |
| download | gentoo-03485050cb1becab6da142ab138b15d3fd118ccd.tar.gz gentoo-03485050cb1becab6da142ab138b15d3fd118ccd.tar.bz2 gentoo-03485050cb1becab6da142ab138b15d3fd118ccd.zip | |
dev-db/redis: drop 5.0.14, EOL
5.0 line is not supported by upstream anymore and it suffers with known
vulnerabilities.
Bug: https://bugs.gentoo.org/841404
Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-db/redis/files')
| -rw-r--r-- | dev-db/redis/files/redis-5.0-sharedlua.patch | 60 | ||||
| -rw-r--r-- | dev-db/redis/files/redis-sentinel.confd | 16 | ||||
| -rw-r--r-- | dev-db/redis/files/redis-sentinel.initd | 22 | ||||
| -rw-r--r-- | dev-db/redis/files/redis.confd-r1 | 20 | ||||
| -rw-r--r-- | dev-db/redis/files/redis.initd-5 | 25 | ||||
| -rw-r--r-- | dev-db/redis/files/redis.service-3 | 14 | ||||
| -rw-r--r-- | dev-db/redis/files/redis.tmpfiles | 2 |
7 files changed, 0 insertions, 159 deletions
diff --git a/dev-db/redis/files/redis-5.0-sharedlua.patch b/dev-db/redis/files/redis-5.0-sharedlua.patch deleted file mode 100644 index 3e14f41733b0..000000000000 --- a/dev-db/redis/files/redis-5.0-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 773d3b2..2d120d4 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 t_stream.o listpack.o localtime.o lolwut.o lolwut5.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 dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.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.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-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-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.service-3 b/dev-db/redis/files/redis.service-3 deleted file mode 100644 index 1c733fcec172..000000000000 --- a/dev-db/redis/files/redis.service-3 +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=A persistent key-value database -After=syslog.target network.target - -[Service] -Type=simple -PIDFile=/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 - |
