diff --git a/.gitignore b/.gitignore index 5c9e18c..f4ec6a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,10 @@ clog -valkey-8.*.tar.gz -valkey-doc-8.*.tar.gz -/valkey-9.0.0.tar.gz -/valkey-doc-9.0.0.tar.gz -/valkey-9.0.1.tar.gz -/valkey-doc-9.0.1.tar.gz +valkey-8.0.*.tar.gz +valkey-doc-8.0.*.tar.gz +valkey-9.*.tar.gz +valkey-doc-9.*.tar.gz +/valkey-doc-8.1.1.tar.gz +/valkey-8.1.3.tar.gz +/valkey-8.1.4.tar.gz +/valkey-8.1.5.tar.gz +/valkey-doc-8.1.5.tar.gz diff --git a/sources b/sources index 6d26371..cfffa36 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (valkey-9.0.1.tar.gz) = 99e1ab2abd0e1229df7804ac398088d4b3a8e1b031ab66da56ce98f56d0a97c7365b065bacc29d559194a18f5a85c9bf35c0c54f3a8402ec7c6fdbcf4f89181c -SHA512 (valkey-doc-9.0.1.tar.gz) = 061d3758cd754767bd0a45d6be3d709d82d91b2f7b0591b58cecd98cd39529bc0ec1bd490ef0890fb455f81fde33066412655005e25aa460989417803b15f45d +SHA512 (valkey-8.1.5.tar.gz) = ffd3d8efbd28b48351d5001a82e8bf2f28ce4c2a710c30201498391718cad77f9fa7d635ae434b2d1237ba8889613fbad16be0162992e123f7e579c840108f35 +SHA512 (valkey-doc-8.1.5.tar.gz) = 4844c0f9bcad8d98fc39039c2b820c878f777bf0bdc28ecba339b3a40e583dc20d5d30798fc4b2bcd2e6912198f71725f1270681145da58933910ed1a8628db0 diff --git a/valkey-conf.patch b/valkey-conf.patch index a079055..55badf7 100644 --- a/valkey-conf.patch +++ b/valkey-conf.patch @@ -1,6 +1,6 @@ diff -up ./sentinel.conf.rpm ./sentinel.conf ---- ./sentinel.conf.rpm 2025-07-07 09:18:20.000000000 +0200 -+++ ./sentinel.conf 2025-08-01 07:57:21.892278834 +0200 +--- ./sentinel.conf.rpm 2025-07-24 10:05:46.477794769 +0200 ++++ ./sentinel.conf 2025-07-24 10:07:27.023483441 +0200 @@ -17,7 +17,7 @@ daemonize no # When running daemonized, Valkey Sentinel writes a pid file in # /var/run/valkey-sentinel.pid by default. You can specify a custom pid file @@ -20,8 +20,8 @@ diff -up ./sentinel.conf.rpm ./sentinel.conf # To enable logging to the system logger, just set 'syslog-enabled' to yes, # and optionally update the other syslog parameters to suit your needs. diff -up ./valkey.conf.rpm ./valkey.conf ---- ./valkey.conf.rpm 2025-07-07 09:18:20.000000000 +0200 -+++ ./valkey.conf 2025-08-01 07:57:17.825116953 +0200 +--- ./valkey.conf.rpm 2025-07-24 10:05:46.475591081 +0200 ++++ ./valkey.conf 2025-07-24 10:07:23.219331838 +0200 @@ -43,6 +43,9 @@ # include /path/to/other.conf # include /path/to/fragments/*.conf @@ -32,7 +32,7 @@ diff -up ./valkey.conf.rpm ./valkey.conf ################################## MODULES ##################################### -@@ -163,7 +166,7 @@ tcp-backlog 511 +@@ -153,7 +156,7 @@ tcp-backlog 511 # incoming connections. There is no default, so the server will not listen # on a unix socket when not specified. # @@ -41,7 +41,7 @@ diff -up ./valkey.conf.rpm ./valkey.conf # unixsocketgroup wheel # unixsocketperm 700 -@@ -409,7 +412,7 @@ daemonize no +@@ -385,7 +388,7 @@ daemonize no # # Note that on modern Linux systems "/run/valkey.pid" is more conforming # and should be used instead. @@ -50,7 +50,7 @@ diff -up ./valkey.conf.rpm ./valkey.conf # Specify the server verbosity level. # This can be one of: -@@ -440,7 +443,7 @@ loglevel notice +@@ -416,7 +419,7 @@ loglevel notice # Specify the log file name. Also the empty string can be used to force # the server to log on the standard output. Note that if you use standard # output for logging but daemonize, logs will be sent to /dev/null diff --git a/valkey-loadmod.patch b/valkey-loadmod.patch index dad9cb9..3341863 100644 --- a/valkey-loadmod.patch +++ b/valkey-loadmod.patch @@ -1,31 +1,19 @@ -From b40ab88996d0bbe9bdd366af9426f7400b21e19c Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Sat, 4 Oct 2025 07:23:52 +0200 -Subject: [PATCH] Fix #2678 don't add loadmodule when from config +Adapted for 8.1.4 from +https://github.com/valkey-io/valkey/pull/2689 -only protect loadmodule from include files - -Signed-off-by: Remi Collet ---- - src/config.c | 8 ++++++-- - src/module.c | 17 ++++++++++++----- - src/module.h | 4 ++-- - 3 files changed, 20 insertions(+), 9 deletions(-) - -diff --git a/src/config.c b/src/config.c -index d0158b2c4d..ab453056df 100644 ---- a/src/config.c -+++ b/src/config.c -@@ -448,6 +448,8 @@ static int updateClientOutputBufferLimit(sds *args, int arg_len, const char **er +diff -up ./src/config.c.loadmod ./src/config.c +--- ./src/config.c.loadmod 2025-10-03 21:17:43.000000000 +0200 ++++ ./src/config.c 2025-10-06 03:06:41.774448336 +0200 +@@ -438,6 +438,8 @@ static int updateClientOutputBufferLimit * within conf file parsing. This is only needed to support the deprecated * abnormal aggregate `save T C` functionality. Remove in the future. */ static int reading_config_file; +/* support detecting include vs main config file */ +static int reading_include_file = 0; - void loadServerConfigFromString(sds config) { + void loadServerConfigFromString(char *config) { deprecatedConfig deprecated_configs[] = { -@@ -539,7 +541,9 @@ void loadServerConfigFromString(sds config) { +@@ -529,7 +531,9 @@ void loadServerConfigFromString(char *co /* Execute config directives */ if (!strcasecmp(argv[0], "include") && argc == 2) { @@ -35,7 +23,7 @@ index d0158b2c4d..ab453056df 100644 } else if (!strcasecmp(argv[0], "rename-command") && argc == 3) { struct serverCommand *cmd = lookupCommandBySds(argv[1]); -@@ -572,7 +576,7 @@ void loadServerConfigFromString(sds config) { +@@ -562,7 +566,7 @@ void loadServerConfigFromString(char *co goto loaderr; } } else if (!strcasecmp(argv[0], "loadmodule") && argc >= 2) { @@ -44,7 +32,7 @@ index d0158b2c4d..ab453056df 100644 } else if (strchr(argv[0], '.')) { if (argc < 2) { err = "Module config specified without value"; -@@ -1605,7 +1609,7 @@ void rewriteConfigLoadmoduleOption(struct rewriteConfigState *state) { +@@ -1579,7 +1583,7 @@ void rewriteConfigLoadmoduleOption(struc while ((de = dictNext(di)) != NULL) { struct ValkeyModule *module = dictGetVal(de); line = moduleLoadQueueEntryToLoadmoduleOptionStr(module, "loadmodule"); @@ -53,11 +41,10 @@ index d0158b2c4d..ab453056df 100644 } dictReleaseIterator(di); /* Mark "loadmodule" as processed in case modules is empty. */ -diff --git a/src/module.c b/src/module.c -index e5afa952fa..f18bc3c6bf 100644 ---- a/src/module.c -+++ b/src/module.c -@@ -84,6 +84,7 @@ +diff -up ./src/module.c.loadmod ./src/module.c +--- ./src/module.c.loadmod 2025-10-03 21:17:43.000000000 +0200 ++++ ./src/module.c 2025-10-06 03:05:36.498290506 +0200 +@@ -83,6 +83,7 @@ struct moduleLoadQueueEntry { sds path; @@ -65,7 +52,7 @@ index e5afa952fa..f18bc3c6bf 100644 int argc; robj **argv; }; -@@ -670,7 +671,7 @@ void freeClientModuleData(client *c) { +@@ -669,7 +670,7 @@ void freeClientModuleData(client *c) { c->module_data = NULL; } @@ -74,7 +61,7 @@ index e5afa952fa..f18bc3c6bf 100644 int i; struct moduleLoadQueueEntry *loadmod; -@@ -678,6 +679,7 @@ void moduleEnqueueLoadModule(sds path, sds *argv, int argc) { +@@ -677,6 +678,7 @@ void moduleEnqueueLoadModule(sds path, s loadmod->argv = argc ? zmalloc(sizeof(robj *) * argc) : NULL; loadmod->path = sdsnew(path); loadmod->argc = argc; @@ -82,7 +69,7 @@ index e5afa952fa..f18bc3c6bf 100644 for (i = 0; i < argc; i++) { loadmod->argv[i] = createRawStringObject(argv[i], sdslen(argv[i])); } -@@ -688,6 +690,10 @@ sds moduleLoadQueueEntryToLoadmoduleOptionStr(ValkeyModule *module, +@@ -687,6 +689,10 @@ sds moduleLoadQueueEntryToLoadmoduleOpti const char *config_option_str) { sds line; @@ -93,7 +80,7 @@ index e5afa952fa..f18bc3c6bf 100644 line = sdsnew(config_option_str); line = sdscatlen(line, " ", 1); line = sdscatsds(line, module->loadmod->path); -@@ -12350,7 +12356,7 @@ void moduleLoadFromQueue(void) { +@@ -12188,7 +12194,7 @@ void moduleLoadFromQueue(void) { listRewind(server.loadmodule_queue, &li); while ((ln = listNext(&li))) { struct moduleLoadQueueEntry *loadmod = ln->value; @@ -102,7 +89,7 @@ index e5afa952fa..f18bc3c6bf 100644 serverLog(LL_WARNING, "Can't load module from %s: server aborting", loadmod->path); exit(1); } -@@ -12531,7 +12537,7 @@ void moduleUnregisterCleanup(ValkeyModule *module) { +@@ -12369,7 +12375,7 @@ void moduleUnregisterCleanup(ValkeyModul /* Load a module and initialize it. On success C_OK is returned, otherwise * C_ERR is returned. */ @@ -111,7 +98,7 @@ index e5afa952fa..f18bc3c6bf 100644 int (*onload)(void *, void **, int); void *handle; -@@ -12606,6 +12612,7 @@ int moduleLoad(const char *path, void **module_argv, int module_argc, int is_loa +@@ -12444,6 +12450,7 @@ int moduleLoad(const char *path, void ** ctx.module->loadmod->path = sdsnew(path); ctx.module->loadmod->argv = module_argc ? zmalloc(sizeof(robj *) * module_argc) : NULL; ctx.module->loadmod->argc = module_argc; @@ -119,7 +106,7 @@ index e5afa952fa..f18bc3c6bf 100644 for (int i = 0; i < module_argc; i++) { ctx.module->loadmod->argv[i] = module_argv[i]; incrRefCount(ctx.module->loadmod->argv[i]); -@@ -13529,7 +13536,7 @@ void moduleCommand(client *c) { +@@ -13361,7 +13368,7 @@ void moduleCommand(client *c) { argv = &c->argv[3]; } @@ -128,7 +115,7 @@ index e5afa952fa..f18bc3c6bf 100644 addReply(c, shared.ok); else addReplyError(c, "Error loading the extension. Please check the server logs."); -@@ -13544,7 +13551,7 @@ void moduleCommand(client *c) { +@@ -13376,7 +13383,7 @@ void moduleCommand(client *c) { /* If this is a loadex command we want to populate server.module_configs_queue with * sds NAME VALUE pairs. We also want to increment argv to just after ARGS, if supplied. */ if (parseLoadexArguments((ValkeyModuleString ***)&argv, &argc) == VALKEYMODULE_OK && @@ -137,11 +124,10 @@ index e5afa952fa..f18bc3c6bf 100644 addReply(c, shared.ok); else { dictEmpty(server.module_configs_queue, NULL); -diff --git a/src/module.h b/src/module.h -index f6c266b592..1f9e729e56 100644 ---- a/src/module.h -+++ b/src/module.h -@@ -169,7 +169,7 @@ static inline void moduleInitDigestContext(ValkeyModuleDigest *mdvar) { +diff -up ./src/module.h.loadmod ./src/module.h +--- ./src/module.h.loadmod 2025-10-03 21:17:43.000000000 +0200 ++++ ./src/module.h 2025-10-06 03:05:36.498698194 +0200 +@@ -169,7 +169,7 @@ static inline void moduleInitDigestConte memset(mdvar->x, 0, sizeof(mdvar->x)); } @@ -150,7 +136,7 @@ index f6c266b592..1f9e729e56 100644 sds moduleLoadQueueEntryToLoadmoduleOptionStr(ValkeyModule *module, const char *config_option_str); ValkeyModuleCtx *moduleAllocateContext(void); -@@ -180,7 +180,7 @@ void moduleFreeContext(ValkeyModuleCtx *ctx); +@@ -180,7 +180,7 @@ void moduleFreeContext(ValkeyModuleCtx * void moduleInitModulesSystem(void); void moduleInitModulesSystemLast(void); void modulesCron(void); diff --git a/valkey.spec b/valkey.spec index 8b97070..2f5d94d 100644 --- a/valkey.spec +++ b/valkey.spec @@ -5,12 +5,12 @@ %bcond_with docs %endif # See https://github.com/valkey-io/valkey-doc/tags -%global doc_version 9.0.1 +%global doc_version 8.1.5 # Tests fail in mock, not in local build. %bcond_with tests Name: valkey -Version: 9.0.1 +Version: 8.1.5 Release: 1%{?dist} Summary: A persistent key-value database # valkey: BSD-3-Clause @@ -53,8 +53,8 @@ BuildRequires: python3-pyyaml %endif Requires: logrotate -# from deps/libvalkey/include/valkey/valkey.h -Provides: bundled(libvalkey) = 0.2.1 +# from deps/hiredis/hiredis.h +Provides: bundled(hiredis) = 1.0.3 # from deps/jemalloc/VERSION Provides: bundled(jemalloc) = 5.3.0 # from deps/lua/src/lua.h @@ -62,9 +62,8 @@ Provides: bundled(lua-libs) = 5.1.5 # from deps/linenoise/linenoise.h Provides: bundled(linenoise) = 1.0 Provides: bundled(lzf) -# from deps/README.md -# e4448cf6d1cd08fff519812d3b1e58bd5a94ac42 -Provides: bundled(hdr_histogram) = 0.11.9 +# from deps/hdr_histogram/README.md +Provides: bundled(hdr_histogram) = 0.11.0 # no version Provides: bundled(fpconv) @@ -187,7 +186,7 @@ Provides: redis-doc = %{version}-%{release} mv deps/lua/COPYRIGHT COPYRIGHT-lua mv deps/jemalloc/COPYING COPYING-jemalloc -mv deps/libvalkey/COPYING COPYING-libvalkey +mv deps/hiredis/COPYING COPYING-hiredis-BSD-3-Clause mv deps/hdr_histogram/LICENSE.txt LICENSE-hdrhistogram mv deps/hdr_histogram/COPYING.txt COPYING-hdrhistogram mv deps/fpconv/LICENSE.txt LICENSE-fpconv @@ -392,7 +391,7 @@ fi %license LICENSE-hdrhistogram %license COPYING-hdrhistogram %license LICENSE-fpconv -%license COPYING-libvalkey +%license COPYING-hiredis-BSD-3-Clause %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %attr(0750, valkey, root) %dir %{_sysconfdir}/%{name} %attr(0750, valkey, root) %dir %{valkey_modules_cfg} @@ -443,18 +442,14 @@ fi %changelog -* Wed Dec 10 2025 Remi Collet - 9.0.1-1 -- Valkey 9.0.1 - December 9, 2025 +* Thu Dec 4 2025 Remi Collet - 8.1.5-1 +- Valkey 8.1.5 - Released Thu 04 December 2025 - Upgrade urgency MODERATE -* Thu Nov 27 2025 Remi Collet - 9.0.0-2 +* Thu Nov 27 2025 Remi Collet - 8.1.4-3 - build TLS statically as module not supported by sentinel - drop sub-package for TLS module -* Wed Oct 22 2025 Remi Collet - 9.0.0-1 -- Valkey 9.0.0 GA - October 21, 2025 -- bundled hiredis replaced by libvalkey - * Mon Oct 6 2025 Remi Collet - 8.1.4-2 - improve the patch for loadmodule directive