On Sat, May 23, 2026 at 8:39 PM Ankur Tyagi via lists.openembedded.org
<[email protected]> wrote:
>
> From: Ankur Tyagi <[email protected]>
>
> Also refreshed patches to resolve patch fuzz QA issue.
>
> Bug and security fix release
> https://github.com/redis/redis/releases/tag/7.2.13
> https://github.com/redis/redis/releases/tag/7.2.14
>
> Signed-off-by: Ankur Tyagi <[email protected]>
> ---
> .../0001-hiredis-use-default-CC-if-it-is-set.patch | 12 ++++++++----
> ...e-Makefile-to-use-environment-build-setting.patch | 6 +++---
> .../0003-hack-to-force-use-of-libc-malloc.patch | 8 ++++----
> .../redis/0004-src-Do-not-reset-FINAL_LIBS.patch | 6 +++---
> ...GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch | 10 +++++-----
> .../0006-Define-correct-gregs-for-RISCV32.patch | 8 ++++----
> .../redis/{redis_7.2.12.bb => redis_7.2.14.bb} | 2 +-
> 7 files changed, 28 insertions(+), 24 deletions(-)
> rename meta-oe/recipes-extended/redis/{redis_7.2.12.bb => redis_7.2.14.bb}
> (97%)
Fails with error:
ERROR: redis-7.2.14-r0 do_patch: QA Issue: Fuzz detected:
Applying patch 0001-hiredis-use-default-CC-if-it-is-set.patch
patching file deps/hiredis/Makefile
Hunk #1 succeeded at 36 with fuzz 2 (offset -6 lines).
Applying patch 0003-hack-to-force-use-of-libc-malloc.patch
patching file src/Makefile
Hunk #1 succeeded at 13 with fuzz 2.
Applying patch 0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
patching file src/zmalloc.c
Hunk #1 succeeded at 32 with fuzz 2 (offset 4 lines).
The context lines in the patches can be updated with devtool:
devtool modify redis
devtool finish --force-patch-refresh redis <layer_path>
Don't forget to review changes done by devtool!
Patch log indicates that patches do not apply cleanly. [patch-fuzz]
>
> diff --git
> a/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch
>
> b/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch
> index 51a6e9c957..035f533661 100644
> ---
> a/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch
> +++
> b/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch
> @@ -1,4 +1,4 @@
> -From 67990f216f2fbbc8a6699c700dfc089aa617905f Mon Sep 17 00:00:00 2001
> +From 61ae3e0277ac92323584bbe75ce79de6e030e84a Mon Sep 17 00:00:00 2001
> From: Venture Research <[email protected]>
> Date: Fri, 8 Feb 2013 17:39:52 -0600
> Subject: [PATCH] hiredis: use default CC if it is set
> @@ -6,6 +6,10 @@ MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> Instead of trying to automagically figure out CC, which breaks with OE
> as CC has spaces in it, just skip it if one was already passed in.
>
> @@ -23,15 +27,15 @@ Signed-off-by: Andreas Müller <[email protected]>
> 1 file changed, 2 deletions(-)
>
> diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
> -index 7e41c97..54717e3 100644
> +index bd2106b..9ce768d 100644
> --- a/deps/hiredis/Makefile
> +++ b/deps/hiredis/Makefile
> -@@ -42,8 +42,6 @@ endef
> +@@ -36,8 +36,6 @@ endef
> export REDIS_TEST_CONFIG
>
> # Fallback to gcc when $CC is not in $PATH.
> -CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) ||
> echo gcc')
> -CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX)
> || echo g++')
> OPTIMIZATION?=-O3
> - WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
> -Wno-missing-field-initializers
> + WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings
> -Wno-missing-field-initializers
> DEBUG_FLAGS?= -g -ggdb
> diff --git
> a/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch
>
> b/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch
> index 17b533669b..c163aaae8b 100644
> ---
> a/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch
> +++
> b/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch
> @@ -1,4 +1,4 @@
> -From ef989aab052510bfda32b2b325a5f80b76c42677 Mon Sep 17 00:00:00 2001
> +From a35a89981e28fb118efa86a798dacda826eb6f74 Mon Sep 17 00:00:00 2001
> From: Venture Research <[email protected]>
> Date: Fri, 8 Feb 2013 20:22:19 -0600
> Subject: [PATCH] lua: update Makefile to use environment build settings
> @@ -23,10 +23,10 @@ Signed-off-by: Yi Fan Yu <[email protected]>
> 3 files changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/deps/Makefile b/deps/Makefile
> -index cbe3aef..76bc222 100644
> +index 3bf0363..fd8765a 100644
> --- a/deps/Makefile
> +++ b/deps/Makefile
> -@@ -81,7 +81,6 @@ endif
> +@@ -94,7 +94,6 @@ endif
> # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
> # challenging to cross-compile lua (and redis). These defines make it
> easier
> # to fit redis into cross-compilation environments, which typically set AR.
> diff --git
> a/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch
>
> b/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch
> index f1021eef6c..f142ff6ec2 100644
> ---
> a/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch
> +++
> b/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch
> @@ -1,4 +1,4 @@
> -From b9586abcb803747301f6cc4ff93c7642bef693ea Mon Sep 17 00:00:00 2001
> +From a6246b17e94a2f7ad3560787a476b18aa7a45358 Mon Sep 17 00:00:00 2001
> From: Venture Research <[email protected]>
> Date: Wed, 6 Feb 2013 20:51:02 -0600
> Subject: [PATCH] hack to force use of libc malloc
> @@ -20,7 +20,7 @@ Signed-off-by: Alistair Francis <[email protected]>
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/Makefile b/src/Makefile
> -index 7d75c83..35dd314 100644
> +index 6a87909..b8e0d44 100644
> --- a/src/Makefile
> +++ b/src/Makefile
> @@ -13,7 +13,8 @@
> @@ -31,5 +31,5 @@ index 7d75c83..35dd314 100644
> +# use fake uname option to force use of generic libc
> +uname_S := "USE_LIBC_MALLOC"
> uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
> - OPTIMIZATION?=-O2
> - DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
> + CLANG := $(findstring clang,$(shell sh -c '$(CC) --version | head -1'))
> + OPTIMIZATION?=-O3
> diff --git
> a/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch
> b/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch
> index 958106e261..ecf8714d33 100644
> ---
> a/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch
> +++
> b/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch
> @@ -1,4 +1,4 @@
> -From a4d87aca1c00c53b386ee7490223971e00873add Mon Sep 17 00:00:00 2001
> +From 1b59adad94137eedfbcddb27adae74b80b4e0909 Mon Sep 17 00:00:00 2001
> From: Khem Raj <[email protected]>
> Date: Tue, 10 Sep 2019 20:04:26 -0700
> Subject: [PATCH] src: Do not reset FINAL_LIBS
> @@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <[email protected]>
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/Makefile b/src/Makefile
> -index 35dd314..3770f96 100644
> +index b8e0d44..3a68fa6 100644
> --- a/src/Makefile
> +++ b/src/Makefile
> -@@ -93,7 +93,7 @@ endif
> +@@ -122,7 +122,7 @@ endif
>
> FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
> FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
> diff --git
> a/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
>
> b/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
> index d73c66c9d0..cd8fae4074 100644
> ---
> a/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
> +++
> b/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
> @@ -1,4 +1,4 @@
> -From 2e6311c9c7cd85bf63eab8fe92c08ec1ec01b6fc Mon Sep 17 00:00:00 2001
> +From 5a58c573d486411a3a1585ca42bee70a661a983d Mon Sep 17 00:00:00 2001
> From: Khem Raj <[email protected]>
> Date: Sat, 21 Dec 2019 12:09:51 -0800
> Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
> @@ -16,12 +16,12 @@ Signed-off-by: Khem Raj <[email protected]>
> 1 file changed, 1 insertion(+)
>
> diff --git a/src/zmalloc.c b/src/zmalloc.c
> -index 1f33d09..5e182d1 100644
> +index bbfa386..93e07ff 100644
> --- a/src/zmalloc.c
> +++ b/src/zmalloc.c
> -@@ -28,6 +28,7 @@
> - * POSSIBILITY OF SUCH DAMAGE.
> - */
> +@@ -32,6 +32,7 @@
> + #include "config.h"
> + #include "solarisfixes.h"
>
> +#define _GNU_SOURCE
> #include <stdio.h>
> diff --git
> a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
>
> b/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
> index bb3f5c607e..dd44797437 100644
> ---
> a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
> +++
> b/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
> @@ -1,4 +1,4 @@
> -From 6149911f7a6fbaef3ed418408e2b501fa9479ffa Mon Sep 17 00:00:00 2001
> +From 8a16ff40b75671725e4bd92b50a5f083460e796b Mon Sep 17 00:00:00 2001
> From: Khem Raj <[email protected]>
> Date: Mon, 26 Oct 2020 21:32:22 -0700
> Subject: [PATCH] Define correct gregs for RISCV32
> @@ -14,10 +14,10 @@ Signed-off-by: Yi Fan Yu <[email protected]>
> 1 file changed, 24 insertions(+), 2 deletions(-)
>
> diff --git a/src/debug.c b/src/debug.c
> -index bb76c5d..55a0696 100644
> +index 684f692..2ee151f 100644
> --- a/src/debug.c
> +++ b/src/debug.c
> -@@ -1067,7 +1067,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void
> *eip) {
> +@@ -1215,7 +1215,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void
> *eip) {
> #endif
> #elif defined(__linux__)
> /* Linux */
> @@ -28,7 +28,7 @@ index bb76c5d..55a0696 100644
> GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip);
> #elif defined(__X86_64__) || defined(__x86_64__)
> GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip);
> -@@ -1234,8 +1236,28 @@ void logRegisters(ucontext_t *uc) {
> +@@ -1401,8 +1403,28 @@ void logRegisters(ucontext_t *uc) {
> #endif
> /* Linux */
> #elif defined(__linux__)
> diff --git a/meta-oe/recipes-extended/redis/redis_7.2.12.bb
> b/meta-oe/recipes-extended/redis/redis_7.2.14.bb
> similarity index 97%
> rename from meta-oe/recipes-extended/redis/redis_7.2.12.bb
> rename to meta-oe/recipes-extended/redis/redis_7.2.14.bb
> index 2b4087a74b..93235e3707 100644
> --- a/meta-oe/recipes-extended/redis/redis_7.2.12.bb
> +++ b/meta-oe/recipes-extended/redis/redis_7.2.14.bb
> @@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
>
> file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \
> file://0006-Define-correct-gregs-for-RISCV32.patch \
> "
> -SRC_URI[sha256sum] =
> "97c60478a7c777ac914ca9d87a7e88ba265926456107e758c62d8f971d0196bc"
> +SRC_URI[sha256sum] =
> "21326da3f66c0aead4c8204c0ac52ff905337a77cadd169f75ac22835ea30025"
>
> inherit autotools-brokensep pkgconfig update-rc.d systemd useradd
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#127193):
https://lists.openembedded.org/g/openembedded-devel/message/127193
Mute This Topic: https://lists.openembedded.org/mt/119453647/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
