diff mbox series

[kirkstone,master] redis: upgrade 6.2.6 -> 6.2.7

Message ID 20220629012015.500527-1-changqing.li@windriver.com
State Under Review
Delegated to: Armin Kuster
Headers show
Series [kirkstone,master] redis: upgrade 6.2.6 -> 6.2.7 | expand

Commit Message

Changqing Li June 29, 2022, 1:20 a.m. UTC 
From: Changqing Li <changqing.li@windriver.com>

This upgrade include CVE fix:
CVE-2022-24735
CVE-2022-24736

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 .../recipes-extended/redis/redis/GNU_SOURCE.patch  | 14 ++++++++------
 .../redis/{redis_6.2.6.bb => redis_6.2.7.bb}       |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)
 rename meta-oe/recipes-extended/redis/{redis_6.2.6.bb => redis_6.2.7.bb} (96%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch b/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch
index 12994da56..20f689bd0 100644
--- a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch
+++ b/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch
@@ -1,4 +1,4 @@ 
-From 18dc1457db8f66237e016b85a04dc50833c33c50 Mon Sep 17 00:00:00 2001
+From 98d526f76049be21bf3d77158236b2189419a78e Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 21 Dec 2019 12:09:51 -0800
 Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
@@ -10,20 +10,22 @@  Fixes
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
 ---
  src/zmalloc.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/src/zmalloc.c b/src/zmalloc.c
-index ba03685..322304f 100644
+index 1f33d09..5e182d1 100644
 --- a/src/zmalloc.c
 +++ b/src/zmalloc.c
-@@ -32,6 +32,7 @@
- #include "config.h"
- #include "solarisfixes.h"
+@@ -28,6 +28,7 @@
+  * POSSIBILITY OF SUCH DAMAGE.
+  */
  
 +#define _GNU_SOURCE
  #include <stdio.h>
  #include <stdlib.h>
  #include <stdint.h>
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-extended/redis/redis_6.2.6.bb b/meta-oe/recipes-extended/redis/redis_6.2.7.bb
similarity index 96%
rename from meta-oe/recipes-extended/redis/redis_6.2.6.bb
rename to meta-oe/recipes-extended/redis/redis_6.2.7.bb
index 87fade7e0..7f922a4e0 100644
--- a/meta-oe/recipes-extended/redis/redis_6.2.6.bb
+++ b/meta-oe/recipes-extended/redis/redis_6.2.7.bb
@@ -17,7 +17,7 @@  SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://GNU_SOURCE.patch \
            file://0006-Define-correct-gregs-for-RISCV32.patch \
            "
-SRC_URI[sha256sum] = "5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab"
+SRC_URI[sha256sum] = "b7a79cc3b46d3c6eb52fa37dde34a4a60824079ebdfb3abfbbfa035947c55319"
 
 inherit autotools-brokensep update-rc.d systemd useradd