CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

unbound: upgrade 1.22.0 -> 1.24.2

Browse Source 
Contains fixes for CVE-2025-11411 and CVE-2025-5994.

Drop patch that was incorporated in this release.

Changelogs:
https://github.com/NLnetLabs/unbound/releases/tag/release-1.24.2
https://github.com/NLnetLabs/unbound/releases/tag/release-1.24.1
https://github.com/NLnetLabs/unbound/releases/tag/release-1.24.0
https://github.com/NLnetLabs/unbound/releases/tag/release-1.23.1
https://github.com/NLnetLabs/unbound/releases/tag/release-1.23.0

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Gyorgy Sarvari 2025-12-16 12:58:36 +01:00 committed by Khem Raj
parent 598176e1cb
commit 0df484a922
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 2 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
meta-networking/recipes-support/unbound/unbound/0001-fix-build-with-gcc-15-Wbuiltin-declaration-mismatch-.patch
View File

@ -1,44 +0,0 @@
From 1c58ce07919c36e6a11eead67bd6d14cc22acaec Mon Sep 17 00:00:00 2001
From: "mark.yang" <mark.yang@lge.com>
Date: Wed, 2 Apr 2025 15:25:42 +0900
Subject: [PATCH] fix build with gcc-15 -Wbuiltin-declaration-mismatch error
See more details: http://errors.yoctoproject.org/Errors/Details/850313
../git/compat/malloc.c:9:7: warning: conflicting types for built-in function 'malloc'; expected 'void *(long unsigned int)' [-Wbuiltin-declaration-mismatch]
9 | void *malloc ();
| ^~~~~~
../git/compat/malloc.c:5:1: note: 'malloc' is declared in header '<stdlib.h>'
4 | #include "config.h"
+++ |+#include <stdlib.h>
5 | #undef malloc
../git/compat/malloc.c: In function 'rpl_malloc_unbound':
../git/compat/malloc.c:23:10: error: too many arguments to function 'malloc'; expected 0, have 1
23 | return malloc (n);
| ^~~~~~ ~
../git/compat/malloc.c:9:7: note: declared here
9 | void *malloc ();
| ^~~~~~
* Seeing that there is '#undef malloc', it appears they don't want to
use the malloc from stdlib.h.
Therefore, we need to correctly define the parameters for malloc.
Upstream-Status: Submitted [https://github.com/NLnetLabs/unbound/pull/1262]
Signed-off-by: mark.yang <mark.yang@lge.com>
---
compat/malloc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compat/malloc.c b/compat/malloc.c
index d8097b13e..af9dcf134 100644
--- a/compat/malloc.c
+++ b/compat/malloc.c
@@ -6,7 +6,7 @@
#include <sys/types.h>
#ifndef USE_WINSOCK
-void *malloc ();
+void *malloc (size_t n);
#else
/* provide a prototype */
void *malloc (size_t n);

10
meta-networking/recipes-support/unbound/unbound_1.22.0.bb → meta-networking/recipes-support/unbound/unbound_1.24.2.bb
View File

@ -9,17 +9,11 @@ SECTION = "net"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06"
SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master \
SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master;tag=release-${PV} \
file://run-ptest \
file://0001-fix-build-with-gcc-15-Wbuiltin-declaration-mismatch-.patch \
"
# 17 commits after 1.22.0 tag:
# https://github.com/NLnetLabs/unbound/compare/release-1.22.0...7985d17b57d25be262de56c29a43ae4b61c1b896
# to include fix for occasional build failure:
# https://github.com/NLnetLabs/unbound/commit/46cfbf313d812a6e50614a691e162b171dc91d7b
PV .= "+git"
SRCREV = "7985d17b57d25be262de56c29a43ae4b61c1b896"
SRCREV = "f6269baa605d31859f28770e01a24e3677e5f82c"
inherit autotools pkgconfig systemd update-rc.d ptest