From 11e8e2b4ea8a40997ca05587807754a85e8c09f9f4bca94dc17f71e25445698f Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 11 Dec 2017 08:37:15 +0000
Subject: [PATCH] Add ncurses patch 20171209

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=341
---
 ncurses-6.0-patches.tar.bz2 |  4 +--
 ncurses-6.0.dif             | 62 ++++++++++++++++++-------------------
 ncurses.changes             | 36 +++++++++++++++++++++
 3 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/ncurses-6.0-patches.tar.bz2 b/ncurses-6.0-patches.tar.bz2
index ad9323f..d61360c 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:3dd555773b70504e4f5c97a94ecc690d2f278cd6dd96cc7a1c0b1c0b76b2dfcb
-size 3044400
+oid sha256:af7d3d8216916637bfec9e91da565e46d96bd9cd1d35134a18689a48aa49639c
+size 3160184
diff --git a/ncurses-6.0.dif b/ncurses-6.0.dif
index 34a62b5..23ed6a2 100644
--- a/ncurses-6.0.dif
+++ b/ncurses-6.0.dif
@@ -22,7 +22,7 @@
  20 files changed, 248 insertions(+), 81 deletions(-)
 
 --- aclocal.m4
-+++ aclocal.m4	2017-11-20 08:13:37.950059704 +0000
++++ aclocal.m4	2017-12-11 08:28:16.857190200 +0000
 @@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
  AC_CACHE_VAL(cf_cv_type_of_bool,[
  	rm -f cf_test.out
@@ -151,8 +151,8 @@
  esac
  done
 --- configure
-+++ configure	2017-11-20 08:13:37.954059629 +0000
-@@ -5950,7 +5950,7 @@ case $cf_cv_system_name in
++++ configure	2017-12-11 08:28:16.861190125 +0000
+@@ -5951,7 +5951,7 @@ case $cf_cv_system_name in
  	fi
  	;;
  (linux*|gnu*|k*bsd*-gnu|freebsd*)
@@ -161,7 +161,7 @@
  	;;
  (openbsd[2-9].*|mirbsd*)
  	LD_RPATH_OPT="-Wl,-rpath,"
-@@ -11916,12 +11916,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -12002,12 +12002,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo '? missing rename for '\$cf_source
  		cf_target="\$cf_source"
  	fi
@@ -179,7 +179,7 @@
  	sed	-f $cf_man_alias \\
  CF_EOF
  
-@@ -11931,7 +11934,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -12017,7 +12020,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -188,7 +188,7 @@
  CF_EOF
  fi
  
-@@ -11971,7 +11974,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -12057,7 +12060,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -197,7 +197,7 @@
  CF_EOF
  fi
  
-@@ -11980,23 +11983,23 @@ case "$MANPAGE_FORMAT" in
+@@ -12066,23 +12069,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
@@ -227,7 +227,7 @@
  				for cf_alias in \$aliases
  				do
  					if test \$section = 1 ; then
-@@ -12005,7 +12008,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -12091,7 +12094,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f \$cf_alias\${suffix} ; then
@@ -236,7 +236,7 @@
  							then
  								continue
  							fi
-@@ -12015,18 +12018,18 @@ CF_EOF
+@@ -12101,18 +12104,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -258,7 +258,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -12046,9 +12049,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -12132,9 +12135,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test \$verb = removing ; then
@@ -271,7 +271,7 @@
  		)
  		test -d \$cf_subdir\${section} &&
  		test -n "\$aliases" && (
-@@ -12068,6 +12071,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -12154,6 +12157,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -279,7 +279,7 @@
  	;;
  esac
  done
-@@ -22773,6 +22777,7 @@ if test "$with_termlib" != no ; then
+@@ -22859,6 +22863,7 @@ if test "$with_termlib" != no ; then
  		TINFO_LDFLAGS="-L${LIB_DIR}"
  		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
  	fi
@@ -288,7 +288,7 @@
  	# the next lines are needed for linking libtic over libncurses
  	TINFO_NAME=${LIB_NAME}
 --- include/curses.h.in
-+++ include/curses.h.in	2017-11-20 08:13:37.954059629 +0000
++++ include/curses.h.in	2017-12-11 08:28:16.861190125 +0000
 @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
  typedef @cf_cv_typeof_mmask_t@ mmask_t;
  #endif
@@ -300,7 +300,7 @@
   * We need FILE, etc.  Include this before checking any feature symbols.
   */
 --- include/termcap.h.in
-+++ include/termcap.h.in	2017-11-20 08:13:37.954059629 +0000
++++ include/termcap.h.in	2017-12-11 08:28:16.861190125 +0000
 @@ -46,6 +46,8 @@ extern "C"
  {
  #endif /* __cplusplus */
@@ -311,7 +311,7 @@
  
  #undef  NCURSES_CONST 
 --- include/tic.h
-+++ include/tic.h	2017-11-20 08:13:37.954059629 +0000
++++ include/tic.h	2017-12-11 08:28:16.861190125 +0000
 @@ -207,12 +207,12 @@ struct alias
   */
  
@@ -328,7 +328,7 @@
  #define CANCELLED_STRING	(char *)(-1)
  
 --- man/man_db.renames
-+++ man/man_db.renames	2017-11-20 08:13:37.954059629 +0000
++++ man/man_db.renames	2017-12-11 08:28:16.861190125 +0000
 @@ -163,6 +163,7 @@ term.7				term.7
  term_variables.3x		terminfo_variables.3ncurses
  terminfo.5			terminfo.5
@@ -337,7 +337,7 @@
  tic.1m				tic.1
  toe.1m				toe.1
  tput.1				tput.1
-@@ -170,6 +171,7 @@ tset.1				tset.1
+@@ -171,6 +172,7 @@ user_caps.5			user_caps.5
  wresize.3x			wresize.3ncurses
  #
  # Other:
@@ -346,7 +346,7 @@
  #
  getty.1				getty.8
 --- man/ncurses.3x
-+++ man/ncurses.3x	2017-11-20 08:13:37.954059629 +0000
++++ man/ncurses.3x	2017-12-11 08:28:16.861190125 +0000
 @@ -138,6 +138,10 @@ after the shell environment variable \fB
  [See \fBterminfo\fR(\*n) for further details.]
  .SS Datatypes
@@ -359,7 +359,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-11-20 08:13:37.954059629 +0000
++++ misc/gen-pkgconfig.in	2017-12-11 08:28:16.861190125 +0000
 @@ -76,7 +76,7 @@ if test "$includedir" != "/usr/include"
  fi
  
@@ -399,7 +399,7 @@
  
  	echo "** creating ${name}${suffix}.pc"
 --- misc/ncurses-config.in
-+++ misc/ncurses-config.in	2017-11-20 08:13:37.954059629 +0000
++++ misc/ncurses-config.in	2017-12-11 08:28:16.861190125 +0000
 @@ -100,7 +100,7 @@ while test $# -gt 0; do
  	# compile/link
  	--cflags)
@@ -410,7 +410,7 @@
  		fi
  		if test "${includedir}" != /usr/include ; then
 --- misc/terminfo.src
-+++ misc/terminfo.src	2017-11-20 08:14:54.892595872 +0000
++++ misc/terminfo.src	2017-12-11 08:28:16.865190049 +0000
 @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
  	am,
  	cols#80,
@@ -795,7 +795,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-11-20 08:13:37.958059552 +0000
++++ ncurses/Makefile.in	2017-12-11 08:28:16.865190049 +0000
 @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
  ../lib : ; mkdir $@
  
@@ -806,7 +806,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-11-20 08:13:37.958059552 +0000
++++ ncurses/curses.priv.h	2017-12-11 08:28:16.865190049 +0000
 @@ -2146,6 +2146,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);
@@ -817,7 +817,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-11-20 08:13:37.958059552 +0000
++++ ncurses/run_cmd.sh	2017-12-11 08:28:16.865190049 +0000
 @@ -0,0 +1,11 @@
 +#!/bin/sh
 +
@@ -831,7 +831,7 @@
 +
 +exec ${1+"$@"}
 --- ncurses/tinfo/MKfallback.sh
-+++ ncurses/tinfo/MKfallback.sh	2017-11-20 08:13:37.958059552 +0000
++++ ncurses/tinfo/MKfallback.sh	2017-12-11 08:28:16.865190049 +0000
 @@ -68,6 +68,12 @@ else
  	tmp_info=
  fi
@@ -864,7 +864,7 @@
  	done
  
 --- ncurses/tinfo/access.c
-+++ ncurses/tinfo/access.c	2017-11-20 08:13:37.958059552 +0000
++++ ncurses/tinfo/access.c	2017-12-11 08:28:16.865190049 +0000
 @@ -35,6 +35,9 @@
  #include <ctype.h>
  
@@ -907,7 +907,7 @@
  _nc_access(const char *path, int mode)
  {
 --- ncurses/tinfo/lib_setup.c
-+++ ncurses/tinfo/lib_setup.c	2017-11-20 08:13:37.958059552 +0000
++++ ncurses/tinfo/lib_setup.c	2017-12-11 08:28:16.865190049 +0000
 @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
      } else if ((value = tigetnum("U8")) >= 0) {
  	result = value;		/* use extension feature */
@@ -919,7 +919,7 @@
  	    result = 1;		/* always broken */
  	} else if (strstr(env, "screen") != 0
 --- ncurses/tinfo/read_entry.c
-+++ ncurses/tinfo/read_entry.c	2017-11-20 08:13:37.958059552 +0000
++++ ncurses/tinfo/read_entry.c	2017-12-11 08:28:16.865190049 +0000
 @@ -431,6 +431,7 @@ _nc_read_file_entry(const char *const fi
      FILE *fp = 0;
      int code;
@@ -937,7 +937,7 @@
      return (code);
  }
 --- ncurses/tinfo/read_termcap.c
-+++ ncurses/tinfo/read_termcap.c	2017-11-20 08:13:37.958059552 +0000
++++ ncurses/tinfo/read_termcap.c	2017-12-11 08:28:16.865190049 +0000
 @@ -322,14 +322,18 @@ _nc_getent(
  	     */
  	    if (fd >= 0) {
@@ -984,7 +984,7 @@
      }
      if (copied != 0)
 --- progs/Makefile.in
-+++ progs/Makefile.in	2017-11-20 08:13:37.958059552 +0000
++++ progs/Makefile.in	2017-12-11 08:28:16.865190049 +0000
 @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL	= $(CCFLAGS)
  CFLAGS_NORMAL	= $(CCFLAGS)
  CFLAGS_DEBUG	= $(CCFLAGS) @CC_G_OPT@ -DTRACE
@@ -1004,7 +1004,7 @@
  LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
  
 --- test/test.priv.h
-+++ test/test.priv.h	2017-11-20 08:13:37.958059552 +0000
++++ test/test.priv.h	2017-12-11 08:28:16.865190049 +0000
 @@ -891,12 +891,12 @@ extern char *strnames[], *strcodes[], *s
  #endif
  
diff --git a/ncurses.changes b/ncurses.changes
index a1ebe5a..8fd594f 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Mon Dec 11 08:27:21 UTC 2017 - werner@suse.de
+
+- Add ncurses patch 20171209
+  + modify misc/ncurses-config.in to make output with --includedir
+    consistent with --cflags, i.e., when --disable-overwrite option was
+    configured the output should show the subdirectory where headers
+    are.
+  + modify MKlib_gen.sh to suppress macros when calling an "implemented"
+    function in link_test.c
+  + updated ftp-url used in test-packages, etc.
+  + modify order of -pie/-shared options in configure script in case
+    LDFLAGS uses "-pie", working around a defect or limitation in the GNU
+    linker (prompted by patch by Yogesh Prasad, forwarded by Jay Shah).
+  + add entry in man_db.renames for user_caps.5
+
+-------------------------------------------------------------------
+Mon Nov 27 13:32:56 UTC 2017 - werner@suse.de
+
+- Add ncurses patch 20171125
+  + modify MKlib_gen.sh to avoid tracing result from getstr/getnstr
+    before initialized.
+  + add "-a" aspect-ratio option to picsmap.
+  + add configure check for default path of rgb.txt, used in picsmap.
+  + modify _nc_write_entry() to truncate too-long filename (report by
+    Hosein Askari, Debian #882620).
+  + build-fix for ncurses-examples with NetBSD curses:
+    + it lacks the use_env() function.
+    + it lacks libpanel; a recent change used the wrong ifdef symbol.
+  + add a macro for is_linetouched() and adjust the function's return
+    value to make it possible for most applications to check for an
+    error-return (report by Midolikawa H).
+  + additional manpage cleanup.
+  + update config.guess, config.sub from
+          http://git.savannah.gnu.org/cgit/config.git
+
 -------------------------------------------------------------------
 Mon Nov 20 08:11:58 UTC 2017 - werner@suse.de