From 3df379413a6c32faf1c1451ebbf6b042285ce27d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste VESLIN <19856429+thebaptiste@users.noreply.github.com> Date: Fri, 9 Jan 2026 17:02:48 +0100 Subject: [PATCH 1/2] feat: bump redis from 7.4.6 to 7.4.7 (fix critical bug on HyperLogLog) (#2566) (cherry picked from commit cebe93727dc36854a6c50b965dfb6e0428f9a26f) # Conflicts: # .metwork-framework/components.md --- .metwork-framework/components.md | 14 ++++++++++++++ layers/layer0_core/0100_redis/Makefile.mk | 4 ++-- layers/layer0_core/0100_redis/sources | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.metwork-framework/components.md b/.metwork-framework/components.md index f72b5a4f..f7e5c032 100644 --- a/.metwork-framework/components.md +++ b/.metwork-framework/components.md @@ -220,6 +220,7 @@ | [PyYAML](https://pyyaml.org/) | 6.0.1 | python3 | | [pyyaml_env_tag](https://github.com/waylan/pyyaml-env-tag) | 0.1 | python3_devtools | | [pyzmq](https://pyzmq.readthedocs.org) | 25.1.1 | python3_circus | +<<<<<<< HEAD | [readline](https://www.gnu.org/software/readline) | 8.1.2 | core | | [redis](http://redis.io) | 7.4.6 | core | | [redis](https://github.com/redis/redis-py) | 5.0.1 | python3 | @@ -228,6 +229,19 @@ | [requests-unixsocket](https://github.com/metwork-framework/requests-unixsocket) | 0.3.1 | python3 | | [requests](https://requests.readthedocs.io) | 2.31.0 | python3 | | [rich](https://github.com/Textualize/rich) | 13.5.2 | python3 | +======= +| [readline](https://www.gnu.org/software/readline) | 8.2.13 | core | +| [redis](http://redis.io) | 7.4.7 | core | +| [redis](https://github.com/redis/redis-py) | 6.4.0 | python3 | +| [referencing](https://github.com/python-jsonschema/referencing) | 0.36.2 | python3 | +| [regex](https://github.com/mrabarnett/mrab-regex) | 2024.11.6 | python3 | +| [requests-unixsocket2](https://gitlab.com/thelabnyc/requests-unixsocket2) | 0.4.2 | python3 | +| [requests](https://requests.readthedocs.io) | 2.32.5 | python3 | +| [rich](https://github.com/Textualize/rich) | 14.2.0 | python3 | +| [rpds-py](https://github.com/crate-py/rpds) | 0.29.0 | python3 | +| [sarif_om](https://github.com/microsoft/sarif-python-om) | 1.0.4 | python3_devtools | +| [scikit_build_core](https://github.com/scikit-build/scikit-build-core) | 0.11.3 | python3 | +>>>>>>> cebe937 (feat: bump redis from 7.4.6 to 7.4.7 (fix critical bug on HyperLogLog) (#2566)) | [semantic_version](https://github.com/rbarrois/python-semanticversion) | 2.10.0 | python3 | | [setuptools-git-versioning](https://setuptools-git-versioning.readthedocs.io) | 1.13.5 | python3_devtools | | [setuptools-git](https://github.com/wichert/setuptools-git) | 1.2 | python3 | diff --git a/layers/layer0_core/0100_redis/Makefile.mk b/layers/layer0_core/0100_redis/Makefile.mk index 10ae466e..b5797491 100644 --- a/layers/layer0_core/0100_redis/Makefile.mk +++ b/layers/layer0_core/0100_redis/Makefile.mk @@ -2,10 +2,10 @@ include ../../../adm/root.mk include ../../package.mk export NAME=redis -export VERSION=7.4.6 +export VERSION=7.4.7 export EXTENSION=tar.gz export CHECKTYPE=MD5 -export CHECKSUM=76ffa1474b579341b300537098df295a +export CHECKSUM=0a22d4a6d906a4588603d188b642e85d DESCRIPTION=\ REDIS is an in-memory data structure store, used as a database, cache \ and message broker diff --git a/layers/layer0_core/0100_redis/sources b/layers/layer0_core/0100_redis/sources index 022589bf..1bd741d4 100644 --- a/layers/layer0_core/0100_redis/sources +++ b/layers/layer0_core/0100_redis/sources @@ -1 +1 @@ -http://download.redis.io/releases/redis-7.4.6.tar.gz +http://download.redis.io/releases/redis-7.4.7.tar.gz From 84e06a765fd47a8faf5d366fea3d4c958971c3ae Mon Sep 17 00:00:00 2001 From: Jean-Baptiste VESLIN <19856429+thebaptiste@users.noreply.github.com> Date: Fri, 9 Jan 2026 18:06:15 +0100 Subject: [PATCH 2/2] Update components.md --- .metwork-framework/components.md | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.metwork-framework/components.md b/.metwork-framework/components.md index f7e5c032..16f59a63 100644 --- a/.metwork-framework/components.md +++ b/.metwork-framework/components.md @@ -220,28 +220,14 @@ | [PyYAML](https://pyyaml.org/) | 6.0.1 | python3 | | [pyyaml_env_tag](https://github.com/waylan/pyyaml-env-tag) | 0.1 | python3_devtools | | [pyzmq](https://pyzmq.readthedocs.org) | 25.1.1 | python3_circus | -<<<<<<< HEAD | [readline](https://www.gnu.org/software/readline) | 8.1.2 | core | -| [redis](http://redis.io) | 7.4.6 | core | +| [redis](http://redis.io) | 7.4.7 | core | | [redis](https://github.com/redis/redis-py) | 5.0.1 | python3 | | [regex](https://github.com/mrabarnett/mrab-regex) | 2023.8.8 | python3 | | [repackage](https://www.settlenext.com) | 0.7.3 | python3_devtools | | [requests-unixsocket](https://github.com/metwork-framework/requests-unixsocket) | 0.3.1 | python3 | | [requests](https://requests.readthedocs.io) | 2.31.0 | python3 | | [rich](https://github.com/Textualize/rich) | 13.5.2 | python3 | -======= -| [readline](https://www.gnu.org/software/readline) | 8.2.13 | core | -| [redis](http://redis.io) | 7.4.7 | core | -| [redis](https://github.com/redis/redis-py) | 6.4.0 | python3 | -| [referencing](https://github.com/python-jsonschema/referencing) | 0.36.2 | python3 | -| [regex](https://github.com/mrabarnett/mrab-regex) | 2024.11.6 | python3 | -| [requests-unixsocket2](https://gitlab.com/thelabnyc/requests-unixsocket2) | 0.4.2 | python3 | -| [requests](https://requests.readthedocs.io) | 2.32.5 | python3 | -| [rich](https://github.com/Textualize/rich) | 14.2.0 | python3 | -| [rpds-py](https://github.com/crate-py/rpds) | 0.29.0 | python3 | -| [sarif_om](https://github.com/microsoft/sarif-python-om) | 1.0.4 | python3_devtools | -| [scikit_build_core](https://github.com/scikit-build/scikit-build-core) | 0.11.3 | python3 | ->>>>>>> cebe937 (feat: bump redis from 7.4.6 to 7.4.7 (fix critical bug on HyperLogLog) (#2566)) | [semantic_version](https://github.com/rbarrois/python-semanticversion) | 2.10.0 | python3 | | [setuptools-git-versioning](https://setuptools-git-versioning.readthedocs.io) | 1.13.5 | python3_devtools | | [setuptools-git](https://github.com/wichert/setuptools-git) | 1.2 | python3 |