Thanks, applied as abcb87941bad21706d1c6f4a1c6b92a01514c460. Michael
[sent from post-receive hook] On Fri, 06 Jan 2023 17:01:24 +0100, Christian Melki <[email protected]> wrote: > Mostly a bugfix release. > https://lists.gnu.org/archive/html/info-gnu/2022-12/msg00010.html > Fixes CVE-2022-29458. > > A side note. The .make could use a cleanup of the options. > Maybe try to revisit this at a later date. > > * License file copyright timestamp changed. > * Make colors dependent on wide chars (configure warning). > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/ncurses-6.3/0001-teach-ncurses-config-about-sysroot.patch > b/patches/ncurses-6.4/0001-teach-ncurses-config-about-sysroot.patch > similarity index 65% > rename from patches/ncurses-6.3/0001-teach-ncurses-config-about-sysroot.patch > rename to patches/ncurses-6.4/0001-teach-ncurses-config-about-sysroot.patch > index 707b5a49c065..4a8ee40a994d 100644 > --- a/patches/ncurses-6.3/0001-teach-ncurses-config-about-sysroot.patch > +++ b/patches/ncurses-6.4/0001-teach-ncurses-config-about-sysroot.patch > @@ -7,13 +7,17 @@ This patch teaches ncurses-config about sysroot > Signed-off-by: Marc Kleine-Budde <[email protected]> > [ported from ncurses 6.1 to 6.2] > Signed-off-by: Robert Schwebel <[email protected]> > +[ported from ncurses 6.3 to 6.4] > +Signed-off-by: Christian Melki <[email protected]> > --- > - misc/ncurses-config.in | 12 ++++++------ > - 1 files changed, 6 insertions(+), 6 deletions(-) > + misc/ncurses-config.in | 6 +++--- > + 1 file changed, 3 insertions(+), 3 deletions(-) > > ---- ncurses-6.2/misc/ncurses-config.in 2020-02-03 00:34:34.000000000 > +0100 > -+++ ncurses-6.2-ptx/misc/ncurses-config.in 2020-07-25 23:28:48.123350040 > +0200 > -@@ -149,10 +149,10 @@ > +diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in > +index c9f1cf809843..af37d68c022c 100644 > +--- a/misc/ncurses-config.in > ++++ b/misc/ncurses-config.in > +@@ -188,10 +188,10 @@ while [ $# -gt 0 ]; do > --cflags) > INCS="@PKG_CFLAGS@" > if [ "x@WITH_OVERWRITE@" = xno ]; then > @@ -26,8 +30,8 @@ Signed-off-by: Robert Schwebel <[email protected]> > fi > sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO > $INCS > -@@ -235,7 +235,7 @@ > - echo $INCS > +@@ -274,7 +274,7 @@ ENDECHO > + echo "$INCS" > ;; > --libdir) > - echo "${libdir}" > diff --git a/patches/ncurses-6.3/series b/patches/ncurses-6.4/series > similarity index 100% > rename from patches/ncurses-6.3/series > rename to patches/ncurses-6.4/series > diff --git a/rules/ncurses.make b/rules/ncurses.make > index 6881603256ee..8d29ff9368af 100644 > --- a/rules/ncurses.make > +++ b/rules/ncurses.make > @@ -13,16 +13,16 @@ PACKAGES-$(PTXCONF_NCURSES) += ncurses > # > # Paths and names > # > -NCURSES_VERSION := 6.3 > +NCURSES_VERSION := 6.4 > NCURSES_MAJOR := $(word 1,$(subst ., ,$(NCURSES_VERSION))) > -NCURSES_MD5 := a2736befde5fee7d2b7eb45eb281cdbe > +NCURSES_MD5 := 5a62487b5d4ac6b132fe2bf9f8fad29b > NCURSES := ncurses-$(NCURSES_VERSION) > NCURSES_SUFFIX := tar.gz > NCURSES_URL := $(call ptx/mirror, GNU, ncurses/$(NCURSES).$(NCURSES_SUFFIX)) > NCURSES_SOURCE := $(SRCDIR)/$(NCURSES).$(NCURSES_SUFFIX) > NCURSES_DIR := $(BUILDDIR)/$(NCURSES) > NCURSES_LICENSE := MIT > -NCURSES_LICENSE_FILES := file://COPYING;md5=f852913c5d988a5f5a2f1df7ba7ee893 > +NCURSES_LICENSE_FILES := file://COPYING;md5=afd8d0a6ec9c24941eb06bc5e4017918 > > # > ---------------------------------------------------------------------------- > # Prepare > @@ -70,12 +70,12 @@ NCURSES_AUTOCONF_SHARED = \ > --$(call ptx/endis,PTXCONF_NCURSES_BIG_CORE)-big-core \ > --disable-big-strings \ > --$(call ptx/endis,PTXCONF_NCURSES_WIDE_CHAR)-widec \ > + --$(call ptx/endis,PTXCONF_NCURSES_WIDE_CHAR)-ext-colors \ > $(GLOBAL_LARGE_FILE_OPTION) \ > --enable-ext-funcs \ > --enable-sp-funcs \ > --disable-term-driver \ > --enable-const \ > - --enable-ext-colors \ > --disable-ext-mouse \ > --disable-ext-putwin \ > --disable-no-padding \
