From 6c21bee92a251a8105f74e58e1503bce979d76ad Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Mon, 21 Jul 2025 15:17:26 +0800
Subject: valkey: upgrade 8.1.1 -> 8.1.3

ChangeLog:
https://github.com/valkey-io/valkey/releases/tag/8.1.2
https://github.com/valkey-io/valkey/releases/tag/8.1.3

Security fixes:
CVE-2025-27151
CVE-2025-32023
CVE-2025-48367

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../valkey/valkey/init-valkey-server               |  0
 meta-oe/recipes-extended/valkey/valkey_8.1.1.bb    | 76 ----------------------
 meta-oe/recipes-extended/valkey/valkey_8.1.3.bb    | 75 +++++++++++++++++++++
 3 files changed, 75 insertions(+), 76 deletions(-)
 mode change 100755 => 100644 meta-oe/recipes-extended/valkey/valkey/init-valkey-server
 delete mode 100644 meta-oe/recipes-extended/valkey/valkey_8.1.1.bb
 create mode 100644 meta-oe/recipes-extended/valkey/valkey_8.1.3.bb

diff --git a/meta-oe/recipes-extended/valkey/valkey/init-valkey-server b/meta-oe/recipes-extended/valkey/valkey/init-valkey-server
old mode 100755
new mode 100644
diff --git a/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb b/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb
deleted file mode 100644
index 35b3d3c4a7..0000000000
--- a/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb
+++ /dev/null
@@ -1,76 +0,0 @@
-SUMMARY = "Valkey key-value store"
-DESCRIPTION = "A flexible distributed key-value datastore that supports both caching and beyond caching workloads."
-HOMEPAGE = "http://valkey.io"
-SECTION = "libs"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=08b9159809d809e8aaa340a8387e693e"
-DEPENDS = "readline lua ncurses"
-
-SRC_URI = " \
-	git://github.com/valkey-io/valkey.git;branch=8.1;protocol=https \
-        file://valkey.conf \
-	file://init-valkey-server \
-	file://valkey.service \
-	file://hiredis-use-default-CC-if-it-is-set.patch \
-	file://lua-update-Makefile-to-use-environment-build-setting.patch \
-	file://oe-use-libc-malloc.patch \
-	file://0001-src-Do-not-reset-FINAL_LIBS.patch \
-	file://GNU_SOURCE-7.patch \
-"
-SRCREV = "fcd8bc3ee40f5d7841b7d5a8f3cd12252fec14e4"
-
-
-RPROVIDES:${PN} = "virtual-redis"
-
-inherit pkgconfig update-rc.d systemd useradd
-
-FINAL_LIBS:x86:toolchain-clang = "-latomic"
-FINAL_LIBS:riscv32:toolchain-clang = "-latomic"
-FINAL_LIBS:mips = "-latomic"
-FINAL_LIBS:arm = "-latomic"
-FINAL_LIBS:powerpc = "-latomic"
-
-export FINAL_LIBS
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN}  = "--system --home-dir /var/lib/valkey -g valkey --shell /bin/false valkey"
-GROUPADD_PARAM:${PN} = "--system valkey"
-
-PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd"
-
-EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
-
-do_compile() {
-    oe_runmake -C deps hiredis lua linenoise
-    oe_runmake
-}
-
-do_install() {
-    export PREFIX=${D}/${prefix}
-    oe_runmake install
-    install -d ${D}/${sysconfdir}/valkey
-    install -m 0644 ${UNPACKDIR}/valkey.conf ${D}/${sysconfdir}/valkey/valkey.conf
-    install -d ${D}/${sysconfdir}/init.d
-    install -m 0755 ${UNPACKDIR}/init-valkey-server ${D}/${sysconfdir}/init.d/valkey-server
-    install -d ${D}/var/lib/valkey/
-    chown valkey.valkey ${D}/var/lib/valkey/
-
-    install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${UNPACKDIR}/valkey.service ${D}${systemd_system_unitdir}
-    sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/valkey.service
-
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-        sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/valkey/valkey.conf
-        sed -i 's!supervised no!supervised systemd!' ${D}/${sysconfdir}/valkey/valkey.conf
-    fi
-}
-
-CONFFILES:${PN} = "${sysconfdir}/valkey/valkey.conf"
-
-INITSCRIPT_NAME = "valkey-server"
-INITSCRIPT_PARAMS = "defaults 87"
-
-SYSTEMD_SERVICE:${PN} = "valkey.service"
-
-CVE_STATUS[CVE-2022-3734] = "not-applicable-platform: CVE only applies for Windows."
diff --git a/meta-oe/recipes-extended/valkey/valkey_8.1.3.bb b/meta-oe/recipes-extended/valkey/valkey_8.1.3.bb
new file mode 100644
index 0000000000..28b375bde2
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey_8.1.3.bb
@@ -0,0 +1,75 @@
+SUMMARY = "Valkey key-value store"
+DESCRIPTION = "A flexible distributed key-value datastore that supports both caching and beyond caching workloads."
+HOMEPAGE = "http://valkey.io"
+SECTION = "libs"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=08b9159809d809e8aaa340a8387e693e"
+DEPENDS = "readline lua ncurses"
+
+SRC_URI = " \
+	git://github.com/valkey-io/valkey.git;branch=8.1;protocol=https \
+        file://valkey.conf \
+	file://init-valkey-server \
+	file://valkey.service \
+	file://hiredis-use-default-CC-if-it-is-set.patch \
+	file://lua-update-Makefile-to-use-environment-build-setting.patch \
+	file://oe-use-libc-malloc.patch \
+	file://0001-src-Do-not-reset-FINAL_LIBS.patch \
+	file://GNU_SOURCE-7.patch \
+"
+SRCREV = "d063dff523340e5a075f7ddc436e0c2a43d04061"
+
+RPROVIDES:${PN} = "virtual-redis"
+
+inherit pkgconfig update-rc.d systemd useradd
+
+FINAL_LIBS:x86:toolchain-clang = "-latomic"
+FINAL_LIBS:riscv32 = "-latomic"
+FINAL_LIBS:mips = "-latomic"
+FINAL_LIBS:arm = "-latomic"
+FINAL_LIBS:powerpc = "-latomic"
+
+export FINAL_LIBS
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM:${PN}  = "--system --home-dir /var/lib/valkey -g valkey --shell /bin/false valkey"
+GROUPADD_PARAM:${PN} = "--system valkey"
+
+PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd"
+
+EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
+
+do_compile() {
+    oe_runmake -C deps hiredis lua linenoise
+    oe_runmake
+}
+
+do_install() {
+    export PREFIX=${D}/${prefix}
+    oe_runmake install
+    install -d ${D}/${sysconfdir}/valkey
+    install -m 0644 ${UNPACKDIR}/valkey.conf ${D}/${sysconfdir}/valkey/valkey.conf
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${UNPACKDIR}/init-valkey-server ${D}/${sysconfdir}/init.d/valkey-server
+    install -d ${D}/var/lib/valkey/
+    chown valkey.valkey ${D}/var/lib/valkey/
+
+    install -d ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/valkey.service ${D}${systemd_system_unitdir}
+    sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/valkey.service
+
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/valkey/valkey.conf
+        sed -i 's!supervised no!supervised systemd!' ${D}/${sysconfdir}/valkey/valkey.conf
+    fi
+}
+
+CONFFILES:${PN} = "${sysconfdir}/valkey/valkey.conf"
+
+INITSCRIPT_NAME = "valkey-server"
+INITSCRIPT_PARAMS = "defaults 87"
+
+SYSTEMD_SERVICE:${PN} = "valkey.service"
+
+CVE_STATUS[CVE-2022-3734] = "not-applicable-platform: CVE only applies for Windows."
-- 
cgit v1.2.3-54-g00ecf