[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: 8942d96c5ff1a45db0922d9e5e4403b050494bf6 Author: Petr Vaněk gentoo org> AuthorDate: Wed Jan 10 12:25:59 2024 + Commit: Petr Vaněk gentoo org> CommitDate: Wed Jan 10 12:27:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8942d96c dev-db/redis: drop 7.0.5-r1 Bug: https://bugs.gentoo.org/891169 Bug: https://bugs.gentoo.org/898464 Bug: https://bugs.gentoo.org/902501 Bug: https://bugs.gentoo.org/904486 Bug: https://bugs.gentoo.org/910191 Bug: https://bugs.gentoo.org/913741 Bug: https://bugs.gentoo.org/915989 Bug: https://bugs.gentoo.org/921662 Signed-off-by: Petr Vaněk gentoo.org> dev-db/redis/Manifest | 1 - .../files/redis-7.0.4-replica-tests-fix.patch | 61 --- dev-db/redis/files/redis-7.0.5-cve-2022-3647.patch | 173 --- dev-db/redis/redis-7.0.5-r1.ebuild | 191 - 4 files changed, 426 deletions(-) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 6136540cfb05..a42b7489 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -1,7 +1,6 @@ DIST redis-6.2.14.tar.gz 2496149 BLAKE2B 689a0c3b558e07f43f8b1480fbf7a083184bbc0ccde0b184dc8a1d89ed22bec9694b7c8605ff729c9e9d582e8cf47c8f9cd9ee0794ea15e07cdb0b886e93c116 SHA512 140d4b23c20d459b65be8c61996e281222f978b51c52cb048039d741801e4027775ad89ed354dc0dce3d47703a08610adafaf6253fea2f973d5b9d20bc1e59ce DIST redis-7.0.14.tar.gz 2994188 BLAKE2B ab4325df8f1af1f7b8c634265a1c7001486c305d4210e72045e6434207e4a447e67d41fa07bd3cd5a57da173e7f9893bf386b18b556156cf559019573a7c4f8b SHA512 31d851dd72cea7d1e48c0df5646c91a2f7b72696067c017936984c49912f6e846ba6469c1ee8e361e362c8683912a25f6eee3993ed1a73cfe70051e84ad79b8b DIST redis-7.0.15.tar.gz 2994329 BLAKE2B fa1bc85c89cb6a6fb18710a4d29c20db44a80ce445d217f39a234a2aad1d79031e9d1fc45415af7b0eb1c169bd88f45f1fe60cab35de38c6fadc839e2a27676d SHA512 83d58f98085f91754f6d87810e7da0d6cf11ffbe11a0f5d3581d5b2c63d2a752ba6b4eda921a04031aedc56ecebe349cd468ab5ad837493f55d2cac0ab3d015a -DIST redis-7.0.5.tar.gz 2968205 BLAKE2B c319a2f656e4bd26637735ef73e58eecc306e202b57d6da3a38150a02d738a414c6696e261b8ab88033e117aee4f02308aab9ca4a5f382d66ec3a10f3e020580 SHA512 16ff920cb8df4d82e78ef34209285024aa98189be8acbca86b10fb3064dcc70eac60206aadece6af08406860ed01a004ce3aaa86be896ea36c7f486686646753 DIST redis-7.2.1.tar.gz 3383319 BLAKE2B 92784af3d1df338a8af7475ab7c598309f33f682ad4bb0b827f170c9f20c1a0879b433c6325c90dd6ba17e06e95bf7d8a9a665d6706065ff4c4c8c141d9c93c1 SHA512 7df4afd51dceea0edbb999027c84820a6aebdd58d71b2e93a4861120fa2b9c0801a0e61c70e695845dbff4e9b96907a4215dcacf72d3593ad014cfa584b5cad0 DIST redis-7.2.3.tar.gz 3384816 BLAKE2B 6aaf1bae377f3885affd140365eb0c2c30079fe40d770af1ac75a50647ce811e6c4dccd4b886db315e7b78e60661fa0bee280d707c1c4490f32086d0793069c3 SHA512 2ce4bbb056372f1180ceb1863106d07b021d32af2379f1f5dfc61e930c2cd0303433af22c7231adc8890ab5581cb41be3b792f19a0b1645108735c86d9fdf68e DIST redis-7.2.4.tar.gz 3386861 BLAKE2B 852d55f875378248fa15e189308afbe36bca73c2aa2e5423a765a3d6f6895908ac1455148e032f6d1a1087f57af5869bccf8a932684817109f3fcf09b204e639 SHA512 78590fb6680f229905c240ed8ce7a9a7153e5f8563577dbbb26aebf9bfbdcd7495d687f452bd95e0a86c76d772e1c497b506cf8d29bc97b62c9267f7d1e76f72 diff --git a/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch b/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch deleted file mode 100644 index 55da00137b46.. --- a/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch +++ /dev/null @@ -1,61 +0,0 @@ -From e7144693e2446f21ee68c95676ecf65d1351d13e Mon Sep 17 00:00:00 2001 -From: Binbin -Date: Wed, 27 Jul 2022 19:58:25 +0800 -Subject: [PATCH] Fix bgsaveerr issue in psync wrong offset test (#11043) - -The kill above is sometimes successful and sometimes already too late. -The PING in pysnc wrong offset test got rejected by bgsaveerr because -lastbgsave_status is C_ERR. - -In theory, using diskless can avoid PING being affected, because when -the replica is dropped, we will kill the child with SIGUSR1, and this -will not affect lastbgsave_status. - -Anyway, this kill is not particularly needed here, dropping the kill -is the best one, since we do have the waitForBgsave, so just let it -take care of the bgsave. No need for fast termination. - -This patch is backported from upstream, see PR #11043. - -Upstream-PR: https://github.com/redis/redis/pull/11043 - -diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl -index d60c91918..457c3150e 100644 a/tests/integration/replication.tcl -+++ b/tests/integration/replication.tcl -@@ -1289,7 +1289,6 @@ start_server {tags {"repl" "external:skip"}} { - verify_log_message 0 "*Replica generated a reply to command 'ping', disconnecting it: *" $lines - - $rd close --catch {exec kill -9 [get_child_pid 0]} - waitForBgsave r - } - -@@ -1307,7 +1306,6 @@ start_server {tags {"repl"
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: cc931041a662369979ebd6d95b157985c8a97311 Author: Petr Vaněk atlas cz> AuthorDate: Wed Aug 16 09:05:15 2023 + Commit: Sam James gentoo org> CommitDate: Thu Aug 17 06:22:36 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc931041 dev-db/redis: add 7.2.0 Two patches were necessary to rebase, the *-shared.patch was renamed to *-system-jemalloc.patch which better suits the change. Boost-1.0 was appended to LICENSE because of newly bundled fpconv. It is not necessary to append -DENABLE_CJSON_GLOBAL to cflags as it is correctly set in deps/Makefile, thus flag-o-matic is no longer used. -O2 is stripped from LUA_CLFAGS in order to respect user's CFLAGS. The "big" sed for all Makefiles was revised, all expressions are moved to a local mysedconf array, obsolete expressions are removed and it newly strips recently appended -Werror* flags. myconf is transformed to an array, with newly added OPTIMIZATION and DEBUG_FLAGS defined as empty strings in order to respect user's CFLAGS. USE_SYSTEMD is moved to the array as well. github link is appended to HOMEPAGE. Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/32338 Signed-off-by: Sam James gentoo.org> dev-db/redis/Manifest | 1 + .../redis/files/redis-7.2.0-system-jemalloc.patch | 33 .../redis/files/redis-sentinel-7.2.0-config.patch | 27 +++ dev-db/redis/redis-7.2.0.ebuild| 200 + 4 files changed, 261 insertions(+) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index e757a6bbb891..0c6286c369d7 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -4,3 +4,4 @@ DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1d025da50cc37 DIST redis-7.0.12.tar.gz 2992216 BLAKE2B 3aad6063d1d757568ebf249868b7728be49483c1e59f55cc84bc6407b1e9957abc68160f2ba2c4479679304cbe3878beba018cfbf89f818c015d3b1481ce9225 SHA512 27ed0ab054d262028d236694f323387e3ef0e007de782545878011a7535e188152ed0af898dea4d6c0a7fa385849bbce6a0d85661780cb0e69c7d89dea3825b8 DIST redis-7.0.5.tar.gz 2968205 BLAKE2B c319a2f656e4bd26637735ef73e58eecc306e202b57d6da3a38150a02d738a414c6696e261b8ab88033e117aee4f02308aab9ca4a5f382d66ec3a10f3e020580 SHA512 16ff920cb8df4d82e78ef34209285024aa98189be8acbca86b10fb3064dcc70eac60206aadece6af08406860ed01a004ce3aaa86be896ea36c7f486686646753 DIST redis-7.0.9.tar.gz 2984823 BLAKE2B 9c2e79f40ad14f6412ec4bc79507a32f8780bf4b3a311b87dd309e74b6367536f1c91b8026efc6acb3d750ca7c49687a74660c66d104caa439ef385db3eab230 SHA512 e984a19583e4aae0a5dce85a434d3255f4f13725eba0f11a1fe1a1189b17035152a26b65f1a3a8834f0dd8218f4a65986c918f96386120ea9419bd02366c8293 +DIST redis-7.2.0.tar.gz 3381269 BLAKE2B 75b5ec65497d8214c7db7244921611c5948f5720a48fd4890b7daf3f71fdb108b0b447c7b0b59d8e62537926277044b265b607c425e1faa7e411804970c96a21 SHA512 ea362a9cbbb23806fbd48eb6c4d8be555050351a87857da95e61d2bacf4ba2e653e7d2a8d80da04ebafb5c33f8f113b3dffc3400880dbd3baeded0e8d1c3 diff --git a/dev-db/redis/files/redis-7.2.0-system-jemalloc.patch b/dev-db/redis/files/redis-7.2.0-system-jemalloc.patch new file mode 100644 index ..cc2c51a50ea9 --- /dev/null +++ b/dev-db/redis/files/redis-7.2.0-system-jemalloc.patch @@ -0,0 +1,33 @@ +Rebased from original redis-5.0-shared.patch + +diff --git a/src/Makefile b/src/Makefile +index ecbd2753d..275446338 100644 +--- a/src/Makefile b/src/Makefile +@@ -65,10 +65,7 @@ PYTHON := $(shell which python3 || which python) + endif + + # Default allocator defaults to Jemalloc on Linux and libc otherwise +-MALLOC=libc +-ifeq ($(uname_S),Linux) +- MALLOC=jemalloc +-endif ++MALLOC?=jemalloc + + # To get ARM stack traces if Redis crashes we need a special C flag. + ifneq (,$(filter aarch64 armv%,$(uname_M))) +@@ -266,9 +263,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_LIBS) ++ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE ++ FINAL_LIBS+= -ljemalloc -ldl + endif + + # LIBSSL & LIBCRYPTO +-- +2.41.0 + diff --git a/dev-db/redis/files/redis-sentinel-7.2.0-config.patch b/dev-db/redis/files/redis-sentinel-7.2.0-config.patch new file mode 100644 index ..db9df6786c19 --- /dev/null +++ b/dev-db/redis/files/redis-sentinel-7.2.0-config.patch @@ -0,0 +1,27 @@ +Rebased from original redis-sentinel-5.0-config.patch + +diff --git a/sentinel.conf b/sentinel.conf +index b7b3604f0..a1d7bfea9 100644 +--- a/sentinel.conf b/sentinel.conf +@@ -17,7 +17,7 @@ daemonize no + # When running daemonized, Redis Sentinel writes a pid file in + # /var/run/redis-sentinel.pid by default. You can specify a custom pid file + # location here. +-pidfile /var/run/redis-sentinel.pid ++pidfile /run/redis-sentinel.pid + + # Specify the server
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: fd92a504228d5932eaaf750ea469e8ed63b3fd04 Author: Petr Vaněk atlas cz> AuthorDate: Fri Sep 23 07:53:56 2022 + Commit: Sam James gentoo org> CommitDate: Sun Sep 25 01:20:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd92a504 dev-db/redis: fix sometime failing tests due to bgsaveerr issue This change backports patch from upstream PR #11043 in order to properly solve bug #872278 reported for version 7.0.4 which affects version 7.0.5 as well. In upstream, the fix is not part of 7.0 branch, it is only present in unstable branch. Upstream-PR: https://github.com/redis/redis/pull/11043 Bug: https://bugs.gentoo.org/860372 Bug: https://bugs.gentoo.org/872278 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> .../files/redis-7.0.4-replica-tests-fix.patch | 61 ++ dev-db/redis/redis-7.0.4.ebuild| 1 + dev-db/redis/redis-7.0.5.ebuild| 1 + 3 files changed, 63 insertions(+) diff --git a/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch b/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch new file mode 100644 index ..55da00137b46 --- /dev/null +++ b/dev-db/redis/files/redis-7.0.4-replica-tests-fix.patch @@ -0,0 +1,61 @@ +From e7144693e2446f21ee68c95676ecf65d1351d13e Mon Sep 17 00:00:00 2001 +From: Binbin +Date: Wed, 27 Jul 2022 19:58:25 +0800 +Subject: [PATCH] Fix bgsaveerr issue in psync wrong offset test (#11043) + +The kill above is sometimes successful and sometimes already too late. +The PING in pysnc wrong offset test got rejected by bgsaveerr because +lastbgsave_status is C_ERR. + +In theory, using diskless can avoid PING being affected, because when +the replica is dropped, we will kill the child with SIGUSR1, and this +will not affect lastbgsave_status. + +Anyway, this kill is not particularly needed here, dropping the kill +is the best one, since we do have the waitForBgsave, so just let it +take care of the bgsave. No need for fast termination. +--- + +This patch is backported from upstream, see PR #11043. + +Upstream-PR: https://github.com/redis/redis/pull/11043 + +diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl +index d60c91918..457c3150e 100644 +--- a/tests/integration/replication.tcl b/tests/integration/replication.tcl +@@ -1289,7 +1289,6 @@ start_server {tags {"repl" "external:skip"}} { + verify_log_message 0 "*Replica generated a reply to command 'ping', disconnecting it: *" $lines + + $rd close +-catch {exec kill -9 [get_child_pid 0]} + waitForBgsave r + } + +@@ -1307,7 +1306,6 @@ start_server {tags {"repl" "external:skip"}} { + verify_log_message 0 "*Replica generated a reply to command 'xinfo|help', disconnecting it: *" $lines + + $rd close +-catch {exec kill -9 [get_child_pid 0]} + waitForBgsave r + } + +@@ -1328,7 +1326,6 @@ start_server {tags {"repl" "external:skip"}} { + verify_log_message 0 "*Replica can't interact with the keyspace*" $lines + + $rd close +-catch {exec kill -9 [get_child_pid 0]} + waitForBgsave r + } + +@@ -1347,7 +1344,6 @@ start_server {tags {"repl" "external:skip"}} { + verify_log_message 0 "*Replica generated a reply to command 'slowlog|get', disconnecting it: *" $lines + + $rd close +-catch {exec kill -9 [get_child_pid 0]} + waitForBgsave r + } + +-- +2.35.1 + diff --git a/dev-db/redis/redis-7.0.4.ebuild b/dev-db/redis/redis-7.0.4.ebuild index 773c003e309f..2cf77ae9969e 100644 --- a/dev-db/redis/redis-7.0.4.ebuild +++ b/dev-db/redis/redis-7.0.4.ebuild @@ -53,6 +53,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch "${FILESDIR}"/${PN}-sentinel-5.0-config.patch "${FILESDIR}"/${PN}-7.0.4-no-which.patch + "${FILESDIR}"/${PN}-7.0.4-replica-tests-fix.patch ) src_prepare() { diff --git a/dev-db/redis/redis-7.0.5.ebuild b/dev-db/redis/redis-7.0.5.ebuild index d16e991e2f8b..6df6a3e08780 100644 --- a/dev-db/redis/redis-7.0.5.ebuild +++ b/dev-db/redis/redis-7.0.5.ebuild @@ -53,6 +53,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch "${FILESDIR}"/${PN}-sentinel-5.0-config.patch "${FILESDIR}"/${PN}-7.0.4-no-which.patch + "${FILESDIR}"/${PN}-7.0.4-replica-tests-fix.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: 881481e001d00a730884606bfb07eebd5b130dde Author: Petr Vaněk atlas cz> AuthorDate: Fri Jul 1 13:23:28 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jul 2 14:55:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=881481e0 dev-db/redis: build fix for luajit-2.1 luajit-2.1 integrated few extensions from lua5.2 [1] luaL_setfuncs being one of them. The same function is implemented in bundled lua-cjson for lua5.1 but is not properly guarded for luajit-2.1. This change backports the fix [2,3] from https://github.com/openresty/lua-cjson. [1] https://github.com/LuaJIT/LuaJIT/commit/de97b9d52bbc42effeaf1180764053a912526873 [2] https://github.com/openresty/lua-cjson/commit/638ac2741a7f274979ac3fe2e1ea5fd6487702fe [3] https://github.com/openresty/lua-cjson/pull/32 Closes: https://bugs.gentoo.org/842444 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch | 47 +++ dev-db/redis/redis-5.0.14.ebuild | 1 + dev-db/redis/redis-6.0.16.ebuild | 1 + dev-db/redis/redis-6.2.6.ebuild | 1 + 4 files changed, 50 insertions(+) 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 new file mode 100644 index ..968fc865da86 --- /dev/null +++ b/dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch @@ -0,0 +1,47 @@ +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/redis-5.0.14.ebuild b/dev-db/redis/redis-5.0.14.ebuild index b12534f6948d..5064cb59f2ec 100644 --- a/dev-db/redis/redis-5.0.14.ebuild +++ b/dev-db/redis/redis-5.0.14.ebuild @@ -45,6 +45,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.0-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() { diff --git a/dev-db/redis/redis-6.0.16.ebuild b/dev-db/redis/redis-6.0.16.ebuild index 45e59b644a37..9c1f2e88c2da 100644 --- a/dev-db/redis/redis-6.0.16.ebuild +++ b/dev-db/redis/redis-6.0.16.ebuild @@ -60,6 +60,7 @@ PATCHES=( "${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() { diff --git a/dev-db/redis/redis-6.2.6.ebuild b/dev-db/redis/redis-6.2.6.ebuild index 5f9d87086347..364e49a7adb2 100644 --- a/dev-db/redis/redis-6.2.6.ebuild +++ b/dev-db/redis/redis-6.2.6.ebuild @@ -60,6 +60,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.2.1-sharedlua.patch "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch "${FILESDIR}"/${PN}-sentinel-5.0-config.patch + "${FILESDIR}"/${PN}-5.0-luajit-2.1-fix.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: c401269e5d01422852304a01133cdcde9c9706fc Author: Vadim Misbakh-Soloviov gentoo org> AuthorDate: Tue May 3 22:27:09 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 1 02:07:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c401269e dev-db/redis: get rid of external Lua Bug: https://bugs.gentoo.org/842444 Package-Manager: Portage-3.0.30, Repoman-3.0.1 Signed-off-by: Vadim Misbakh-Soloviov gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/25310 Signed-off-by: Sam James gentoo.org> dev-db/redis/files/configure.ac-7.0 | 58 dev-db/redis/redis-7.0.0-r1.ebuild | 173 2 files changed, 231 insertions(+) diff --git a/dev-db/redis/files/configure.ac-7.0 b/dev-db/redis/files/configure.ac-7.0 new file mode 100644 index ..45397b33b7ec --- /dev/null +++ b/dev-db/redis/files/configure.ac-7.0 @@ -0,0 +1,58 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.63) +AC_INIT(redis, __PV__, anti...@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/redis-7.0.0-r1.ebuild b/dev-db/redis/redis-7.0.0-r1.ebuild new file mode 100644 index ..1b969c9cf4c8 --- /dev/null +++ b/dev-db/redis/redis-7.0.0-r1.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated +# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable + +inherit autotools flag-o-matic systemd toolchain-funcs tmpfiles + +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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="+jemalloc ssl systemd tcmalloc test" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + 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 +" + +BDEPEND=" + ${COMMON_DEPEND} + virtual/pkgconfig +" + +# Tcl is only needed in the CHOST test env +DEPEND=" + test? ( + dev-lang/tcl:0= + ssl? ( dev-tcltk/tls ) + )" + +REQUIRED_USE="?? ( jemalloc tcmalloc )" + +PATCHES=( + "${FILESDIR}"/${PN}-6.2.1-config.patch + "${FILESDIR}"/${PN}-5.0-shared.patch + "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch + "${FILESDIR}"/${PN}-sentinel-5.0-config.patch +) + +src_prepare() { + default + + # unstable on jemalloc + > tests/unit/memefficiency.tcl || 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
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: 850894a9e88d1b711cfd3036878848f5e59690b5 Author: Sam James gentoo org> AuthorDate: Thu Apr 28 02:37:30 2022 + Commit: Sam James gentoo org> CommitDate: Thu Apr 28 02:37:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=850894a9 Revert "dev-db/redis: drop 5.0.14, 6.0.16" This reverts commit bb357ae44b7e9fbff0d9d9df54370c6796d706cb. dev-ruby/redis still needs 5* Bug: https://bugs.gentoo.org/841404 Signed-off-by: Sam James gentoo.org> dev-db/redis/Manifest | 2 + dev-db/redis/files/redis-3.2.3-config.patch | 40 + dev-db/redis/files/redis-5.0-sharedlua.patch| 60 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-5.0.14.ebuild| 164 dev-db/redis/redis-6.0.16.ebuild| 189 7 files changed, 534 insertions(+) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 546bd8aa538f..4462f4e2632a 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -1,2 +1,4 @@ +DIST redis-5.0.14.tar.gz 2000179 BLAKE2B 77d3ed09a81450dbf806edd017785b82c50bb059aab44c82bc4ab784b7f03d5c58f9372b96c857831f84d278771dcf223f42ca05af790f0dc10ecdde211fd149 SHA512 513299ae8b967a659d54812fab4dfdfaf0081b20136a3d89b6a761e93548583c96436fedb84baa4d23385b42110ef615527efc3690b873f5bec7793403fe7eaf +DIST redis-6.0.16.tar.gz 2288647 BLAKE2B f3552cc0d27cbc5cf6556792da9a75d01ff70d372484c95d2af8b24ec902a8086b9c3f4e53513df982fe135963432bfb527334926dd494e50d2cc618ab813f39 SHA512 83bb72448f9943e3d015cb4d961eb2eae21602ef1f90ca52ca8ab7c6918b0ab979db9f61f3981df27b2286894f4864f4588c3a52fa988e30e9419b0967998845 DIST redis-6.2.6.tar.gz 2476542 BLAKE2B d139479432171294911d99e7e8c2327dbbc6682ea49de761c4bb4089a2efd814926f2f8823dca1826b4a61dd9ccf79abb22878c9463ac92870481b43d8a7fff7 SHA512 9b947d26fd9e208627ed22d318ab3d0775ab0be46d98db1c1d158feac671b984e75ce33e647d196face9643f80768af47e678be1b4e1ddd3eb56dff467c46022 DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1d025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953 diff --git a/dev-db/redis/files/redis-3.2.3-config.patch b/dev-db/redis/files/redis-3.2.3-config.patch new file mode 100644 index ..bde0ef7cbaf1 --- /dev/null +++ b/dev-db/redis/files/redis-3.2.3-config.patch @@ -0,0 +1,40 @@ +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 ++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-sharedlua.patch b/dev-db/redis/files/redis-5.0-sharedlua.patch new file mode 100644 index ..3e14f41733b0 --- /dev/null +++ b/dev-db/redis/files/redis-5.0-sharedlua.patch @@ -0,0 +1,60 @@ +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
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: bb357ae44b7e9fbff0d9d9df54370c6796d706cb Author: Sam James gentoo org> AuthorDate: Thu Apr 28 02:17:47 2022 + Commit: Sam James gentoo org> CommitDate: Thu Apr 28 02:17:59 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb357ae4 dev-db/redis: drop 5.0.14, 6.0.16 Bug: https://bugs.gentoo.org/841404 Signed-off-by: Sam James gentoo.org> dev-db/redis/Manifest | 2 - dev-db/redis/files/redis-3.2.3-config.patch | 40 - dev-db/redis/files/redis-5.0-sharedlua.patch| 60 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-5.0.14.ebuild| 164 dev-db/redis/redis-6.0.16.ebuild| 189 7 files changed, 534 deletions(-) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 4462f4e2632a..546bd8aa538f 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -1,4 +1,2 @@ -DIST redis-5.0.14.tar.gz 2000179 BLAKE2B 77d3ed09a81450dbf806edd017785b82c50bb059aab44c82bc4ab784b7f03d5c58f9372b96c857831f84d278771dcf223f42ca05af790f0dc10ecdde211fd149 SHA512 513299ae8b967a659d54812fab4dfdfaf0081b20136a3d89b6a761e93548583c96436fedb84baa4d23385b42110ef615527efc3690b873f5bec7793403fe7eaf -DIST redis-6.0.16.tar.gz 2288647 BLAKE2B f3552cc0d27cbc5cf6556792da9a75d01ff70d372484c95d2af8b24ec902a8086b9c3f4e53513df982fe135963432bfb527334926dd494e50d2cc618ab813f39 SHA512 83bb72448f9943e3d015cb4d961eb2eae21602ef1f90ca52ca8ab7c6918b0ab979db9f61f3981df27b2286894f4864f4588c3a52fa988e30e9419b0967998845 DIST redis-6.2.6.tar.gz 2476542 BLAKE2B d139479432171294911d99e7e8c2327dbbc6682ea49de761c4bb4089a2efd814926f2f8823dca1826b4a61dd9ccf79abb22878c9463ac92870481b43d8a7fff7 SHA512 9b947d26fd9e208627ed22d318ab3d0775ab0be46d98db1c1d158feac671b984e75ce33e647d196face9643f80768af47e678be1b4e1ddd3eb56dff467c46022 DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1d025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953 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.. --- 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 -+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-sharedlua.patch b/dev-db/redis/files/redis-5.0-sharedlua.patch deleted file mode 100644 index 3e14f41733b0.. --- 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') -
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: 2acd97bfc1f3fae1d6f0b82a02614ff1ed72403d Author: Sam James gentoo org> AuthorDate: Thu Mar 4 04:16:43 2021 + Commit: Sam James gentoo org> CommitDate: Thu Mar 4 04:19:34 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2acd97bf dev-db/redis: security bump to 6.0.12 Bug: https://bugs.gentoo.org/773328 Signed-off-by: Sam James gentoo.org> dev-db/redis/Manifest | 1 + dev-db/redis/files/redis-6.0.12-sharedlua.patch | 60 dev-db/redis/redis-6.0.12.ebuild| 184 3 files changed, 245 insertions(+) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index cbdfc427467..ce63ae20c6b 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -1,4 +1,5 @@ DIST redis-5.0.10.tar.gz 1990507 BLAKE2B a3ed76efb387e2a8292f71607c19826c8a0a890f1c47c126fc4cf084955fcc5889e743d7c7103e4c66ad6c81c2b2d0d482b1b4a62ab11a757f4cf84271ae8199 SHA512 4dd3a639f44f2f077b36621f9eb88dc340089890abf07f57a969172ea806e1bd205f61e6842d316294b52cd73c98aec3363686b2a292efc18a2e1bdbd358fb3c DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38659001421f96040e8a64a4a304e9dc1f06d82802ce1c92515d166cfd37c2f347df4c4cda0c2c4c2bb10d27c5 SHA512 d2c7bc1f769bc5d179bfe6e71954962813b50597eafc752a9b1edf2fd87e84707b7daf0910db56dd0e89cb3bdb3e551da7f111ae4899f505bac5f77f99744c13 DIST redis-6.0.10.tar.gz 2271970 BLAKE2B a7efc1a0ad9ec3b7414b410ba461e314d49197d218df611f5debba6bcfb9ae9e56b65ed8a0d455f52f761e33c9102b239a7e51eeb7e2cb20627c66cbf4b5cf35 SHA512 4ef60645316143db3c26c45e90c7dc629e15641313267fd732396212c67db9ebeb9e170d830599b2e143ad5135d1ef249b6fbc1fb4960f4cf857cfdb5c1470c8 +DIST redis-6.0.12.tar.gz 2276349 BLAKE2B ab49b0278420c65fc995a90e850130971ccaf3df34a08a5cc10a8c211239eba8449b87fe67684189c71816cf259a70a23a77935ec61e8baa787daa61cb994201 SHA512 9dd8e3bed51e1356470e1bf08892f771744c0c9418ff874c16ea932ad1f471a908ffd8479efe1f32531d7f63cd7af5224273ce50f2fe7aa26c47716e0e78330b DIST redis-6.0.9.tar.gz 2261418 BLAKE2B 93e64e2c682320d11e468021fd13a2888dd6b15430c15eaaa9468242d9b4d8b60e29dfe656e64dc88ed751471284d1adf94c723521085019b375785abe7a SHA512 ebae2b09637fdbdc71dd22b72ccea24e2c21beb81c6ff5c4bae8b341886a7d847ce868f52dc917079bab8aa250ff61c83efe8acbb8a1cbc5e285c7842b0aefa3 diff --git a/dev-db/redis/files/redis-6.0.12-sharedlua.patch b/dev-db/redis/files/redis-6.0.12-sharedlua.patch new file mode 100644 index 000..3707bcf3078 --- /dev/null +++ b/dev-db/redis/files/redis-6.0.12-sharedlua.patch @@ -0,0 +1,60 @@ +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
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: f9abb428531c961ec01d02379cd1e83a04a6d06a Author: Tomáš Mózes gmail com> AuthorDate: Thu Feb 4 21:31:26 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Feb 4 22:25:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9abb428 dev-db/redis: bump to 6.0.10 Configuration moved to /etc/redis directory Closes: https://bugs.gentoo.org/768189 Closes: https://bugs.gentoo.org/759481 Signed-off-by: Tomáš Mózes gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19335 Signed-off-by: Thomas Deutschmann gentoo.org> dev-db/redis/Manifest | 1 + dev-db/redis/files/redis-sentinel.confd-r1 | 16 +++ dev-db/redis/files/redis-sentinel.initd-r1 | 22 dev-db/redis/files/redis.confd-r2 | 20 dev-db/redis/files/redis.initd-6 | 25 dev-db/redis/files/redis.service-4 | 14 +++ dev-db/redis/redis-6.0.10.ebuild | 184 + 7 files changed, 282 insertions(+) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 4598c70f2d7..cbdfc427467 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -1,3 +1,4 @@ DIST redis-5.0.10.tar.gz 1990507 BLAKE2B a3ed76efb387e2a8292f71607c19826c8a0a890f1c47c126fc4cf084955fcc5889e743d7c7103e4c66ad6c81c2b2d0d482b1b4a62ab11a757f4cf84271ae8199 SHA512 4dd3a639f44f2f077b36621f9eb88dc340089890abf07f57a969172ea806e1bd205f61e6842d316294b52cd73c98aec3363686b2a292efc18a2e1bdbd358fb3c DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38659001421f96040e8a64a4a304e9dc1f06d82802ce1c92515d166cfd37c2f347df4c4cda0c2c4c2bb10d27c5 SHA512 d2c7bc1f769bc5d179bfe6e71954962813b50597eafc752a9b1edf2fd87e84707b7daf0910db56dd0e89cb3bdb3e551da7f111ae4899f505bac5f77f99744c13 +DIST redis-6.0.10.tar.gz 2271970 BLAKE2B a7efc1a0ad9ec3b7414b410ba461e314d49197d218df611f5debba6bcfb9ae9e56b65ed8a0d455f52f761e33c9102b239a7e51eeb7e2cb20627c66cbf4b5cf35 SHA512 4ef60645316143db3c26c45e90c7dc629e15641313267fd732396212c67db9ebeb9e170d830599b2e143ad5135d1ef249b6fbc1fb4960f4cf857cfdb5c1470c8 DIST redis-6.0.9.tar.gz 2261418 BLAKE2B 93e64e2c682320d11e468021fd13a2888dd6b15430c15eaaa9468242d9b4d8b60e29dfe656e64dc88ed751471284d1adf94c723521085019b375785abe7a SHA512 ebae2b09637fdbdc71dd22b72ccea24e2c21beb81c6ff5c4bae8b341886a7d847ce868f52dc917079bab8aa250ff61c83efe8acbb8a1cbc5e285c7842b0aefa3 diff --git a/dev-db/redis/files/redis-sentinel.confd-r1 b/dev-db/redis/files/redis-sentinel.confd-r1 new file mode 100644 index 000..5198fc87508 --- /dev/null +++ b/dev-db/redis/files/redis-sentinel.confd-r1 @@ -0,0 +1,16 @@ +# Redis-sentinel user. +REDIS_SENTINEL_USER="redis" + +# Redis-sentinel group. +REDIS_SENTINEL_GROUP="redis" + +# Redis-sentinel configuration file. +REDIS_SENTINEL_CONF="/etc/redis/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-r1 b/dev-db/redis/files/redis-sentinel.initd-r1 new file mode 100644 index 000..1680b180acf --- /dev/null +++ b/dev-db/redis/files/redis-sentinel.initd-r1 @@ -0,0 +1,22 @@ +#!/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/redis/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-r2 b/dev-db/redis/files/redis.confd-r2 new file mode 100644 index 000..07fdc3806c7 --- /dev/null +++ b/dev-db/redis/files/redis.confd-r2 @@ -0,0 +1,20 @@ +# Redis user. +REDIS_USER="redis" + +# Redis group. +REDIS_GROUP="redis" + +# Redis configuration file. +REDIS_CONF="/etc/redis/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-6 b/dev-db/redis/files/redis.initd-6 new file mode 100644 index 000..a31669b353e --- /dev/null +++
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: 92082e3e00062ad5ba88d5b8e09327283acd6a7c Author: Tomas Mozes gmail com> AuthorDate: Fri Mar 22 05:57:02 2019 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Apr 18 05:10:32 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92082e3e dev-db/redis: bump to 4.0.14 Closes: https://bugs.gentoo.org/676046 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Tomáš Mózes gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11456 Signed-off-by: Robin H. Johnson gentoo.org> dev-db/redis/Manifest | 1 + dev-db/redis/files/redis.service-3 | 14 dev-db/redis/files/redis.tmpfiles-2 | 2 + dev-db/redis/redis-4.0.14.ebuild| 141 4 files changed, 158 insertions(+) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 1b06f135e3e..d3fcf0e33fc 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -2,5 +2,6 @@ DIST redis-4.0.10.tar.gz 1738465 BLAKE2B 572cbb3d2d5d7209f81ebd53ee68f40b404d0e4 DIST redis-4.0.11.tar.gz 1739656 BLAKE2B d94f380ad1600e58942cc5b27b512984396cdbb06ea6e947c7d7ce5b8ecdb8a2a56c6356af2caa82a96887a610716c9575b78eb2f46da89efb940febc1c30f22 SHA512 f0054af9ca2143731a397b2b21285387707b7f40d9326ba15225feb1a2ff470fab5194308342f63bbe1081f84c7e9ef19543c5a8e3eae49e17bfc515c64201f0 DIST redis-4.0.12.tar.gz 1740544 BLAKE2B 620dba8b81fc76a46880c3a4a7ee9d9835e7b19e6d321598a717892f6f03fa805db79847442744a2af8f77ae403b6e1df02299da9a0835f6092a74e3804dde48 SHA512 d19020f7ebed9ad5d04c6e1cb7e2a49dd1e226fe17d86e860df11bcb798c61c09f6f9fc3572a7ee32232ac34ec5eb1d6189f8139b5991bd87297c5243c3b54d2 DIST redis-4.0.13.tar.gz 1740715 BLAKE2B 73d129906b2a2ceb91d1144f8c8aeb970221f7ef4d1d0f0bac0aada6976ba6b2b4fdbe7cca29e350e8258986ee2607526896fcfb90536596a5fd556c6186faa6 SHA512 c220420bf6cb2781a3fb9e002188b1663743c89c262fd5aff02e585c969b56e7691fe1073e7427e6d38cf7b5a096f86b83af84cfa6b01a5bdf56048789e0bb70 +DIST redis-4.0.14.tar.gz 1740967 BLAKE2B d9122565ba890416d8936db936bc1410af840cc7617b485b94428891806d5889f5f02c2e722a7e68fe6c0b2690c1ef3479cc8837c55fb154f2b43af9986647a4 SHA512 7730a4083962046f8fee674a8ce95e1d3e8c8dcc2d64a65491dc3b851413b2d745942be7a94ee77074aa530da5f3d458c4e7388d7950a8495d8ee9f4862b7e06 DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5a5b6afb725cb87934fbcb62107085671fd1072d1142ce8e92f069e6b6064c9f4468335bc6997897c8f494471 SHA512 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4 DIST redis-5.0.3.tar.gz 1959445 BLAKE2B d1c3247d77aa3b1076d0e1a0dcce74dcfb14a0ad3776603ef8154d7868f9f3efcf2138cb08581eee1974e9d76658d07456d6e9795391321b1f1f8bca7f9d40f5 SHA512 5915b14502438bf7c3f56e38640dda54b095bd87501aefa6e386c9cef48e8d1e625e980643d128d91b8cab26dd51d5d99ca66fa638dc04e5ba315fe43f11f58b diff --git a/dev-db/redis/files/redis.service-3 b/dev-db/redis/files/redis.service-3 new file mode 100644 index 000..1c733fcec17 --- /dev/null +++ b/dev-db/redis/files/redis.service-3 @@ -0,0 +1,14 @@ +[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-2 b/dev-db/redis/files/redis.tmpfiles-2 new file mode 100644 index 000..87087d2b773 --- /dev/null +++ b/dev-db/redis/files/redis.tmpfiles-2 @@ -0,0 +1,2 @@ +# redis runtime directory +d /run/redis 0755 redis root - diff --git a/dev-db/redis/redis-4.0.14.ebuild b/dev-db/redis/redis-4.0.14.ebuild new file mode 100644 index 000..1f0ac4ef03d --- /dev/null +++ b/dev-db/redis/redis-4.0.14.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic systemd toolchain-funcs user + +DESCRIPTION="A persistent caching system, key-value and data structures database" +HOMEPAGE="https://redis.io; +SRC_URI="http://download.redis.io/releases/${P}.tar.gz; + +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +IUSE="+jemalloc tcmalloc luajit test" +SLOT="0" + +# Redis does NOT build with Lua 5.2 or newer at this time. +# This should link correctly with both unslotted & slotted Lua, without +# changes. +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) + tcmalloc? ( dev-util/google-perftools ) + jemalloc? ( >=dev-libs/jemalloc-3.2 )" + +DEPEND=" + ${RDEPEND} + test? ( dev-lang/tcl:0= )" + +BDEPEND=" + virtual/pkgconfig" + +REQUIRED_USE="?? ( tcmalloc jemalloc )" + +pkg_setup() { + enewgroup redis 75 + enewuser redis 75 -1 /var/lib/redis redis +} +
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: 23040f93869d3b935312c475084c834d3be62558 Author: Tomas Mozes gmail com> AuthorDate: Thu Oct 18 12:12:27 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Oct 26 13:17:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23040f93 dev-db/redis: bump to 5.0.0 Closes: https://bugs.gentoo.org/668950 Signed-off-by: Tomáš Mózes gmail.com> Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Thomas Deutschmann gentoo.org> dev-db/redis/Manifest | 1 + dev-db/redis/files/redis-5.0-sharedlua.patch | 4 +- dev-db/redis/files/redis-sentinel-5.0-config.patch | 21 +++- dev-db/redis/redis-5.0.0.ebuild| 138 + 4 files changed, 156 insertions(+), 8 deletions(-) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 448029e338f..0a88d5bb999 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -7,5 +7,6 @@ DIST redis-4.0.6.tar.gz 1723533 BLAKE2B 94c2a9b7eeaa676efaac75cd5c143b0f4b02440b DIST redis-4.0.7.tar.gz 1729488 BLAKE2B 7a5337b868e4da4a7387b31bc9d6bd4c86abd701b9ba999f64296ed5188cbba7208ced466973a500730ca03e70a9a85fbab2fb4700fdc977e58defc0126487d1 SHA512 6f317d9e76224b2a2b047dc8f56b126ea85ee5c6112c4c6238cb5cdfa3a83756bff3a82b106b00d1124a93d210a900d836587b8d9563916f19274de0e84c4c6b DIST redis-4.0.8.tar.gz 1729973 BLAKE2B 32d82a07beba9ea8f0b08a8fc69da548a1974e5839f052a9803ffb0f52ef920df9b128092e061b5e693581a50efef4a1212c1f6310dc8492eff5ca841ff3b03a SHA512 11c126ddef3bedbceb02ee7a80a61374e081da8087055d77970b0097066a6f1c5e0c4f0d246c9851f8c3beca22f185c184669a9dc4f1c7c229f8cd2c34196ab6 DIST redis-4.0.9.tar.gz 1737022 BLAKE2B 35a83d146062f5b14c023d7fd9f28d743ba6bec3e0e4bf9ce8e065a706bbd7508ffbcb8b1b4d18f6b6774589b5456540ba8717b9f449fcbd758c0f57dbd505a3 SHA512 a6cf63cb361f0a87da3955ba628190dc04cad342f7a664d18e44416ee67dd86ed6e3a46b9701e994f1417e56b819b3c6fc595f363c10bb4b83d5033919d29598 +DIST redis-5.0.0.tar.gz 1947721 BLAKE2B c776796a2efe3efd9f9b70dc9be06c10695a5f3cb40765b64f7adddbe5e77eb68650986d8c705e947d1aa46f0f909a2aa2743f43a12ba6c30615e5f9fc2ca55b SHA512 818277cf8c14eb5f0b864e936f657c8021a3614a76dda8975d82b20ab4e3983731363b7b527fb504fd41292304de079f78702503fca867ac6f45a97a391eec07 DIST redis-5.0_rc4.tar.gz 1937238 BLAKE2B b8f768b83e27476bc038fc554193680f4873eb2405f238e0a6f2053cf68c4a9e6c45546730a263463b805d6811334c1ba056be0230676f19d0562d488a3d4c97 SHA512 75b308bca026fe3b7cff1a92df3990bab5bb7ffe24cdfbc263f4d522ebe7ec8d86a9ed66da1778fe67c08a39b6f0c83cb10c5a332818c6ad04621d01c4aa6add DIST redis-5.0_rc5.tar.gz 1941761 BLAKE2B 294cf455e40bbbcfb87972fd4130854ced714369dcfc08a77e9be693d1b819f3c5dfe8b407582726e8bd140be3965f9c6cab03cd28002004ed1e634a0827a060 SHA512 173e529bec234339be3b6c2c5c360085a186a66c4d08a4dfeb51aa689ab61ba1d8ab2914af5ba4923799b17bc09a05a488ce6e6cfae7fa7faa5c5a55e38c111c diff --git a/dev-db/redis/files/redis-5.0-sharedlua.patch b/dev-db/redis/files/redis-5.0-sharedlua.patch index 76971cf4571..3e14f41733b 100644 --- a/dev-db/redis/files/redis-5.0-sharedlua.patch +++ b/dev-db/redis/files/redis-5.0-sharedlua.patch @@ -12,7 +12,7 @@ index c26c0d7..fa50c41 100644 #ifndef CJSON_MODNAME #define CJSON_MODNAME "cjson" diff --git a/src/Makefile b/src/Makefile -index f5525bd..cecd8d0 100644 +index 773d3b2..2d120d4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') @@ -44,7 +44,7 @@ index f5525bd..cecd8d0 100644 @@ -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 + 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
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: 248dbab6baed691d61011be1a4115b25e2f05e4f Author: Robin H. Johnson gentoo org> AuthorDate: Wed Aug 15 03:09:02 2018 + Commit: Robin H. Johnson gentoo org> CommitDate: Wed Aug 15 03:09:45 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=248dbab6 dev-db/redis: cleanup old ebuilds Bug: https://bugs.gentoo.org/631002 Signed-off-by: Robin H. Johnson gentoo.org> Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-db/redis/Manifest | 3 - dev-db/redis/files/configure.ac-2.2| 58 --- dev-db/redis/files/redis-2.8.17-config.patch | 46 - dev-db/redis/files/redis-2.8.3-shared.patch| 36 --- dev-db/redis/files/redis-3.0.0-sharedlua.patch | 44 - dev-db/redis/files/redis.confd | 20 dev-db/redis/files/redis.initd-4 | 31 -- dev-db/redis/redis-3.0.7-r1.ebuild | 115 -- dev-db/redis/redis-3.0.7.ebuild| 115 -- dev-db/redis/redis-3.2.5.ebuild| 123 dev-db/redis/redis-3.2.8-r2.ebuild | 123 dev-db/redis/redis-4.0.1-r1.ebuild | 128 - dev-db/redis/redis-4.0.1.ebuild| 122 --- 13 files changed, 964 deletions(-) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 9b196838979..ee015a0effc 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -1,8 +1,5 @@ -DIST redis-3.0.7.tar.gz 1375200 BLAKE2B 74088cb128e5d8e32427845b6bb267957b7df7ee091b1110260b26cc61649892bdb3ec79ae09fa4aca302c5708f26e3e05c6fb1e821ff468d982c274fa2792b4 SHA512 6c8f4c88d911e1433fd28efff2f6d62763e08be89814ebf4aa4e68e2c8bd605eba24ca3410548b2f480ae094437ce96c0bafa7a5762b3b405d5d850886297ba3 DIST redis-3.2.12.tar.gz 1551468 BLAKE2B 85483de2588e4161521fe958225a53ab4357d0db83954c22f755d5d512e6e2126f9e7fdc1032353bd491353af3805c806b89546f886fe78fa5e5d2dc1446420b SHA512 eec64a17e331ac220ba425a495127b3873048dc2597a6508962469c0c99763deffcec97254915e2b1f3867eb556b917e8861baa9609c727d0abb254a90d87cdc -DIST redis-3.2.5.tar.gz 1544040 BLAKE2B a67b46feacddcc7e4cafd91fb5d295a972f3a09db0a05b8a90bf8c89870f110c6c598ffe945475228caa37ccca7921f4981fe7002edc3689e833ecddc5c2032e SHA512 4ecf6277c8fdf4411223b9f5a5c8308829da9bd756b45de5217d469e9def8faad8c05b6348c06aef99eca9245d45abfd52df056c3c819723da66a2ca20c381dd DIST redis-3.2.8.tar.gz 1547237 BLAKE2B fb03e263ad7b135dff38e018d9b830c4992cf331efc7c23c10b087c47e597abedb52f259d4dd9a9ee1d661685157fc29a2022d74bc21d406bb10c9b7dfab8b7e SHA512 7334faf73af3644f7f9dcaddd322955d5df1e88a1640b509ae623f322615a20f6dc143eb57dd89ff3a278557df309ac4215c3fb458235682ce28e16c817068ba -DIST redis-4.0.1.tar.gz 1711660 BLAKE2B 0b8881baa78908df4adcc1aabfa0ea9554900f8b54d204ffa054752ba4355da2b56408501ede81a69cc1f34ebbb9fc984335738ea9f343ddcd4e9fb9a0d64c8e SHA512 62dec537aebd12340b9642f5f8b07fd98757c9e648dcd539a0411f207db3495923c5a6a9941036c56b2d574ee38b46d08558668111e322345ef549f93fada26f DIST redis-4.0.10.tar.gz 1738465 BLAKE2B 572cbb3d2d5d7209f81ebd53ee68f40b404d0e4623bd1864845bf1f47135d4e097a6974d346ffd845d848c39ace6d3fb9f1a347e0c9d16d06d22aed7a8b3ae7b SHA512 0978dabaf637e61889d492fd3629acd58ca8fb0c0088cdd7036ffd1a7ed3f018c107039d4c96bd61d0b7d35757df2366d051f57d77ffb5642aca0e5651b30603 DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5a5b6afb725cb87934fbcb62107085671fd1072d1142ce8e92f069e6b6064c9f4468335bc6997897c8f494471 SHA512 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4 DIST redis-4.0.6.tar.gz 1723533 BLAKE2B 94c2a9b7eeaa676efaac75cd5c143b0f4b02440b5a21ecc9b2a68cc27ad4abc1fc4d7dbc903dea5d956ce737ca434ea5b5bdde4a35df3a3689da60c5fb0bddf1 SHA512 784aad612664df666c36f969cb6a9ab794f004abcf9aa761bd1f5f0f8fdb248d5b38f48a59b68c2de7d2a344755f1537efc9d5847de0d662302699ed94d40813 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 3ff6650407c..000 --- 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, anti...@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]) -
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: b545fdf6233c35ef3173109dfcd3d0c2b05da205 Author: Robin H. Johnson gentoo org> AuthorDate: Thu Oct 12 20:30:01 2017 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Oct 12 20:36:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b545fdf6 dev-db/redis: use s-s-d to background, disallow daemonize. Bug: https://bugs.gentoo.org/631002#c10 Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-db/redis/files/redis.initd-5 | 4 +++- dev-db/redis/{redis-3.2.8-r4.ebuild => redis-3.2.8-r5.ebuild} | 0 dev-db/redis/{redis-4.0.2.ebuild => redis-4.0.2-r1.ebuild}| 0 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-db/redis/files/redis.initd-5 b/dev-db/redis/files/redis.initd-5 index a567b1e210d..bfeeb6925ec 100644 --- a/dev-db/redis/files/redis.initd-5 +++ b/dev-db/redis/files/redis.initd-5 @@ -9,8 +9,10 @@ : ${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}" +command_args="${REDIS_OPTS} --daemonize no" command_background="true" command_user="${REDIS_USER}:${REDIS_GROUP}" pidfile="/run/${RC_SVCNAME}.pid" diff --git a/dev-db/redis/redis-3.2.8-r4.ebuild b/dev-db/redis/redis-3.2.8-r5.ebuild similarity index 100% rename from dev-db/redis/redis-3.2.8-r4.ebuild rename to dev-db/redis/redis-3.2.8-r5.ebuild diff --git a/dev-db/redis/redis-4.0.2.ebuild b/dev-db/redis/redis-4.0.2-r1.ebuild similarity index 100% rename from dev-db/redis/redis-4.0.2.ebuild rename to dev-db/redis/redis-4.0.2-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: f689ea635ecbb7290b1c914000bf83e9289cd5e9 Author: Tomáš Mózes gmail com> AuthorDate: Fri Oct 6 20:40:02 2017 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Oct 8 23:23:40 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f689ea63 dev-db/redis: bump to 4.0.2 (cherry picked from commit 93eac00c9ae82a63fceacdcc5b7ded98e44a3a9c) Bug: https://bugs.gentoo.org/631002 Closes: https://github.com/gentoo/gentoo/pull/5875#issuecomment-334886169 Signed-off-by: Robin H. Johnson gentoo.org> dev-db/redis/Manifest | 1 + dev-db/redis/files/redis-3.2.3-config.patch | 2 +- dev-db/redis/files/redis.confd-r1 | 20 + dev-db/redis/files/redis.initd-5| 23 ++ dev-db/redis/redis-4.0.2.ebuild | 122 5 files changed, 167 insertions(+), 1 deletion(-) diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index a3318518cfb..e86069b29e8 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -3,3 +3,4 @@ DIST redis-3.2.5.tar.gz 1544040 SHA256 8509ceb1efd849d6b2346a72a8e926b5a4f6ed3cc DIST redis-3.2.6.tar.gz 1544806 SHA256 2e1831c5a315e400d72bda4beaa98c0cfbe3f4eb8b20c269371634390cf729fa SHA512 15f2e55a7cc56e7e652a3a8d344fceb6d0d33cf53caa81854e6b1977ec68f7e92ac06d0d66999bfc577f185eba19e0927a81014bdb5cd484eecb080b6a6e16bc WHIRLPOOL a3dd92e565cdfbc65bfccd452efde8fc4124ede1133ca74a30c69f68eb5021b5fb1bbc7dc30d3ea9993c42bc9c4ce2716564329bd5be142a5764a9ab807a9d14 DIST redis-3.2.8.tar.gz 1547237 SHA256 61b373c23d18e6cc752a69d5ab7f676c6216dc2853e46750a8c4ed791d68482c SHA512 7334faf73af3644f7f9dcaddd322955d5df1e88a1640b509ae623f322615a20f6dc143eb57dd89ff3a278557df309ac4215c3fb458235682ce28e16c817068ba WHIRLPOOL 50ffecd1891051a3e28028065bfaf090b2eec42a757cdf61c6d22b051c8ba4fc78809b3198182d2333bedb4715d9a8d70bf04f605030abe6e33cc6b9b7161cf7 DIST redis-4.0.1.tar.gz 1711660 SHA256 2049cd6ae9167f258705081a6ef23bb80b7eff9ff3d0d7481e89510f27457591 SHA512 62dec537aebd12340b9642f5f8b07fd98757c9e648dcd539a0411f207db3495923c5a6a9941036c56b2d574ee38b46d08558668111e322345ef549f93fada26f WHIRLPOOL 90b6a7a81e6d5302a28c49a8a1ea479f80f7924eb2f69d0b17d48cf15c9ba769a8ef425ae9bec44d3cbd81816b43fe7997adeb73caa6d2b64f7657e60cb2fb82 +DIST redis-4.0.2.tar.gz 1713990 SHA256 b1a0915dbc91b979d06df1977fe594c3fa9b189f1f3d38743a2948c9f7634813 SHA512 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4 WHIRLPOOL 24834b1fbedaea75f245c9f3f7dc29444b34bccdac08b060dee5ff78b23ee60cb029d8a255f69df7a7a3a54c7440bb37390361a2d995eb0bc7534273570adfc3 diff --git a/dev-db/redis/files/redis-3.2.3-config.patch b/dev-db/redis/files/redis-3.2.3-config.patch index 541e2549464..bde0ef7cbaf 100644 --- a/dev-db/redis/files/redis-3.2.3-config.patch +++ b/dev-db/redis/files/redis-3.2.3-config.patch @@ -34,7 +34,7 @@ index 22e00bc..b09de57 100644 # output buffers (but this is not needed if the policy is 'noeviction'). # -# maxmemory -+maxmemory 67108864 ++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.confd-r1 b/dev-db/redis/files/redis.confd-r1 new file mode 100644 index 000..1f4ff23f211 --- /dev/null +++ b/dev-db/redis/files/redis.confd-r1 @@ -0,0 +1,20 @@ +# 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 new file mode 100644 index 000..a567b1e210d --- /dev/null +++ b/dev-db/redis/files/redis.initd-5 @@ -0,0 +1,23 @@ +#!/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} + +command="/usr/sbin/redis-server" +command_args="${REDIS_OPTS}" +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/redis-4.0.2.ebuild b/dev-db/redis/redis-4.0.2.ebuild new file mode 100644 index 000..c79e00a9398 --- /dev/null +++ b/dev-db/redis/redis-4.0.2.ebuild @@
[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/, dev-db/redis/files/
commit: 6f9cc73493d498749aadc4322ba0a8accda697b8 Author: Austin English gentoo org> AuthorDate: Mon Apr 10 17:25:06 2017 + Commit: Austin English gentoo org> CommitDate: Mon Apr 10 17:28:30 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f9cc734 dev-db/redis: fix pid handling Redis manages its own pid. Trying to force SSD to handle it leads to conflicts, and rc-status reporting redis as crashed. Gentoo-Bug: https://bugs.gentoo.org/613252 dev-db/redis/files/redis.initd-4 | 3 +- dev-db/redis/redis-3.0.7-r1.ebuild | 115 ++ dev-db/redis/redis-3.2.5-r2.ebuild | 122 + dev-db/redis/redis-3.2.6-r2.ebuild | 122 + 4 files changed, 360 insertions(+), 2 deletions(-) diff --git a/dev-db/redis/files/redis.initd-4 b/dev-db/redis/files/redis.initd-4 index ed3b71cc2cd..2ede7fa1d4d 100644 --- a/dev-db/redis/files/redis.initd-4 +++ b/dev-db/redis/files/redis.initd-4 @@ -9,8 +9,7 @@ REDIS_TIMEOUT=${REDIS_TIMEOUT:-30} command=/usr/sbin/redis-server pidfile=${REDIS_PID:-/run/redis/redis.pid} -start_stop_daemon_args="--background --make-pidfile --pidfile ${pidfile} - --chdir \"${REDIS_DIR}\" --user ${REDIS_USER} --group ${REDIS_GROUP}" +start_stop_daemon_args="--chdir \"${REDIS_DIR}\" --user ${REDIS_USER} --group ${REDIS_GROUP}" command_args="${REDIS_OPTS}" depend() { diff --git a/dev-db/redis/redis-3.0.7-r1.ebuild b/dev-db/redis/redis-3.0.7-r1.ebuild new file mode 100644 index 000..0a9c1e216a3 --- /dev/null +++ b/dev-db/redis/redis-3.0.7-r1.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools eutils flag-o-matic systemd toolchain-funcs user + +DESCRIPTION="A persistent caching system, key-value and data structures database" +HOMEPAGE="http://redis.io/; +SRC_URI="http://download.redis.io/releases/${P}.tar.gz; + +LICENSE="BSD" +KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +IUSE="+jemalloc tcmalloc test" +SLOT="0" + +RDEPEND=">=dev-lang/lua-5.1:* + tcmalloc? ( dev-util/google-perftools ) + jemalloc? ( >=dev-libs/jemalloc-3.2 )" +DEPEND="virtual/pkgconfig + >=sys-devel/autoconf-2.63 + test? ( dev-lang/tcl:0= ) + ${RDEPEND}" +REQUIRED_USE="?? ( tcmalloc jemalloc )" + +S="${WORKDIR}/${PN}-${PV/_/-}" + +pkg_setup() { + enewgroup redis 75 + enewuser redis 75 -1 /var/lib/redis redis +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.8.3-shared.patch + epatch "${FILESDIR}"/${PN}-2.8.17-config.patch + epatch "${FILESDIR}"/${PN}-3.0.0-sharedlua.patch + + # 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="" + 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-2.2 configure.ac + sed -i -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ + configure.ac || die "Sed failed for configure.ac" + eautoconf +} + +src_configure() { + econf + + # 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() { + tc-export CC AR RANLIB + + local myconf="" + + if use tcmalloc ; then + myconf="${myconf} USE_TCMALLOC=yes" + elif use jemalloc ; then + myconf="${myconf} JEMALLOC_SHARED=yes" + else + myconf="${myconf} MALLOC=yes" + fi + + emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}" +} + +src_install() { + insinto /etc/ + doins redis.conf sentinel.conf + use prefix || fowners redis:redis /etc/{redis,sentinel}.conf + fperms 0644 /etc/{redis,sentinel}.conf + + newconfd