1. License-Update: copyright years updated 2. Fix installed-vs-shipped QA error ... ERROR: ncurses-6.6-r0 do_package: QA Issue: ncurses: Files/directories were installed but not shipped in any package: /usr/lib ncurses: 1 installed and not shipped files. [installed-vs-shipped] ...
Due to commit [1], upstream hardcoded `lib` to create symlink ... ** sym-linked tmp/work/x86-64-v3-oe-linux/ncurses/6.6/image/usr/lib/terminfo for compatibility ... Apply a local patch to not create symlink terminfo under image/usr/lib, and clean up symlink remove operation in recipe 3. Delete backport patch - CVE-2025-6141.patch 4. Announcing ncurses 6.6: https://lists.gnu.org/archive/html/info-gnu/2025-12/msg00010.html [1] https://github.com/ThomasDickey/ncurses-snapshots/commit/a60b584d93ab59e1df0bc9661b7 Signed-off-by: Hongxu Jia <[email protected]> --- ...te-symlink-to-terminfo-under-usr-lib.patch | 47 +++++++++++++++++++ .../ncurses/files/0001-tic-hang.patch | 6 +-- .../files/0002-configure-reproducible.patch | 6 +-- ...-Do-not-include-LDFLAGS-in-generated.patch | 4 +- .../ncurses/files/CVE-2025-6141.patch | 25 ---------- .../ncurses/files/exit_prototype.patch | 10 ++-- meta/recipes-core/ncurses/ncurses.inc | 7 +-- .../{ncurses_6.5.bb => ncurses_6.6.bb} | 4 +- 8 files changed, 63 insertions(+), 46 deletions(-) create mode 100644 meta/recipes-core/ncurses/files/0001-do-not-create-symlink-to-terminfo-under-usr-lib.patch delete mode 100644 meta/recipes-core/ncurses/files/CVE-2025-6141.patch rename meta/recipes-core/ncurses/{ncurses_6.5.bb => ncurses_6.6.bb} (80%) diff --git a/meta/recipes-core/ncurses/files/0001-do-not-create-symlink-to-terminfo-under-usr-lib.patch b/meta/recipes-core/ncurses/files/0001-do-not-create-symlink-to-terminfo-under-usr-lib.patch new file mode 100644 index 0000000000..86eb41b465 --- /dev/null +++ b/meta/recipes-core/ncurses/files/0001-do-not-create-symlink-to-terminfo-under-usr-lib.patch @@ -0,0 +1,47 @@ +From 6464ca567ca012b56bdae127758a118fa193a211 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Wed, 4 Mar 2026 16:57:31 +0800 +Subject: [PATCH] do not create symlink to terminfo under /usr/lib + +Due to commit [1], it hardcoded `lib` to create symlink +... + ** sym-linked tmp/work/x86-64-v3-oe-linux/ncurses/6.6/image/usr/lib/terminfo for compatibility +... + +It is not necessary for Yocto + +Upstream-Status: Inappropriate [Yocto specific] +Signed-off-by: Hongxu Jia <[email protected]> +--- + misc/run_tic.in | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/misc/run_tic.in b/misc/run_tic.in +index 60fbdcc7..fa40b33c 100644 +--- a/misc/run_tic.in ++++ b/misc/run_tic.in +@@ -215,21 +215,6 @@ if test "$OLD_DIR" != "$TICDIR" ; then + fi + else + cd "${INSTALL_PREFIX}" || exit +- # Construct a symbolic link that only assumes $ticdir has the +- # same $prefix as the other installed directories. +- SOURCE=`echo "$ticdir"|sed -e 's%^'"$prefix"'/%%'` +- if test "$SOURCE" != "$ticdir" ; then +- SOURCE=../`echo "$ticdir"|sed -e 's%^'"$prefix"'/%%' -e 's%^/%%'` +- fi +- test -d lib || mkdir lib +- cd lib || exit +- TARGET=`pwd`/terminfo +- if ( @LN_S@ "$SOURCE" terminfo ) +- then +- echo "** sym-linked $TARGET for compatibility" +- else +- echo "** could not sym-link $TARGET for compatibility" +- fi + fi + fi + # vile:shmode ts=4 sw=4 +-- +2.34.1 + diff --git a/meta/recipes-core/ncurses/files/0001-tic-hang.patch b/meta/recipes-core/ncurses/files/0001-tic-hang.patch index 8cb92a3939..b852bf72d2 100644 --- a/meta/recipes-core/ncurses/files/0001-tic-hang.patch +++ b/meta/recipes-core/ncurses/files/0001-tic-hang.patch @@ -1,4 +1,4 @@ -From a51a53f0eecfd4d083aba8dfcd47c65e93978ff1 Mon Sep 17 00:00:00 2001 +From 055c095e9b7c850dfb1ad7cf8e334f38fa9ba2c3 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Fri, 30 Mar 2018 10:02:24 +0800 Subject: [PATCH] tic hang @@ -17,10 +17,10 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/misc/terminfo.src b/misc/terminfo.src -index 5d575b8e..f9cc6880 100644 +index f111e534..6e862729 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src -@@ -6518,12 +6518,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm, +@@ -6644,12 +6644,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm, # The value for kbs (see konsole-vt100) reflects local customization rather # than the settings used for XFree86 xterm. konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, diff --git a/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch index 11ca66c8e8..66812f75e5 100644 --- a/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch +++ b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch @@ -1,4 +1,4 @@ -From 63cf58044f4ab3297c5a2d0e132e87ebfa80c753 Mon Sep 17 00:00:00 2001 +From 58bec4533de00e0b765d8db496f9e20e4efca518 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Wed, 16 Aug 2017 14:45:27 +0800 Subject: [PATCH] configure: reproducible @@ -18,10 +18,10 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 488d93fc..005d44e2 100755 +index 48ad381f..c816cbe1 100755 --- a/configure +++ b/configure -@@ -5129,7 +5129,7 @@ else +@@ -5422,7 +5422,7 @@ else ;; (*) cf_cv_ar_flags=unknown diff --git a/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch b/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch index d89399bbe5..e004d7950a 100644 --- a/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch +++ b/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch @@ -1,4 +1,4 @@ -From 5962a5ee2885f67a396f7e8955ac1bbd7f15d4aa Mon Sep 17 00:00:00 2001 +From ce86a223b09b27981fb3d5ef32672612f0c2eae7 Mon Sep 17 00:00:00 2001 From: Nathan Rossi <[email protected]> Date: Mon, 14 Dec 2020 13:39:02 +1000 Subject: [PATCH] gen-pkgconfig.in: Do not include LDFLAGS in generated pc @@ -15,7 +15,7 @@ Signed-off-by: Nathan Rossi <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in -index 89a5cd4a..07d94d17 100644 +index c369dd26..abca88fe 100644 --- a/misc/gen-pkgconfig.in +++ b/misc/gen-pkgconfig.in @@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; then diff --git a/meta/recipes-core/ncurses/files/CVE-2025-6141.patch b/meta/recipes-core/ncurses/files/CVE-2025-6141.patch deleted file mode 100644 index ec7e8a94e4..0000000000 --- a/meta/recipes-core/ncurses/files/CVE-2025-6141.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 27d1493340d714e7be6e08c0a8f43e48276149c4 Mon Sep 17 00:00:00 2001 -From: "Thomas E. Dickey" <[email protected]> -Date: Sat, 29 Mar 2025 22:52:37 +0000 -Subject: [PATCH] snapshot of project "ncurses", label v6_5_20250329 - -CVE: CVE-2025-6141 -Upstream-Status: Backport [https://github.com/ThomasDickey/ncurses-snapshots/commit/27d1493340d714e7be6e08c0a8f43e48276149c4] -Signed-off-by: Peter Marko <[email protected]> ---- - ncurses/tinfo/parse_entry.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c -index a2278c07..c551c780 100644 ---- a/ncurses/tinfo/parse_entry.c -+++ b/ncurses/tinfo/parse_entry.c -@@ -985,6 +985,8 @@ postprocess_termcap(TERMTYPE2 *tp, bool has_base) - bp = tp->Strings[from_ptr->nte_index]; - if (VALID_STRING(bp)) { - for (dp = buf2; *bp; bp++) { -+ if ((size_t) (dp - buf2) >= (sizeof(buf2) - sizeof(TERMTYPE2))) -+ break; - if (bp[0] == '$' && bp[1] == '<') { - while (*bp && *bp != '>') { - ++bp; diff --git a/meta/recipes-core/ncurses/files/exit_prototype.patch b/meta/recipes-core/ncurses/files/exit_prototype.patch index 299852d2c0..0aa7fb22bb 100644 --- a/meta/recipes-core/ncurses/files/exit_prototype.patch +++ b/meta/recipes-core/ncurses/files/exit_prototype.patch @@ -1,4 +1,4 @@ -From af798dceafec8a9ea3f83fc250d784511ca0a29c Mon Sep 17 00:00:00 2001 +From 5ed47758886dabe74ff1709137cfc8ea1a4dc3e4 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Tue, 30 Aug 2022 15:58:32 -0700 Subject: [PATCH] Add needed headers for including mbstate_t and exit() @@ -10,18 +10,18 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 2 insertions(+) diff --git a/configure b/configure -index 005d44e2..72fa6c23 100755 +index c816cbe1..c4e1e14a 100755 --- a/configure +++ b/configure -@@ -3462,6 +3462,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" +@@ -3769,6 +3769,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF - #line 3463 "configure" + #line 3770 "configure" #include "confdefs.h" +#include <stdlib.h> $ac_declaration int main (void) -@@ -13533,6 +13534,7 @@ cat >"conftest.$ac_ext" <<_ACEOF +@@ -13903,6 +13904,7 @@ cat >"conftest.$ac_ext" <<_ACEOF #include <stdlib.h> #include <stdarg.h> #include <stdio.h> diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 8482db7f6e..ec265e63f2 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -2,7 +2,7 @@ SUMMARY = "The New Curses library" DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html"; LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=6f291ee54551d9d8d992ecd623fe4bc7;endline=27" +LIC_FILES_CHKSUM = "file://COPYING;endline=27;md5=c534844fa5a74d14ae8fa3d9b3b42138" SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS:class-native = "" @@ -201,11 +201,6 @@ do_install() { ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm fi - # When changing ${libdir} to e.g. /usr/lib/myawesomelib/ ncurses - # still installs '/usr/lib/terminfo', so try to rm both - # the proper path and a slightly hardcoded one - rm -f ${D}${libdir}/terminfo ${D}${prefix}/lib/terminfo - # create linker scripts for libcurses.so and libncurses to # link against -ltinfo when needed. Some builds might break # else when '-Wl,--no-copy-dt-needed-entries' has been set in diff --git a/meta/recipes-core/ncurses/ncurses_6.5.bb b/meta/recipes-core/ncurses/ncurses_6.6.bb similarity index 80% rename from meta/recipes-core/ncurses/ncurses_6.5.bb rename to meta/recipes-core/ncurses/ncurses_6.6.bb index eccc1c1809..7459e445f8 100644 --- a/meta/recipes-core/ncurses/ncurses_6.5.bb +++ b/meta/recipes-core/ncurses/ncurses_6.6.bb @@ -4,10 +4,10 @@ SRC_URI += "file://0001-tic-hang.patch \ file://0002-configure-reproducible.patch \ file://0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch \ file://exit_prototype.patch \ - file://CVE-2025-6141.patch \ + file://0001-do-not-create-symlink-to-terminfo-under-usr-lib.patch \ " # commit id corresponds to the revision in package version -SRCREV = "1c55d64d9d3e00399a21f04e9cac1e472ab5f70a" +SRCREV = "a1c9c082bbe6ac18d96eb2e1ee2146e1665deaf8" EXTRA_OECONF += "--with-abi-version=5" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+_\d+)$" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#232359): https://lists.openembedded.org/g/openembedded-core/message/232359 Mute This Topic: https://lists.openembedded.org/mt/118129908/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
