commit: 8f1f88154c6ed0311dacb5433296d5b424e8af78 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Sun Sep 25 06:06:46 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Sep 26 14:58:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1f8815
dev-db/redis: drop 6.0.16 The 6.0 line did not receive any fix in last 12 months, 6.0.16 potentially suffers with security issues and 6.2.7 should be sufficient replacement for those needing <dev-db/redis-7. Bug: https://bugs.gentoo.org/841404 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/27470 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-db/redis/Manifest | 1 - dev-db/redis/files/redis-3.2.3-config.patch | 40 ----- dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch | 47 ----- dev-db/redis/files/redis-5.0.8-ppc-atomic.patch | 19 -- dev-db/redis/files/redis-6.0.12-sharedlua.patch | 60 ------- dev-db/redis/redis-6.0.16.ebuild | 200 ---------------------- 6 files changed, 367 deletions(-) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 6d0144bd033b..75331b184be9 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -1,4 +1,3 @@ -DIST redis-6.0.16.tar.gz 2288647 BLAKE2B f3552cc0d27cbc5cf6556792da9a75d01ff70d372484c95d2af8b24ec902a8086b9c3f4e53513df982fe135963432bfb527334926dd494e50d2cc618ab813f39 SHA512 83bb72448f9943e3d015cb4d961eb2eae21602ef1f90ca52ca8ab7c6918b0ab979db9f61f3981df27b2286894f4864f4588c3a52fa988e30e9419b0967998845 DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953 DIST redis-7.0.4.tar.gz 2963216 BLAKE2B 95ad18547b4be0b199fccc4b0f534b00d2f442609b604b02ef83f44cef4283048d1f8b89e383a14208a00842eb3d6655649d32169a2a6586ed6fac1792e19d5a SHA512 7edecfa667b30584666be0a2dbcb2ac25a6764fa5b8db49ab421602ad20272eeab99ccff0b7c2f789c30a0425d80b774515b03c849e517451cbe597d37eb0247 DIST redis-7.0.5.tar.gz 2968205 BLAKE2B c319a2f656e4bd26637735ef73e58eecc306e202b57d6da3a38150a02d738a414c6696e261b8ab88033e117aee4f02308aab9ca4a5f382d66ec3a10f3e020580 SHA512 16ff920cb8df4d82e78ef34209285024aa98189be8acbca86b10fb3064dcc70eac60206aadece6af08406860ed01a004ce3aaa86be896ea36c7f486686646753 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-5.0-luajit-2.1-fix.patch b/dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch deleted file mode 100644 index 968fc865da86..000000000000 --- a/dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -Backported from https://github.com/openresty/lua-cjson - -Upstream-commit: 638ac2741a7f ("optimize: improved forward-compatibility with older versions of Lua/LuaJIT.") -Link: https://github.com/openresty/lua-cjson/commit/638ac2741a7f274979ac3fe2e1ea5fd6487702fe -Upstream-PR: https://github.com/openresty/lua-cjson/pull/32 -See-also: https://www.freelists.org/post/luajit/ANN-LuaJIT210beta3,3 - -diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c -index c26c0d7b8..af9e4ca54 100644 ---- a/deps/lua/src/lua_cjson.c -+++ b/deps/lua/src/lua_cjson.c -@@ -1293,11 +1293,13 @@ static int json_decode(lua_State *l) - /* ===== INITIALISATION ===== */ - - #if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502 --/* Compatibility for Lua 5.1. -+/* Compatibility for Lua 5.1 and older LuaJIT. - * -- * luaL_setfuncs() is used to create a module table where the functions have -- * json_config_t as their first upvalue. Code borrowed from Lua 5.2 source. */ --static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup) -+ * compat_luaL_setfuncs() is used to create a module table where the functions -+ * have json_config_t as their first upvalue. Code borrowed from Lua 5.2 -+ * source's luaL_setfuncs(). -+ */ -+static void compat_luaL_setfuncs(lua_State *l, const luaL_Reg *reg, int nup) - { - int i; - -@@ -1310,6 +1312,8 @@ static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup) - } - lua_pop(l, nup); /* remove upvalues */ - } -+#else -+#define compat_luaL_setfuncs(L, reg, nup) luaL_setfuncs(L, reg, nup) - #endif - - /* Call target function in protected mode with all supplied args. -@@ -1365,7 +1369,7 @@ static int lua_cjson_new(lua_State *l) - - /* Register functions with config data as upvalue */ - json_create_config(l); -- luaL_setfuncs(l, reg, 1); -+ compat_luaL_setfuncs(l, reg, 1); - - /* Set cjson.null */ - lua_pushlightuserdata(l, NULL); diff --git a/dev-db/redis/files/redis-5.0.8-ppc-atomic.patch b/dev-db/redis/files/redis-5.0.8-ppc-atomic.patch deleted file mode 100644 index 61a4cc721eb1..000000000000 --- a/dev-db/redis/files/redis-5.0.8-ppc-atomic.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 4b2a31c..4ef853b 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -77,6 +77,14 @@ FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm - DEBUG=-g -ggdb - -+ifneq (,$(filter powerpc ppc,$(uname_M))) -+ FINAL_LIBS+=-latomic -+else -+ifneq (,$(findstring ppc,$(uname_M))) -+ FINAL_LIBS+=-latomic -+endif -+endif -+ - # Linux ARM needs -latomic at linking time - ifneq (,$(filter aarch64 armv,$(uname_M))) - FINAL_LIBS+=-latomic diff --git a/dev-db/redis/files/redis-6.0.12-sharedlua.patch b/dev-db/redis/files/redis-6.0.12-sharedlua.patch deleted file mode 100644 index 3707bcf30788..000000000000 --- a/dev-db/redis/files/redis-6.0.12-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 cfecbb2..86c3127 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 -@@ -69,6 +69,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 - - # Linux ARM needs -latomic at linking time -@@ -159,7 +160,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@ - - # Determine systemd support and/or build preference (defaulting to auto-detection) - BUILD_WITH_SYSTEMD=no -@@ -238,6 +239,7 @@ endif - REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX) - REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX) - 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 crcspeed.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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o mt19937-64.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$(PROG_SUFFIX) - REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o mt19937-64.o - REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) -@@ -291,7 +293,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/redis-6.0.16.ebuild b/dev-db/redis/redis-6.0.16.ebuild deleted file mode 100644 index 9c1f2e88c2da..000000000000 --- a/dev-db/redis/redis-6.0.16.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Redis does NOT build with Lua 5.2 or newer at this time: -# - 5.3 and 5.4 give: -# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" -# - 5.2 fails with: -# scripting.c:(.text+0x1f9b): undefined reference to `lua_open' -# because lua_open became lua_newstate in 5.2 -LUA_COMPAT=( lua5-1 luajit ) - -inherit autotools edo flag-o-matic lua-single multiprocessing systemd tmpfiles toolchain-funcs - -DESCRIPTION="A persistent caching system, key-value and data structures database" -HOMEPAGE="https://redis.io"; -SRC_URI="https://download.redis.io/releases/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="+jemalloc selinux ssl systemd tcmalloc test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - ${LUA_DEPS} - jemalloc? ( >=dev-libs/jemalloc-5.1:= ) - ssl? ( dev-libs/openssl:0= ) - systemd? ( sys-apps/systemd:= ) - tcmalloc? ( dev-util/google-perftools ) -" - -RDEPEND=" - ${COMMON_DEPEND} - acct-group/redis - acct-user/redis - selinux? ( sec-policy/selinux-redis ) -" - -BDEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig -" - -# Tcl is only needed in the CHOST test env -DEPEND=" - ${COMMON_DEPEND} - test? ( - dev-lang/tcl:0= - ssl? ( dev-tcltk/tls ) - )" - -REQUIRED_USE="?? ( jemalloc tcmalloc ) - ${LUA_REQUIRED_USE}" - -PATCHES=( - "${FILESDIR}"/${PN}-3.2.3-config.patch - "${FILESDIR}"/${PN}-5.0-shared.patch - "${FILESDIR}"/${PN}-6.0.12-sharedlua.patch - "${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch - "${FILESDIR}"/${PN}-sentinel-5.0-config.patch - "${FILESDIR}"/${PN}-5.0-luajit-2.1-fix.patch -) - -src_prepare() { - default - - # Copy lua modules into build dir - cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die - cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die - # Append cflag for lua_cjson - # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 - append-cflags "-DENABLE_CJSON_GLOBAL" - - # now we will rewrite present Makefiles - local makefiles="" MKF - for MKF in $(find -name 'Makefile' | cut -b 3-); do - mv "${MKF}" "${MKF}.in" - sed -i -e 's:$(CC):@CC@:g' \ - -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ - -e 's: $(DEBUG)::g' \ - -e 's:$(OBJARCH)::g' \ - -e 's:ARCH:TARCH:g' \ - -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ - "${MKF}.in" \ - || die "Sed failed for ${MKF}" - makefiles+=" ${MKF}" - done - # autodetection of compiler and settings; generates the modified Makefiles - cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die - - # Use the correct pkgconfig name for Lua. - # The upstream configure script handles luajit specially, and is not - # affected by these changes. - sed -i \ - -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ - -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ - -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \ - configure.ac || die "Sed failed for configure.ac" - eautoreconf -} - -src_configure() { - econf $(use_with lua_single_target_luajit luajit) - - # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 - # also, don't define ANSI/c99 for lua twice - sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die -} - -src_compile() { - local myconf="" - - if use jemalloc; then - myconf+="MALLOC=jemalloc" - elif use tcmalloc; then - myconf+="MALLOC=tcmalloc" - else - myconf+="MALLOC=libc" - fi - - if use ssl; then - myconf+=" BUILD_TLS=yes" - fi - - export USE_SYSTEMD=$(usex systemd) - - tc-export AR CC RANLIB - emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" -} - -src_test() { - local runtestargs=( - --clients "$(makeopts_jobs)" # see bug #649868 - - # unstable on jemalloc, see https://github.com/gentoo/gentoo/pull/15924 - --skiptest "Active defrag" - --skiptest "Active defrag big keys" - --skiptest "Active defrag big list" - --skiptest "Active defrag edge case" - ) - - if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then - ewarn "unit/oom-score-adj test will be skipped." \ - "It is known to fail with FEATURES usersandbox or -userpriv. See bug #756382." - - # unit/oom-score-adj was introduced in version 6.2.0 and it was later backported to 6.0.7 - runtestargs+=( --skipunit unit/oom-score-adj ) # see bug #756382 - fi - - if use ssl; then - edo ./utils/gen-test-certs.sh - runtestargs+=( --tls ) - fi - - edo ./runtest "${runtestargs[@]}" -} - -src_install() { - insinto /etc/redis - doins redis.conf sentinel.conf - use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf - fperms 0750 /etc/redis - fperms 0644 /etc/redis/{redis,sentinel}.conf - - newconfd "${FILESDIR}/redis.confd-r2" redis - newinitd "${FILESDIR}/redis.initd-6" redis - - systemd_newunit "${FILESDIR}/redis.service-4" redis.service - newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf - - newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel - newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md - - dobin src/redis-cli - dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb - fperms 0750 /usr/sbin/redis-benchmark - dosym redis-server /usr/sbin/redis-sentinel - - if use prefix; then - diropts -m0750 - else - diropts -m0750 -o redis -g redis - fi - keepdir /var/{log,lib}/redis -} - -pkg_postinst() { - tmpfiles_process redis.conf - - ewarn "The default redis configuration file location changed to:" - ewarn " /etc/redis/{redis,sentinel}.conf" - ewarn "Please apply your changes to the new configuration files." -}
