Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

devel/ncurses: update to 6.1nb3 #34

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion devel/ncurses/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.99 2018/09/15 22:47:41 wiz Exp $

.include "Makefile.common"
PKGREVISION= 2
PKGREVISION= 3
COMMENT= CRT screen handling and optimization package

INSTALLATION_DIRS+= share/examples
Expand Down
1 change: 1 addition & 0 deletions devel/ncurses/distinfo
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ SHA1 (patch-c++_Makefile.in) = 68ff81c719ec4aa13beb962cb66d7cd6749d7af5
SHA1 (patch-configure.in) = 48a705b3f4de3a65c0c1c3648f5a24c5310ed3fa
SHA1 (patch-misc_ncurses-config.in) = 43e4dc8abe85804513da1189aeffa5c7746ffcca
SHA1 (patch-ncurses_base_MKlib__gen.sh) = f8ce67fbd273529e4161a2820677d05a623fd527
SHA1 (patch-ncurses_tinfo_parse__entry.c) = 06d2b52e84595f8acd47ad36ded7b7d5bec95b8a
23 changes: 23 additions & 0 deletions devel/ncurses/patches/patch-ncurses_tinfo_parse__entry.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
$NetBSD$

- Fixes CVE-2018-10754

--- ncurses/tinfo/parse_entry.c.orig 2018-10-09 21:41:29.020445746 +0000
+++ ncurses/tinfo/parse_entry.c
@@ -543,11 +543,12 @@ _nc_parse_entry(ENTRY * entryp, int lite
* Otherwise, look for a base entry that will already
* have picked up defaults via translation.
*/
- for (i = 0; i < entryp->nuses; i++)
- if (!strchr((char *) entryp->uses[i].name, '+'))
- has_base_entry = TRUE;
+ for (i = 0; i < entryp->nuses; i++) {
+ if (entryp->uses[i].name != 0
+ && !strchr(entryp->uses[i].name, '+'))
+ has_base_entry = TRUE;
+ }
}
-
postprocess_termcap(&entryp->tterm, has_base_entry);
} else
postprocess_terminfo(&entryp->tterm);
1 change: 1 addition & 0 deletions devel/ncursesw/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

PKGNAME= ${DISTNAME:S/ncurses/ncursesw/}
COMMENT= Wide character CRT screen handling and optimization package
PKGREVISION= 1

PATCHDIR= ${.CURDIR}/../../devel/ncurses/patches
DISTINFO_FILE= ${.CURDIR}/../../devel/ncurses/distinfo
Expand Down