From d71d4b7625d9ae2a165e3088a11b46fe1c1fcd13 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 29 Jun 2022 15:52:32 +0100 Subject: ncurses: 6.3 -> 6.3+20220423 Includes a fix for CVE-2022-29458 (From OE-Core rev: 6032a1049d4693f17ab7f4b67f9b22719decadde) Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 2 +- meta/recipes-core/ncurses/ncurses_6.3+20220423.bb | 14 ++++++++++++++ meta/recipes-core/ncurses/ncurses_6.3.bb | 14 -------------- 3 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 meta/recipes-core/ncurses/ncurses_6.3+20220423.bb delete mode 100644 meta/recipes-core/ncurses/ncurses_6.3.bb (limited to 'meta/recipes-core/ncurses') diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 7a7c7dd227..1abcfae1fe 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=9529289636145d1bf093c96af067695a;endline=27" +LIC_FILES_CHKSUM = "file://COPYING;md5=c5a4600fdef86384c41ca33ecc70a4b8;endline=27" SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS:class-native = "" diff --git a/meta/recipes-core/ncurses/ncurses_6.3+20220423.bb b/meta/recipes-core/ncurses/ncurses_6.3+20220423.bb new file mode 100644 index 0000000000..6cd143774c --- /dev/null +++ b/meta/recipes-core/ncurses/ncurses_6.3+20220423.bb @@ -0,0 +1,14 @@ +require ncurses.inc + +SRC_URI += "file://0001-tic-hang.patch \ + file://0002-configure-reproducible.patch \ + file://0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch \ + " +# commit id corresponds to the revision in package version +SRCREV = "23b32732ccd779bae8731f2d4a611bfcae45974e" +S = "${WORKDIR}/git" +EXTRA_OECONF += "--with-abi-version=5" +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)$" + +# This is needed when using patchlevel versions like 6.1+20181013 +CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}" diff --git a/meta/recipes-core/ncurses/ncurses_6.3.bb b/meta/recipes-core/ncurses/ncurses_6.3.bb deleted file mode 100644 index f0256dad22..0000000000 --- a/meta/recipes-core/ncurses/ncurses_6.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -require ncurses.inc - -SRC_URI += "file://0001-tic-hang.patch \ - file://0002-configure-reproducible.patch \ - file://0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch \ - " -# commit id corresponds to the revision in package version -SRCREV = "51d0fd9cc3edb975f04224f29f777f8f448e8ced" -S = "${WORKDIR}/git" -EXTRA_OECONF += "--with-abi-version=5" -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)$" - -# This is needed when using patchlevel versions like 6.1+20181013 -#CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}" -- cgit v1.2.3-54-g00ecf