From fe7200af308666b3c89d5c78d0b0169d86e029acb01ff5a49edbf53b3a7f127f Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Sun, 22 Jan 2017 10:50:50 +0000
Subject: [PATCH] Add ncurses 6.0 patch 20170121

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=282
---
 ncurses-5.9-ibm327x.dif     |  4 +--
 ncurses-6.0-patches.tar.bz2 |  4 +--
 ncurses-6.0.dif             | 72 ++++++++++++++++++-------------------
 ncurses.changes             | 14 ++++++++
 4 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif
index 5da6071..bea3552 100644
--- a/ncurses-5.9-ibm327x.dif
+++ b/ncurses-5.9-ibm327x.dif
@@ -3,8 +3,8 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 --- misc/terminfo.src
-+++ misc/terminfo.src	2016-10-17 08:39:16.245980044 +0000
-@@ -15792,8 +15792,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
++++ misc/terminfo.src	2017-01-22 10:48:44.821669929 +0000
+@@ -15843,8 +15843,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv
  #
  
  ibm327x|line mode IBM 3270 style,
diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2
index 4246003..48b0e30 100644
--- a/ncurses-6.0-patches.tar.bz2
+++ b/ncurses-6.0-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba2638b695c143a4ab95f9298674578986b27cc1b23bb9584fbd528fa71424b5
-size 1545750
+oid sha256:7e0647621ab001d704404df85834012f919f25977f2b2ea63a1a1b915451f046
+size 1630329
diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif
index 6d35d01..1448c4d 100644
--- a/ncurses-6.0.dif
+++ b/ncurses-6.0.dif
@@ -21,7 +21,7 @@
  19 files changed, 240 insertions(+), 80 deletions(-)
 
 --- aclocal.m4
-+++ aclocal.m4	2017-01-16 09:02:08.491183280 +0000
++++ aclocal.m4	2017-01-22 10:46:07.552240627 +0000
 @@ -564,7 +564,7 @@ AC_MSG_CHECKING([for size of bool])
  AC_CACHE_VAL(cf_cv_type_of_bool,[
  	rm -f cf_test.out
@@ -31,7 +31,7 @@
  #include <stdio.h>
  
  #if defined(__cplusplus)
-@@ -4719,12 +4719,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4733,12 +4733,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo '? missing rename for '\$cf_source
  		cf_target="\$cf_source"
  	fi
@@ -49,7 +49,7 @@
  	sed	-f $cf_man_alias \\
  CF_EOF
  
-@@ -4734,7 +4737,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4748,7 +4751,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -58,7 +58,7 @@
  CF_EOF
  fi
  
-@@ -4774,7 +4777,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4788,7 +4791,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -67,7 +67,7 @@
  CF_EOF
  fi
  
-@@ -4783,23 +4786,23 @@ case "$MANPAGE_FORMAT" in
+@@ -4797,23 +4800,23 @@ case "$MANPAGE_FORMAT" in
  cat >>$cf_edit_man <<CF_EOF
  	if test \$form = format ; then
  		# BSDI installs only .0 suffixes in the cat directories
@@ -97,7 +97,7 @@
  				for cf_alias in \$aliases
  				do
  					if test \$section = 1 ; then
-@@ -4808,7 +4811,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4822,7 +4825,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f \$cf_alias\${suffix} ; then
@@ -106,7 +106,7 @@
  							then
  								continue
  							fi
-@@ -4818,18 +4821,18 @@ CF_EOF
+@@ -4832,18 +4835,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -128,7 +128,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -4849,9 +4852,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4863,9 +4866,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test \$verb = removing ; then
@@ -141,7 +141,7 @@
  		)
  		test -d \$cf_subdir\${section} &&
  		test -n "\$aliases" && (
-@@ -4871,6 +4874,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4885,6 +4888,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -150,7 +150,7 @@
  esac
  done
 --- configure
-+++ configure	2017-01-16 09:02:08.495183204 +0000
++++ configure	2017-01-22 10:46:07.552240627 +0000
 @@ -5896,7 +5896,7 @@ case $cf_cv_system_name in
  	fi
  	;;
@@ -160,7 +160,7 @@
  	;;
  (openbsd[2-9].*|mirbsd*)
  	LD_RPATH_OPT="-Wl,-rpath,"
-@@ -11642,12 +11642,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11749,12 +11749,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo '? missing rename for '\$cf_source
  		cf_target="\$cf_source"
  	fi
@@ -178,7 +178,7 @@
  	sed	-f $cf_man_alias \\
  CF_EOF
  
-@@ -11657,7 +11660,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11764,7 +11767,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -187,7 +187,7 @@
  CF_EOF
  fi
  
-@@ -11697,7 +11700,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11804,7 +11807,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -196,7 +196,7 @@
  CF_EOF
  fi
  
-@@ -11706,23 +11709,23 @@ case "$MANPAGE_FORMAT" in
+@@ -11813,23 +11816,23 @@ case "$MANPAGE_FORMAT" in
  cat >>$cf_edit_man <<CF_EOF
  	if test \$form = format ; then
  		# BSDI installs only .0 suffixes in the cat directories
@@ -226,7 +226,7 @@
  				for cf_alias in \$aliases
  				do
  					if test \$section = 1 ; then
-@@ -11731,7 +11734,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11838,7 +11841,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f \$cf_alias\${suffix} ; then
@@ -235,7 +235,7 @@
  							then
  								continue
  							fi
-@@ -11741,18 +11744,18 @@ CF_EOF
+@@ -11848,18 +11851,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -257,7 +257,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -11772,9 +11775,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11879,9 +11882,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test \$verb = removing ; then
@@ -270,7 +270,7 @@
  		)
  		test -d \$cf_subdir\${section} &&
  		test -n "\$aliases" && (
-@@ -11794,6 +11797,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11901,6 +11904,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -278,7 +278,7 @@
  	;;
  esac
  done
-@@ -22253,6 +22257,7 @@ if test "$with_termlib" != no ; then
+@@ -22415,6 +22419,7 @@ if test "$with_termlib" != no ; then
  		TINFO_LDFLAGS="-L${LIB_DIR}"
  		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
  	fi
@@ -287,7 +287,7 @@
  	# the next lines are needed for linking libtic over libncurses
  	TINFO_NAME=${LIB_NAME}
 --- include/curses.h.in
-+++ include/curses.h.in	2017-01-16 09:02:08.495183204 +0000
++++ include/curses.h.in	2017-01-22 10:46:07.552240627 +0000
 @@ -174,6 +174,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
  typedef @cf_cv_typeof_mmask_t@ mmask_t;
  #endif
@@ -299,7 +299,7 @@
   * We need FILE, etc.  Include this before checking any feature symbols.
   */
 --- include/termcap.h.in
-+++ include/termcap.h.in	2017-01-16 09:02:08.495183204 +0000
++++ include/termcap.h.in	2017-01-22 10:46:07.552240627 +0000
 @@ -46,6 +46,8 @@ extern "C"
  {
  #endif /* __cplusplus */
@@ -310,7 +310,7 @@
  
  #undef  NCURSES_CONST 
 --- include/tic.h
-+++ include/tic.h	2017-01-16 09:02:08.495183204 +0000
++++ include/tic.h	2017-01-22 10:46:07.556240562 +0000
 @@ -231,12 +231,12 @@ extern NCURSES_EXPORT(const struct alias
   */
  
@@ -327,7 +327,7 @@
  #define CANCELLED_STRING	(char *)(-1)
  
 --- man/man_db.renames
-+++ man/man_db.renames	2017-01-16 09:02:08.495183204 +0000
++++ man/man_db.renames	2017-01-22 10:46:07.556240562 +0000
 @@ -167,6 +167,8 @@ tput.1				tput.1
  tset.1				tset.1
  vprintf.3s			vprintf.3
@@ -338,7 +338,7 @@
  # Other:
  tack.1m				tack.1
 --- man/ncurses.3x
-+++ man/ncurses.3x	2017-01-16 09:02:08.495183204 +0000
++++ man/ncurses.3x	2017-01-22 10:46:07.556240562 +0000
 @@ -121,6 +121,10 @@ after the shell environment variable \fB
  [See \fBterminfo\fR(\*n) for further details.]
  .SS Datatypes
@@ -351,7 +351,7 @@
  called \fIwindows\fR, which can be thought of as two-dimensional
  arrays of characters representing all or part of a CRT screen.
 --- misc/gen-pkgconfig.in
-+++ misc/gen-pkgconfig.in	2017-01-16 09:02:08.495183204 +0000
++++ misc/gen-pkgconfig.in	2017-01-22 10:46:07.556240562 +0000
 @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
  fi
  
@@ -391,7 +391,7 @@
  
  	echo "** creating ${name}${suffix}.pc"
 --- misc/ncurses-config.in
-+++ misc/ncurses-config.in	2017-01-16 09:02:08.495183204 +0000
++++ misc/ncurses-config.in	2017-01-22 10:46:07.556240562 +0000
 @@ -100,7 +100,7 @@ while test $# -gt 0; do
  	# compile/link
  	--cflags)
@@ -402,7 +402,7 @@
  		fi
  		if test "${includedir}" != /usr/include ; then
 --- misc/terminfo.src
-+++ misc/terminfo.src	2017-01-16 09:02:08.575181662 +0000
++++ misc/terminfo.src	2017-01-22 10:46:07.604239778 +0000
 @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
  	am,
  	cols#80,
@@ -782,7 +782,7 @@
  	s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
  ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
 --- ncurses/Makefile.in
-+++ ncurses/Makefile.in	2017-01-16 09:02:08.503183049 +0000
++++ ncurses/Makefile.in	2017-01-22 10:46:07.560240497 +0000
 @@ -218,7 +218,7 @@ $(DESTDIR)$(libdir) :
  ../lib : ; mkdir $@
  
@@ -793,7 +793,7 @@
  ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
  	$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
 --- ncurses/curses.priv.h
-+++ ncurses/curses.priv.h	2017-01-16 09:02:08.503183049 +0000
++++ ncurses/curses.priv.h	2017-01-22 10:46:07.560240497 +0000
 @@ -2030,6 +2030,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
  extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
  extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
@@ -804,7 +804,7 @@
  extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
  extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
 --- ncurses/run_cmd.sh
-+++ ncurses/run_cmd.sh	2017-01-16 09:02:08.503183049 +0000
++++ ncurses/run_cmd.sh	2017-01-22 10:46:07.560240497 +0000
 @@ -0,0 +1,11 @@
 +#!/bin/sh
 +
@@ -818,7 +818,7 @@
 +
 +exec ${1+"$@"}
 --- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh	2017-01-16 09:02:08.503183049 +0000
++++ ncurses/tinfo/MKfallback.sh	2017-01-22 10:46:07.560240497 +0000
 @@ -68,6 +68,12 @@ else
  	tmp_info=
  fi
@@ -851,7 +851,7 @@
  	done
  
 --- ncurses/tinfo/access.c
-+++ ncurses/tinfo/access.c	2017-01-16 09:02:08.503183049 +0000
++++ ncurses/tinfo/access.c	2017-01-22 10:46:07.560240497 +0000
 @@ -35,6 +35,9 @@
  #include <ctype.h>
  
@@ -894,7 +894,7 @@
  _nc_access(const char *path, int mode)
  {
 --- ncurses/tinfo/lib_setup.c
-+++ ncurses/tinfo/lib_setup.c	2017-01-16 09:02:08.503183049 +0000
++++ ncurses/tinfo/lib_setup.c	2017-01-22 10:46:07.560240497 +0000
 @@ -593,6 +593,9 @@ _nc_locale_breaks_acs(TERMINAL * termp)
      } else if ((value = tigetnum("U8")) >= 0) {
  	result = value;		/* use extension feature */
@@ -906,7 +906,7 @@
  	    result = 1;		/* always broken */
  	} else if (strstr(env, "screen") != 0
 --- ncurses/tinfo/read_entry.c
-+++ ncurses/tinfo/read_entry.c	2017-01-16 09:02:08.503183049 +0000
++++ ncurses/tinfo/read_entry.c	2017-01-22 10:46:07.560240497 +0000
 @@ -433,6 +433,7 @@ _nc_read_file_entry(const char *const fi
      FILE *fp = 0;
      int code;
@@ -924,7 +924,7 @@
      return (code);
  }
 --- ncurses/tinfo/read_termcap.c
-+++ ncurses/tinfo/read_termcap.c	2017-01-16 09:02:08.503183049 +0000
++++ ncurses/tinfo/read_termcap.c	2017-01-22 10:46:07.560240497 +0000
 @@ -322,14 +322,18 @@ _nc_getent(
  	     */
  	    if (fd >= 0) {
@@ -971,7 +971,7 @@
      }
      if (copied != 0)
 --- test/test.priv.h
-+++ test/test.priv.h	2017-01-16 09:02:08.503183049 +0000
++++ test/test.priv.h	2017-01-22 10:46:07.560240497 +0000
 @@ -790,12 +790,12 @@ extern char *strnames[], *strcodes[], *s
  #endif
  
diff --git a/ncurses.changes b/ncurses.changes
index 26d0266..c1fb892 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sun Jan 22 10:45:18 UTC 2017 - werner@suse.de
+
+- Add ncurses patch 20170121
+  + incorporate A_COLOR mask into COLOR_PAIR(), in case user application
+    provides an out-of-range pair number (report by Elijah Stone).
+  + clarify description in tput manual page regarding support for
+    termcap names (prompted by FreeBSD #214709).
+  + remove a restriction in tput's support for termcap names which
+    omitted capabilities normally not shown in termcap translations
+    (cf: 990123).
+  + modify configure script for clang as used on FreeBSD, to work around
+    clang's differences in exit codes vs gcc.
+
 -------------------------------------------------------------------
 Thu Jan 19 12:20:06 UTC 2017 - werner@suse.de