SHA256
1
0
forked from pool/ncurses

Update to ncurses 6.1-20190202

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=408
This commit is contained in:
Dr. Werner Fink 2019-02-06 08:11:10 +00:00 committed by Git OBS Bridge
parent 2344ad20bf
commit 4977a451ed
3 changed files with 77 additions and 35 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:2d002be5df4633f437ae19611260c6c5b4199d638c64324161bc939443cf4b6b oid sha256:f1a51e5b75b221b3cea5e19cd8388fb8e74c2bedf1dbaffbd643b392908043d9
size 1224934 size 1282692

View File

@ -13,16 +13,16 @@
ncurses/curses.priv.h | 2 ncurses/curses.priv.h | 2
ncurses/run_cmd.sh | 11 +++ ncurses/run_cmd.sh | 11 +++
ncurses/tinfo/MKfallback.sh | 10 ++- ncurses/tinfo/MKfallback.sh | 10 ++-
ncurses/tinfo/access.c | 27 ++++++++ ncurses/tinfo/access.c | 28 ++++++++
ncurses/tinfo/lib_setup.c | 3 ncurses/tinfo/lib_setup.c | 3
ncurses/tinfo/read_entry.c | 2 ncurses/tinfo/read_entry.c | 2
ncurses/tinfo/read_termcap.c | 21 ++++-- ncurses/tinfo/read_termcap.c | 21 ++++--
progs/Makefile.in | 4 - progs/Makefile.in | 4 -
test/test.priv.h | 4 - test/test.priv.h | 4 -
20 files changed, 248 insertions(+), 81 deletions(-) 20 files changed, 249 insertions(+), 81 deletions(-)
--- aclocal.m4 --- aclocal.m4
+++ aclocal.m4 2019-01-07 07:47:20.064859035 +0000 +++ aclocal.m4 2019-02-06 07:51:48.441355403 +0000
@@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool]) @@ -580,7 +580,7 @@ AC_MSG_CHECKING([for size of bool])
AC_CACHE_VAL(cf_cv_type_of_bool,[ AC_CACHE_VAL(cf_cv_type_of_bool,[
rm -f cf_test.out rm -f cf_test.out
@ -151,7 +151,7 @@
esac esac
done done
--- configure --- configure
+++ configure 2019-01-07 07:47:20.068858960 +0000 +++ configure 2019-02-06 07:51:48.445355328 +0000
@@ -5485,7 +5485,7 @@ echo $ECHO_N "checking for an rpath opti @@ -5485,7 +5485,7 @@ echo $ECHO_N "checking for an rpath opti
fi fi
;; ;;
@ -279,7 +279,7 @@
;; ;;
esac esac
done done
@@ -24440,6 +24444,7 @@ if test "$with_termlib" != no ; then @@ -24439,6 +24443,7 @@ if test "$with_termlib" != no ; then
TINFO_LDFLAGS="-L${LIB_DIR}" TINFO_LDFLAGS="-L${LIB_DIR}"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi fi
@ -288,7 +288,7 @@
# the next lines are needed for linking libtic over libncurses # the next lines are needed for linking libtic over libncurses
TINFO_NAME=${LIB_NAME} TINFO_NAME=${LIB_NAME}
--- include/curses.h.in --- include/curses.h.in
+++ include/curses.h.in 2019-01-07 07:47:20.068858960 +0000 +++ include/curses.h.in 2019-02-06 07:51:48.445355328 +0000
@@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype; @@ -177,6 +177,9 @@ typedef @cf_cv_typeof_chtype@ chtype;
typedef @cf_cv_typeof_mmask_t@ mmask_t; typedef @cf_cv_typeof_mmask_t@ mmask_t;
#endif #endif
@ -300,7 +300,7 @@
* We need FILE, etc. Include this before checking any feature symbols. * We need FILE, etc. Include this before checking any feature symbols.
*/ */
--- include/termcap.h.in --- include/termcap.h.in
+++ include/termcap.h.in 2019-01-07 07:47:20.068858960 +0000 +++ include/termcap.h.in 2019-02-06 07:51:48.445355328 +0000
@@ -46,6 +46,8 @@ extern "C" @@ -46,6 +46,8 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
@ -311,7 +311,7 @@
#undef NCURSES_OSPEED #undef NCURSES_OSPEED
--- include/tic.h --- include/tic.h
+++ include/tic.h 2019-01-07 07:47:20.068858960 +0000 +++ include/tic.h 2019-02-06 07:51:48.445355328 +0000
@@ -221,12 +221,12 @@ struct alias @@ -221,12 +221,12 @@ struct alias
*/ */
@ -328,7 +328,7 @@
#define CANCELLED_STRING (char *)(-1) #define CANCELLED_STRING (char *)(-1)
--- man/man_db.renames --- man/man_db.renames
+++ man/man_db.renames 2019-01-07 07:47:20.068858960 +0000 +++ man/man_db.renames 2019-02-06 07:51:48.445355328 +0000
@@ -163,6 +163,7 @@ term.7 term.7 @@ -163,6 +163,7 @@ term.7 term.7
term_variables.3x terminfo_variables.3ncurses term_variables.3x terminfo_variables.3ncurses
terminfo.5 terminfo.5 terminfo.5 terminfo.5
@ -346,7 +346,7 @@
# #
getty.1 getty.8 getty.1 getty.8
--- man/ncurses.3x --- man/ncurses.3x
+++ man/ncurses.3x 2019-01-07 07:47:20.072858886 +0000 +++ man/ncurses.3x 2019-02-06 07:51:48.445355328 +0000
@@ -139,6 +139,10 @@ after the shell environment variable \fB @@ -139,6 +139,10 @@ after the shell environment variable \fB
[See \fBterminfo\fR(\*n) for further details.] [See \fBterminfo\fR(\*n) for further details.]
.SS Datatypes .SS Datatypes
@ -359,7 +359,7 @@
called \fIwindows\fR, which can be thought of as two-dimensional called \fIwindows\fR, which can be thought of as two-dimensional
arrays of characters representing all or part of a CRT screen. arrays of characters representing all or part of a CRT screen.
--- misc/gen-pkgconfig.in --- misc/gen-pkgconfig.in
+++ misc/gen-pkgconfig.in 2019-01-07 07:47:20.072858886 +0000 +++ misc/gen-pkgconfig.in 2019-02-06 07:51:48.445355328 +0000
@@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include" @@ -77,7 +77,7 @@ if test "$includedir" != "/usr/include"
fi fi
@ -399,7 +399,7 @@
if test $name = $MAIN_LIBRARY if test $name = $MAIN_LIBRARY
--- misc/ncurses-config.in --- misc/ncurses-config.in
+++ misc/ncurses-config.in 2019-01-07 07:47:20.072858886 +0000 +++ misc/ncurses-config.in 2019-02-06 07:51:48.445355328 +0000
@@ -100,7 +100,7 @@ while test $# -gt 0; do @@ -100,7 +100,7 @@ while test $# -gt 0; do
# compile/link # compile/link
--cflags) --cflags)
@ -410,7 +410,7 @@
fi fi
if test "${includedir}" != /usr/include ; then if test "${includedir}" != /usr/include ; then
--- misc/terminfo.src --- misc/terminfo.src
+++ misc/terminfo.src 2019-01-07 07:47:20.080858734 +0000 +++ misc/terminfo.src 2019-02-06 07:51:48.453355178 +0000
@@ -301,7 +301,9 @@ dumb|80-column dumb tty, @@ -301,7 +301,9 @@ dumb|80-column dumb tty,
am, am,
cols#80, cols#80,
@ -795,7 +795,7 @@
s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display, ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
--- ncurses/Makefile.in --- ncurses/Makefile.in
+++ ncurses/Makefile.in 2019-01-07 07:47:20.080858734 +0000 +++ ncurses/Makefile.in 2019-02-06 07:51:48.453355178 +0000
@@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) : @@ -219,7 +219,7 @@ $(DESTDIR)$(libdir) :
../lib : ; mkdir $@ ../lib : ; mkdir $@
@ -806,8 +806,8 @@
./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@ $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
--- ncurses/curses.priv.h --- ncurses/curses.priv.h
+++ ncurses/curses.priv.h 2019-01-07 07:47:20.080858734 +0000 +++ ncurses/curses.priv.h 2019-02-06 07:51:48.453355178 +0000
@@ -2196,6 +2196,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec @@ -2205,6 +2205,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec
extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t); extern NCURSES_EXPORT(char *) _nc_trace_mmask_t (SCREEN *, mmask_t);
extern NCURSES_EXPORT(int) _nc_access (const char *, int); extern NCURSES_EXPORT(int) _nc_access (const char *, int);
@ -817,7 +817,7 @@
extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
--- ncurses/run_cmd.sh --- ncurses/run_cmd.sh
+++ ncurses/run_cmd.sh 2019-01-07 07:47:20.080858734 +0000 +++ ncurses/run_cmd.sh 2019-02-06 07:51:48.453355178 +0000
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#!/bin/sh +#!/bin/sh
+ +
@ -831,7 +831,7 @@
+ +
+exec ${1+"$@"} +exec ${1+"$@"}
--- ncurses/tinfo/MKfallback.sh --- ncurses/tinfo/MKfallback.sh
+++ ncurses/tinfo/MKfallback.sh 2019-01-07 07:47:20.080858734 +0000 +++ ncurses/tinfo/MKfallback.sh 2019-02-06 07:51:48.453355178 +0000
@@ -68,6 +68,12 @@ else @@ -68,6 +68,12 @@ else
tmp_info= tmp_info=
fi fi
@ -864,18 +864,19 @@
done done
--- ncurses/tinfo/access.c --- ncurses/tinfo/access.c
+++ ncurses/tinfo/access.c 2019-01-07 07:47:20.080858734 +0000 +++ ncurses/tinfo/access.c 2019-02-06 08:09:01.662042242 +0000
@@ -35,6 +35,9 @@ @@ -30,6 +30,10 @@
#include <ctype.h> * Author: Thomas E. Dickey *
****************************************************************************/
#include <tic.h>
+#ifdef linux +#ifdef linux
+# include <sys/fsuid.h> +# include <sys/fsuid.h>
+#endif +#endif
+
#include <curses.priv.h>
MODULE_ID("$Id: access.c,v 1.23 2012/09/01 19:21:29 tom Exp $") #include <ctype.h>
@@ -104,6 +108,30 @@ _nc_basename(char *path)
@@ -112,6 +115,30 @@ _nc_basename(char *path)
return path + _nc_pathlast(path); return path + _nc_pathlast(path);
} }
@ -907,7 +908,7 @@
_nc_access(const char *path, int mode) _nc_access(const char *path, int mode)
{ {
--- ncurses/tinfo/lib_setup.c --- ncurses/tinfo/lib_setup.c
+++ ncurses/tinfo/lib_setup.c 2019-01-07 07:47:20.084858660 +0000 +++ ncurses/tinfo/lib_setup.c 2019-02-06 07:51:48.457355102 +0000
@@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp) @@ -599,6 +599,9 @@ _nc_locale_breaks_acs(TERMINAL *termp)
} else if ((value = tigetnum("U8")) >= 0) { } else if ((value = tigetnum("U8")) >= 0) {
result = value; /* use extension feature */ result = value; /* use extension feature */
@ -919,7 +920,7 @@
result = 1; /* always broken */ result = 1; /* always broken */
} else if (strstr(env, "screen") != 0 } else if (strstr(env, "screen") != 0
--- ncurses/tinfo/read_entry.c --- ncurses/tinfo/read_entry.c
+++ ncurses/tinfo/read_entry.c 2019-01-07 07:47:20.084858660 +0000 +++ ncurses/tinfo/read_entry.c 2019-02-06 07:51:48.457355102 +0000
@@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi @@ -551,6 +551,7 @@ _nc_read_file_entry(const char *const fi
FILE *fp = 0; FILE *fp = 0;
int code; int code;
@ -937,7 +938,7 @@
return (code); return (code);
} }
--- ncurses/tinfo/read_termcap.c --- ncurses/tinfo/read_termcap.c
+++ ncurses/tinfo/read_termcap.c 2019-01-07 07:47:20.084858660 +0000 +++ ncurses/tinfo/read_termcap.c 2019-02-06 07:51:48.457355102 +0000
@@ -322,14 +322,18 @@ _nc_getent( @@ -322,14 +322,18 @@ _nc_getent(
*/ */
if (fd >= 0) { if (fd >= 0) {
@ -964,7 +965,7 @@
myfd = TRUE; myfd = TRUE;
} }
lineno = 0; lineno = 0;
@@ -1118,8 +1122,10 @@ _nc_read_termcap_entry(const char *const @@ -1122,8 +1126,10 @@ _nc_read_termcap_entry(const char *const
for (i = 0; i < filecount; i++) { for (i = 0; i < filecount; i++) {
TR(TRACE_DATABASE, ("Looking for %s in %s", tn, termpaths[i])); TR(TRACE_DATABASE, ("Looking for %s in %s", tn, termpaths[i]));
@ -975,7 +976,7 @@
_nc_set_source(termpaths[i]); _nc_set_source(termpaths[i]);
/* /*
@@ -1131,6 +1137,7 @@ _nc_read_termcap_entry(const char *const @@ -1135,6 +1141,7 @@ _nc_read_termcap_entry(const char *const
(void) fclose(fp); (void) fclose(fp);
} }
@ -984,7 +985,7 @@
} }
if (copied != 0) if (copied != 0)
--- progs/Makefile.in --- progs/Makefile.in
+++ progs/Makefile.in 2019-01-07 07:47:20.084858660 +0000 +++ progs/Makefile.in 2019-02-06 07:51:48.457355102 +0000
@@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) @@ -100,7 +100,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS)
CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS)
CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE
@ -1004,8 +1005,8 @@
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
--- test/test.priv.h --- test/test.priv.h
+++ test/test.priv.h 2019-01-07 07:47:20.084858660 +0000 +++ test/test.priv.h 2019-02-06 07:51:48.457355102 +0000
@@ -929,12 +929,12 @@ extern char *strnames[], *strcodes[], *s @@ -940,12 +940,12 @@ extern char *strnames[], *strcodes[], *s
#endif #endif
/* out-of-band values for representing absent capabilities */ /* out-of-band values for representing absent capabilities */

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Wed Feb 6 07:45:22 UTC 2019 - Dr. Werner Fink <werner@suse.de>
-Add ncurses patch 20190202
+ modify rpm test-package ".spec" file to work around naming conflict
with Redhat's package for ncurses6.
+ modify no-leaks code in test/picsmap to avoid non-standard tdestroy.
+ amend change to configure script which altered the top-level makefile
to avoid attempting to install the terminfo database when it was not
configured, to allow for installing the ".pc" files which are also
in the misc directory (report by Steve Wills).
-Add ncurses patch 20190126
+ change some "%define" statements in test-packages for RPMs to
"%global" to work around changes in rpm 4.14 from recent Redhat.
+ fixes for O_INPUT_FIELD extension (patch by Leon Winter).
+ eliminate fixed buffer-size when reading $TERMCAP variable.
+ correct logic in read_entry.c which prevented $TERMCAP variable from
being interpreted as a fallback to terminfo entry (prompted by
Savannah #54556, cf: 20110924).
-Add ncurses patch 20190121
+ add a check in test/configure to work around non-ncurses termcap.h
file in Slackware.
+ corrected flag for "seq" method of db 1.8.5 interface, needed by toe
on some of the BSDs.
+ updated "string-hacks" feature.
+ minor improvements to manpage typography.
+ corrected conditionally-compiled limit on color pairs (report by
"Hudd").
+ add -x option to test/pair_content, test/color_content for testing
init_extended_pair, extended_pair_content, init_extended_color,
extended_color_content
+ add -p option to test/pair_content, test/color_content to show the
return values from the tested functions.
+ improve manual page curs_color.3x discussion of error returns and
extensions.
+ add O_INPUT_FIELD extension to form library (patch by Leon Winter).
+ override/suppress --enable-db-install if --disable-database configure
option was given.
+ change a too-large terminal entry in tic from a fatal error to a
warning (prompted by discussion with Gabriele Balducci).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 14 07:24:52 UTC 2019 - Dr. Werner Fink <werner@suse.de> Mon Jan 14 07:24:52 UTC 2019 - Dr. Werner Fink <werner@suse.de>