diff mbox series

ncurses: upgrade to 6.4+20230625

Message ID 20230727022539.2478131-1-Qi.Chen@windriver.com
State New
Headers show
Series ncurses: upgrade to 6.4+20230625 | expand

Commit Message

ChenQi July 27, 2023, 2:25 a.m. UTC 
From: Chen Qi <Qi.Chen@windriver.com>

The license checksum is updated because of the year change, the license
itself remains the same.

The exit_prototype.patch is refreshed to avoid patch fuzz error.

The repo is switched back to salsa.debian.org. It was switch from
salsa.debian.org to github mirror because, according to the commit
message, the github mirror was updated on a daily basis. But things
have changed and the github mirror hasn't been updated for months.
So switch back to use salsa.debian.org.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-core/ncurses/files/exit_prototype.patch | 10 +++++-----
 meta/recipes-core/ncurses/ncurses.inc                |  4 ++--
 meta/recipes-core/ncurses/ncurses_6.4.bb             |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

Comments

Alexander Kanavin July 27, 2023, 4:25 a.m. UTC | #1 
6.4+20230625 is a development snapshot, and not an actual stable
release. We used to take them but that was due to misunderstanding
about ncurses version policy. Is there a particular reason to move to
it?

Alex

On Thu, 27 Jul 2023 at 04:25, Chen Qi via lists.openembedded.org
<Qi.Chen=windriver.com@lists.openembedded.org> wrote:
>
> From: Chen Qi <Qi.Chen@windriver.com>
>
> The license checksum is updated because of the year change, the license
> itself remains the same.
>
> The exit_prototype.patch is refreshed to avoid patch fuzz error.
>
> The repo is switched back to salsa.debian.org. It was switch from
> salsa.debian.org to github mirror because, according to the commit
> message, the github mirror was updated on a daily basis. But things
> have changed and the github mirror hasn't been updated for months.
> So switch back to use salsa.debian.org.
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>  meta/recipes-core/ncurses/files/exit_prototype.patch | 10 +++++-----
>  meta/recipes-core/ncurses/ncurses.inc                |  4 ++--
>  meta/recipes-core/ncurses/ncurses_6.4.bb             |  3 ++-
>  3 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/meta/recipes-core/ncurses/files/exit_prototype.patch b/meta/recipes-core/ncurses/files/exit_prototype.patch
> index fd961512e0..9dddbbccf4 100644
> --- a/meta/recipes-core/ncurses/files/exit_prototype.patch
> +++ b/meta/recipes-core/ncurses/files/exit_prototype.patch
> @@ -1,4 +1,4 @@
> -From 4a769a441d7e57a23017c3037cde3e53fb9f35fe Mon Sep 17 00:00:00 2001
> +From bc917b9bae0b11b02aa0ddd9ed62d9cd78ffc4f7 Mon Sep 17 00:00:00 2001
>  From: Khem Raj <raj.khem@gmail.com>
>  Date: Tue, 30 Aug 2022 15:58:32 -0700
>  Subject: [PATCH] Add needed headers for including mbstate_t and exit()
> @@ -11,18 +11,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>   1 file changed, 2 insertions(+)
>
>  diff --git a/configure b/configure
> -index f377f551..163f8899 100755
> +index c2462f7f..33668cf0 100755
>  --- a/configure
>  +++ b/configure
> -@@ -3423,6 +3423,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
> +@@ -3458,6 +3458,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
>     cat >"conftest.$ac_ext" <<_ACEOF
> - #line 3424 "configure"
> + #line 3459 "configure"
>   #include "confdefs.h"
>  +#include <stdlib.h>
>   $ac_declaration
>   int
>   main (void)
> -@@ -13111,6 +13112,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
> +@@ -13526,6 +13527,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 367f3b19f4..78d6f2619c 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=c5a4600fdef86384c41ca33ecc70a4b8;endline=27"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=8f2e5b99d5b6c0e6ee7cb39b992733b6;endline=27"
>  SECTION = "libs"
>  DEPENDS = "ncurses-native"
>  DEPENDS:class-native = ""
> @@ -13,7 +13,7 @@ BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \
>  inherit autotools binconfig-disabled multilib_header pkgconfig
>
>  # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/
> -SRC_URI = "git://github.com/mirror/ncurses.git;protocol=https;branch=master"
> +SRC_URI = "git://salsa.debian.org/debian/ncurses.git;protocol=https;branch=master"
>
>  EXTRA_AUTORECONF = "-I m4"
>
> diff --git a/meta/recipes-core/ncurses/ncurses_6.4.bb b/meta/recipes-core/ncurses/ncurses_6.4.bb
> index 1eb15673d1..b875aee250 100644
> --- a/meta/recipes-core/ncurses/ncurses_6.4.bb
> +++ b/meta/recipes-core/ncurses/ncurses_6.4.bb
> @@ -6,7 +6,8 @@ SRC_URI += "file://0001-tic-hang.patch \
>             file://exit_prototype.patch \
>             "
>  # commit id corresponds to the revision in package version
> -SRCREV = "79b9071f2be20a24c7be031655a5638f6032f29f"
> +SRCREV = "964ec9f9c6e3ac3aaa1a9161c6fb75f6d7f589b5"
> +PV = "6.4+20230625"
>  S = "${WORKDIR}/git"
>  EXTRA_OECONF += "--with-abi-version=5"
>  UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)$"
> --
> 2.40.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#184904): https://lists.openembedded.org/g/openembedded-core/message/184904
> Mute This Topic: https://lists.openembedded.org/mt/100383999/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
ChenQi July 27, 2023, 5:54 a.m. UTC | #2 
Thanks for the info. I thought it was a stable version. The upgrade was intended for resolving CVE: https://nvd.nist.gov/vuln/detail/CVE-2023-29491.
But now it's clear that such version is a development version, I'll just send out patch to fix the CVE.

Regards,
Qi

-----Original Message-----
From: Alexander Kanavin <alex.kanavin@gmail.com> 
Sent: Thursday, July 27, 2023 12:25 PM
To: Chen, Qi <Qi.Chen@windriver.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core][PATCH] ncurses: upgrade to 6.4+20230625

6.4+20230625 is a development snapshot, and not an actual stable release. We used to take them but that was due to misunderstanding about ncurses version policy. Is there a particular reason to move to it?

Alex

On Thu, 27 Jul 2023 at 04:25, Chen Qi via lists.openembedded.org <Qi.Chen=windriver.com@lists.openembedded.org> wrote:
>
> From: Chen Qi <Qi.Chen@windriver.com>
>
> The license checksum is updated because of the year change, the 
> license itself remains the same.
>
> The exit_prototype.patch is refreshed to avoid patch fuzz error.
>
> The repo is switched back to salsa.debian.org. It was switch from 
> salsa.debian.org to github mirror because, according to the commit 
> message, the github mirror was updated on a daily basis. But things 
> have changed and the github mirror hasn't been updated for months.
> So switch back to use salsa.debian.org.
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>  meta/recipes-core/ncurses/files/exit_prototype.patch | 10 +++++-----
>  meta/recipes-core/ncurses/ncurses.inc                |  4 ++--
>  meta/recipes-core/ncurses/ncurses_6.4.bb             |  3 ++-
>  3 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/meta/recipes-core/ncurses/files/exit_prototype.patch 
> b/meta/recipes-core/ncurses/files/exit_prototype.patch
> index fd961512e0..9dddbbccf4 100644
> --- a/meta/recipes-core/ncurses/files/exit_prototype.patch
> +++ b/meta/recipes-core/ncurses/files/exit_prototype.patch
> @@ -1,4 +1,4 @@
> -From 4a769a441d7e57a23017c3037cde3e53fb9f35fe Mon Sep 17 00:00:00 
> 2001
> +From bc917b9bae0b11b02aa0ddd9ed62d9cd78ffc4f7 Mon Sep 17 00:00:00 
> +2001
>  From: Khem Raj <raj.khem@gmail.com>
>  Date: Tue, 30 Aug 2022 15:58:32 -0700
>  Subject: [PATCH] Add needed headers for including mbstate_t and 
> exit() @@ -11,18 +11,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>   1 file changed, 2 insertions(+)
>
>  diff --git a/configure b/configure
> -index f377f551..163f8899 100755
> +index c2462f7f..33668cf0 100755
>  --- a/configure
>  +++ b/configure
> -@@ -3423,6 +3423,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
> +@@ -3458,6 +3458,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
>     cat >"conftest.$ac_ext" <<_ACEOF
> - #line 3424 "configure"
> + #line 3459 "configure"
>   #include "confdefs.h"
>  +#include <stdlib.h>
>   $ac_declaration
>   int
>   main (void)
> -@@ -13111,6 +13112,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
> +@@ -13526,6 +13527,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 367f3b19f4..78d6f2619c 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=c5a4600fdef86384c41ca33ecc70a4b8;endline=27"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=8f2e5b99d5b6c0e6ee7cb39b992733b6;endline=27"
>  SECTION = "libs"
>  DEPENDS = "ncurses-native"
>  DEPENDS:class-native = ""
> @@ -13,7 +13,7 @@ BINCONFIG = "${bindir}/ncurses5-config 
> ${bindir}/ncursesw5-config \  inherit autotools binconfig-disabled 
> multilib_header pkgconfig
>
>  # Upstream has useful patches at times at 
> ftp://invisible-island.net/ncurses/
> -SRC_URI = "git://github.com/mirror/ncurses.git;protocol=https;branch=master"
> +SRC_URI = "git://salsa.debian.org/debian/ncurses.git;protocol=https;branch=master"
>
>  EXTRA_AUTORECONF = "-I m4"
>
> diff --git a/meta/recipes-core/ncurses/ncurses_6.4.bb 
> b/meta/recipes-core/ncurses/ncurses_6.4.bb
> index 1eb15673d1..b875aee250 100644
> --- a/meta/recipes-core/ncurses/ncurses_6.4.bb
> +++ b/meta/recipes-core/ncurses/ncurses_6.4.bb
> @@ -6,7 +6,8 @@ SRC_URI += "file://0001-tic-hang.patch \
>             file://exit_prototype.patch \
>             "
>  # commit id corresponds to the revision in package version -SRCREV = 
> "79b9071f2be20a24c7be031655a5638f6032f29f"
> +SRCREV = "964ec9f9c6e3ac3aaa1a9161c6fb75f6d7f589b5"
> +PV = "6.4+20230625"
>  S = "${WORKDIR}/git"
>  EXTRA_OECONF += "--with-abi-version=5"
>  UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)$"
> --
> 2.40.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#184904): 
> https://lists.openembedded.org/g/openembedded-core/message/184904
> Mute This Topic: https://lists.openembedded.org/mt/100383999/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
> [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-core/ncurses/files/exit_prototype.patch b/meta/recipes-core/ncurses/files/exit_prototype.patch
index fd961512e0..9dddbbccf4 100644
--- a/meta/recipes-core/ncurses/files/exit_prototype.patch
+++ b/meta/recipes-core/ncurses/files/exit_prototype.patch
@@ -1,4 +1,4 @@ 
-From 4a769a441d7e57a23017c3037cde3e53fb9f35fe Mon Sep 17 00:00:00 2001
+From bc917b9bae0b11b02aa0ddd9ed62d9cd78ffc4f7 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 30 Aug 2022 15:58:32 -0700
 Subject: [PATCH] Add needed headers for including mbstate_t and exit()
@@ -11,18 +11,18 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/configure b/configure
-index f377f551..163f8899 100755
+index c2462f7f..33668cf0 100755
 --- a/configure
 +++ b/configure
-@@ -3423,6 +3423,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
+@@ -3458,6 +3458,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
    cat >"conftest.$ac_ext" <<_ACEOF
- #line 3424 "configure"
+ #line 3459 "configure"
  #include "confdefs.h"
 +#include <stdlib.h>
  $ac_declaration
  int
  main (void)
-@@ -13111,6 +13112,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
+@@ -13526,6 +13527,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 367f3b19f4..78d6f2619c 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=c5a4600fdef86384c41ca33ecc70a4b8;endline=27"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8f2e5b99d5b6c0e6ee7cb39b992733b6;endline=27"
 SECTION = "libs"
 DEPENDS = "ncurses-native"
 DEPENDS:class-native = ""
@@ -13,7 +13,7 @@  BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \
 inherit autotools binconfig-disabled multilib_header pkgconfig
 
 # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/
-SRC_URI = "git://github.com/mirror/ncurses.git;protocol=https;branch=master"
+SRC_URI = "git://salsa.debian.org/debian/ncurses.git;protocol=https;branch=master"
 
 EXTRA_AUTORECONF = "-I m4"
 
diff --git a/meta/recipes-core/ncurses/ncurses_6.4.bb b/meta/recipes-core/ncurses/ncurses_6.4.bb
index 1eb15673d1..b875aee250 100644
--- a/meta/recipes-core/ncurses/ncurses_6.4.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.4.bb
@@ -6,7 +6,8 @@  SRC_URI += "file://0001-tic-hang.patch \
            file://exit_prototype.patch \
            "
 # commit id corresponds to the revision in package version
-SRCREV = "79b9071f2be20a24c7be031655a5638f6032f29f"
+SRCREV = "964ec9f9c6e3ac3aaa1a9161c6fb75f6d7f589b5"
+PV = "6.4+20230625"
 S = "${WORKDIR}/git"
 EXTRA_OECONF += "--with-abi-version=5"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)$"