update to 6.0-20170722 (CVE-2017-10684 CVE-2017-10685 CVE-2017-11112 CVE-2017-11113)

This commit is contained in:
Miroslav Lichvar 2017-07-26 15:51:26 +02:00
parent 5d7d8458eb
commit e48ecd67e9
4 changed files with 3 additions and 33 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/ncurses-6.0-20170520.tgz
/ncurses-6.0-20170722.tgz

View File

@ -1,28 +0,0 @@
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index abe2139..8cc8e8d 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -1137,11 +1137,6 @@ struct screen {
int _pair_count; /* same as COLOR_PAIRS */
int _pair_limit; /* actual limit of color-pairs */
#if NCURSES_EXT_FUNCS
-#if USE_NEW_PAIR
- void *_ordered_pairs; /* index used by alloc_pair() */
- int _pairs_used; /* actual number of color-pairs used */
- int _recent_pair; /* number for most recent free-pair */
-#endif
bool _assumed_color; /* use assumed colors */
bool _default_color; /* use default colors */
bool _has_sgr_39_49; /* has ECMA default color support */
@@ -1295,6 +1290,11 @@ struct screen {
/*
* ncurses/ncursesw are the same up to this point.
*/
+#if NCURSES_EXT_FUNCS && USE_NEW_PAIR
+ void *_ordered_pairs; /* index used by alloc_pair() */
+ int _pairs_used; /* actual number of color-pairs used */
+ int _recent_pair; /* number for most recent free-pair */
+#endif
#if USE_WIDEC_SUPPORT
/* recent versions of 'screen' have partially-working support for
* UTF-8, but do not permit ACS at the same time (see tty_update.c).

View File

@ -1,4 +1,4 @@
%global revision 20170520
%global revision 20170722
Summary: Ncurses support utilities
Name: ncurses
Version: 6.0
@ -12,7 +12,6 @@ Patch8: ncurses-config.patch
Patch9: ncurses-libs.patch
Patch11: ncurses-urxvt.patch
Patch12: ncurses-kbs.patch
Patch13: ncurses-screenpair.patch
BuildRequires: gpm-devel pkgconfig
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@ -126,7 +125,6 @@ The ncurses-static package includes static libraries of the ncurses library.
%patch9 -p1 -b .libs
%patch11 -p1 -b .urxvt
%patch12 -p1 -b .kbs
%patch13 -p1 -b .screenpair
for f in ANNOUNCE; do
iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&

View File

@ -1 +1 @@
SHA512 (ncurses-6.0-20170520.tgz) = 025b39ea8e68dc36ef5641ba1e665354deea07f3457141564605569e3ca64f22cca4c015e4f97303cada9c6978d98e18d1d8f1566c582bfacf31b52b734ae4c5
SHA512 (ncurses-6.0-20170722.tgz) = 85726c76e99285c2024dd007156d29eb856016fd303398164000b8a0076d9c6e6f72ecc5567f85cbab3473e4fad21d74df02c844e29c8b00148bfd2ef19c0450