diff options
| author | Changqing Li <changqing.li@windriver.com> | 2022-06-29 09:20:15 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-07-02 11:37:03 -0400 |
| commit | 6b14321090d1d7098ea10e9bad57721875321afe (patch) | |
| tree | f2cefe2591131d1adde48af147f55574be2ec29a | |
| parent | 105288aa55a597b45931f1fa0498bee390316a09 (diff) | |
| download | meta-openembedded-6b14321090d1d7098ea10e9bad57721875321afe.tar.gz | |
redis: upgrade 6.2.6 -> 6.2.7
This upgrade include CVE fix:
CVE-2022-24735
CVE-2022-24736
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch | 14 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/redis/redis_6.2.7.bb (renamed from meta-oe/recipes-extended/redis/redis_6.2.6.bb) | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch b/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch index 12994da569..20f689bd0b 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 @@ | |||
| 1 | From 18dc1457db8f66237e016b85a04dc50833c33c50 Mon Sep 17 00:00:00 2001 | 1 | From 98d526f76049be21bf3d77158236b2189419a78e Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 21 Dec 2019 12:09:51 -0800 | 3 | Date: Sat, 21 Dec 2019 12:09:51 -0800 |
| 4 | Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER | 4 | Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER |
| @@ -10,20 +10,22 @@ Fixes | |||
| 10 | 10 | ||
| 11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | |||
| 14 | --- | 13 | --- |
| 15 | src/zmalloc.c | 1 + | 14 | src/zmalloc.c | 1 + |
| 16 | 1 file changed, 1 insertion(+) | 15 | 1 file changed, 1 insertion(+) |
| 17 | 16 | ||
| 18 | diff --git a/src/zmalloc.c b/src/zmalloc.c | 17 | diff --git a/src/zmalloc.c b/src/zmalloc.c |
| 19 | index ba03685..322304f 100644 | 18 | index 1f33d09..5e182d1 100644 |
| 20 | --- a/src/zmalloc.c | 19 | --- a/src/zmalloc.c |
| 21 | +++ b/src/zmalloc.c | 20 | +++ b/src/zmalloc.c |
| 22 | @@ -32,6 +32,7 @@ | 21 | @@ -28,6 +28,7 @@ |
| 23 | #include "config.h" | 22 | * POSSIBILITY OF SUCH DAMAGE. |
| 24 | #include "solarisfixes.h" | 23 | */ |
| 25 | 24 | ||
| 26 | +#define _GNU_SOURCE | 25 | +#define _GNU_SOURCE |
| 27 | #include <stdio.h> | 26 | #include <stdio.h> |
| 28 | #include <stdlib.h> | 27 | #include <stdlib.h> |
| 29 | #include <stdint.h> | 28 | #include <stdint.h> |
| 29 | -- | ||
| 30 | 2.25.1 | ||
| 31 | |||
diff --git a/meta-oe/recipes-extended/redis/redis_6.2.6.bb b/meta-oe/recipes-extended/redis/redis_6.2.7.bb index 87fade7e04..7f922a4e0f 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 \ | |||
| 17 | file://GNU_SOURCE.patch \ | 17 | file://GNU_SOURCE.patch \ |
| 18 | file://0006-Define-correct-gregs-for-RISCV32.patch \ | 18 | file://0006-Define-correct-gregs-for-RISCV32.patch \ |
| 19 | " | 19 | " |
| 20 | SRC_URI[sha256sum] = "5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab" | 20 | SRC_URI[sha256sum] = "b7a79cc3b46d3c6eb52fa37dde34a4a60824079ebdfb3abfbbfa035947c55319" |
| 21 | 21 | ||
| 22 | inherit autotools-brokensep update-rc.d systemd useradd | 22 | inherit autotools-brokensep update-rc.d systemd useradd |
| 23 | 23 | ||
