From 2ef2d436d4ada8c37896efdd199dd1d5066c67e5 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 14:41:10 +0200 Subject: [PATCH] package/redis: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, redis fails to build with output: Applying 0002-largefile-conditional-define.patch using patch: patching file src/fmacros.h Hunk #1 FAILED at 42. 1 out of 1 hunk FAILED -- saving rejects to file src/fmacros.h.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Tested-by: Titouan Christophe Signed-off-by: Thomas Petazzoni --- package/redis/0002-largefile-conditional-define.patch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package/redis/0002-largefile-conditional-define.patch b/package/redis/0002-largefile-conditional-define.patch index 747e0552b3..685a30cc5b 100644 --- a/package/redis/0002-largefile-conditional-define.patch +++ b/package/redis/0002-largefile-conditional-define.patch @@ -12,13 +12,15 @@ Avoids: :0:0: note: this is the location of the previous definition Signed-off-by: Thomas Petazzoni +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Index: redis-2.6.11/src/fmacros.h =================================================================== --- redis-2.6.11.orig/src/fmacros.h 2013-03-25 22:09:15.000000000 +0100 +++ redis-2.6.11/src/fmacros.h 2013-03-25 22:09:40.000000000 +0100 -@@ -42,7 +42,12 @@ - #define _XOPEN_SOURCE +@@ -55,8 +55,13 @@ + #define _POSIX_C_SOURCE 199506L #endif +#ifndef _LARGEFILE_SOURCE @@ -29,4 +31,5 @@ Index: redis-2.6.11/src/fmacros.h #define _FILE_OFFSET_BITS 64 +#endif - #endif + /* deprecate unsafe functions + *