Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2019-02-14 14:11:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses" Thu Feb 14 14:11:42 2019 rev:152 rq:673377 version:6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2019-01-29 14:38:40.335532856 +0100 +++ /work/SRC/openSUSE:Factory/.ncurses.new.28833/ncurses.changes 2019-02-14 14:11:47.880267977 +0100 @@ -1,0 +2,51 @@ +Mon Feb 11 09:46:34 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Fix configure scripts as well as pkg-config configurations + that is correct paths in pkg-config and use pkg-config to + configure the configure scripts as well +- Add ncurses patch 20190209 + + add check in tic to provide warnings for mismatched number of + parameters in the documented user-capability extensions. + +------------------------------------------------------------------- +Wed Feb 6 07:45:22 UTC 2019 - Dr. Werner Fink <[email protected]> + +- 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). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.B1T12j/_old 2019-02-14 14:11:48.880267479 +0100 +++ /var/tmp/diff_new_pack.B1T12j/_new 2019-02-14 14:11:48.884267477 +0100 @@ -547,10 +547,12 @@ cp -p %{root}%{_libdir}/libtinfow.so.%{version} libtinfow.so.%{version}.back %endif ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir} - sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncursesw" --libs "-lncursesw" \ - --libs "-l%{soname_tinfo}" %{root}%{_bindir}/ncursesw6-config mkdir pc + PKG_CONFIG_PATH=$PWD/pc:$(pkg-config --variable pc_path pkg-config) + export PKG_CONFIG_PATH mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ + sh %{S:6} --cflags "$(pkg-config --cflags ncursesw)" --libs "$(pkg-config --libs ncursesw)" \ + %{root}%{_bindir}/ncursesw6-config # # Some tests # @@ -623,8 +625,6 @@ # must not use %jobs here (would lead to: ln: ncurses.h already exists) make install.libs install.includes DESTDIR=%{root} includedir=%{_incdir}/ncurses5 includesubdir=/ncurses libdir=%{_libdir}/ncurses5 ln -sf %{_incdir}/ncurses5/ncurses/{curses,ncurses,term}.h %{root}%{_incdir}/ncurses5/ - sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses5/ncurses -I%{_incdir}/ncurses5" --libs "-L%{_libdir}/ncurses5 -lncurses" \ - --libs "-ltinfo" %{root}%{_bindir}/ncurses5-config pushd man sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses5-config.1 popd @@ -637,8 +637,13 @@ tic) sed -ri 's@^(Requires.private: ).*@\1tinfo5@' "$pc" ;; *) sed -ri 's@^(Requires.private: ).*@\1ncurses5@' "$pc" esac + sed -ri 's@^(includedir=).*@\1%{_incdir}/ncurses5/ncurses@' "$pc" + sed -ri 's@^(libdir=).*@\1%{_libdir}/ncurses5@' "$pc" + sed -ri 's@^(Libs: )(.*)@\1-L${libdir}\2@' "$pc" mv -f $pc pc/${base}5.pc done + sh %{S:6} --cflags "$(pkg-config --cflags ncurses5)" --libs "$(pkg-config --libs ncurses5)" \ + %{root}%{_bindir}/ncurses5-config # # Now use --disable-widec for narrow character support. @@ -682,12 +687,12 @@ cp -p libtinfo.so.%{version}.back %{root}%{_libdir}/libtinfo.so.%{version} cp -p libtinfow.so.%{version}.back %{root}%{_libdir}/libtinfow.so.%{version} %endif - sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses" --libs "-lncurses" \ - --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config pushd man sh ../edit_man.sh normal installing %{root}%{_mandir} . ncurses6-config.1 popd mv -f %{root}%{_libdir}/pkgconfig/*.pc pc/ + sh %{S:6} --cflags "$(pkg-config --cflags ncurses)" --libs "$(pkg-config --libs ncurses)" \ + %{root}%{_bindir}/ncurses6-config # # Some tests # @@ -754,8 +759,6 @@ gcc $CFLAGS $LDFLAGS -fPIC -shared -Wl,--auxiliary=libtinfo.so.5,-soname,libtinfow.so.5,-stats,-lc \ -Wl,--version-script,package/ncursesw.map -o %{root}%{_libdir}/libtinfow.so.5.9 %endif - sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses5/ncursesw -I%{_incdir}/ncurses5" --libs "-L%{_libdir}/ncurses5 -lncursesw" \ - --libs "-l%{soname_tinfo}" %{root}%{_bindir}/ncursesw5-config pushd man sh ../edit_man.sh normal installing %{root}%{_mandir} . ncursesw5-config.1 popd @@ -765,15 +768,16 @@ base=${pc%%.pc} base=${base##*/} case "$base" in - tinfo) sed -ri 's@(includedir=/usr/include/ncurses5/ncurses)w.*@\1@' "$pc" ;; - tic) sed -ri 's@(includedir=/usr/include/ncurses5/ncurses)w.*@\1@' "$pc" ;; - esac - case "$base" in tic) sed -ri 's@^(Requires.private: ).*@\1tinfo5@' "$pc" ;; *) sed -ri 's@^(Requires.private: ).*@\1ncurses5@' "$pc" esac + sed -ri 's@^(includedir=).*@\1%{_incdir}/ncurses5/ncursesw@' "$pc" + sed -ri 's@^(libdir=).*@\1%{_libdir}/ncurses5@' "$pc" + sed -ri 's@^(Libs: )(.*)@\1-L${libdir}\2@' "$pc" mv -f $pc pc/${base}5.pc done + sh %{S:6} --cflags "$(pkg-config --cflags ncursesw5)" --libs "$(pkg-config --libs ncursesw5)" \ + %{root}%{_bindir}/ncursesw5-config %install PATH=$PWD/gzip:$PATH @@ -981,7 +985,7 @@ grep -v -F -x -f default.list -f screen.list -f iterm.list \ > extension.list rm -f %{buildroot}%{_prefix}/lib/terminfo - mv pc/*.pc %{buildroot}%{_libdir}/pkgconfig/ + cp -p pc/*.pc %{buildroot}%{_libdir}/pkgconfig/ %if 0%{?qemu_user_space_build:1}%{?_crossbuild} # No test here ++++++ ncurses-6.1-patches.tar.bz2 ++++++ ++++ 16522 lines of diff (skipped) ++++++ ncurses-6.1.dif ++++++ --- /var/tmp/diff_new_pack.B1T12j/_old 2019-02-14 14:11:49.888266977 +0100 +++ /var/tmp/diff_new_pack.B1T12j/_new 2019-02-14 14:11:49.892266975 +0100 @@ -7,22 +7,21 @@ man/man_db.renames | 2 man/ncurses.3x | 4 + misc/gen-pkgconfig.in | 7 +- - misc/ncurses-config.in | 2 misc/terminfo.src | 138 ++++++++++++++++++++++++++++++++++--------- ncurses/Makefile.in | 2 ncurses/curses.priv.h | 2 ncurses/run_cmd.sh | 11 +++ ncurses/tinfo/MKfallback.sh | 10 ++- - ncurses/tinfo/access.c | 27 ++++++++ + ncurses/tinfo/access.c | 28 ++++++++ ncurses/tinfo/lib_setup.c | 3 ncurses/tinfo/read_entry.c | 2 ncurses/tinfo/read_termcap.c | 21 ++++-- progs/Makefile.in | 4 - test/test.priv.h | 4 - - 20 files changed, 248 insertions(+), 81 deletions(-) + 19 files changed, 248 insertions(+), 80 deletions(-) --- 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]) AC_CACHE_VAL(cf_cv_type_of_bool,[ rm -f cf_test.out @@ -151,7 +150,7 @@ esac done --- 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 fi ;; @@ -279,7 +278,7 @@ ;; esac 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}" SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" fi @@ -288,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 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; typedef @cf_cv_typeof_mmask_t@ mmask_t; #endif @@ -300,7 +299,7 @@ * We need FILE, etc. Include this before checking any feature symbols. */ --- 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" { #endif /* __cplusplus */ @@ -311,7 +310,7 @@ #undef NCURSES_OSPEED --- 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 */ @@ -328,7 +327,7 @@ #define CANCELLED_STRING (char *)(-1) --- 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 term_variables.3x terminfo_variables.3ncurses terminfo.5 terminfo.5 @@ -346,7 +345,7 @@ # getty.1 getty.8 --- 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 [See \fBterminfo\fR(\*n) for further details.] .SS Datatypes @@ -359,7 +358,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 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" fi @@ -398,19 +397,8 @@ fi if test $name = $MAIN_LIBRARY ---- misc/ncurses-config.in -+++ misc/ncurses-config.in 2019-01-07 07:47:20.072858886 +0000 -@@ -100,7 +100,7 @@ while test $# -gt 0; do - # compile/link - --cflags) - INCS="@PKG_CFLAGS@" -- if test "x@WITH_OVERWRITE@" = xno ; then -+ if test "${THIS%[0-5]*}" = xno ; then - INCS="$INCS -I${includesubdir}" - fi - if test "${includedir}" != /usr/include ; then --- 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, am, cols#80, @@ -795,7 +783,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 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) : ../lib : ; mkdir $@ @@ -806,8 +794,8 @@ ./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 2019-01-07 07:47:20.080858734 +0000 -@@ -2196,6 +2196,8 @@ extern NCURSES_EXPORT(char *) _nc_tracec ++++ ncurses/curses.priv.h 2019-02-06 07:51:48.453355178 +0000 +@@ -2205,6 +2205,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); extern NCURSES_EXPORT(int) _nc_access (const char *, int); @@ -817,7 +805,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 2019-01-07 07:47:20.080858734 +0000 ++++ ncurses/run_cmd.sh 2019-02-06 07:51:48.453355178 +0000 @@ -0,0 +1,11 @@ +#!/bin/sh + @@ -831,7 +819,7 @@ + +exec ${1+"$@"} --- 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 tmp_info= fi @@ -864,18 +852,19 @@ done --- ncurses/tinfo/access.c -+++ ncurses/tinfo/access.c 2019-01-07 07:47:20.080858734 +0000 -@@ -35,6 +35,9 @@ - #include <ctype.h> ++++ ncurses/tinfo/access.c 2019-02-06 08:09:01.662042242 +0000 +@@ -30,6 +30,10 @@ + * Author: Thomas E. Dickey * + ****************************************************************************/ - #include <tic.h> +#ifdef linux +# include <sys/fsuid.h> +#endif ++ + #include <curses.priv.h> - MODULE_ID("$Id: access.c,v 1.23 2012/09/01 19:21:29 tom Exp $") - -@@ -112,6 +115,30 @@ _nc_basename(char *path) + #include <ctype.h> +@@ -104,6 +108,30 @@ _nc_basename(char *path) return path + _nc_pathlast(path); } @@ -907,7 +896,7 @@ _nc_access(const char *path, int mode) { --- 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) } else if ((value = tigetnum("U8")) >= 0) { result = value; /* use extension feature */ @@ -919,7 +908,7 @@ result = 1; /* always broken */ } else if (strstr(env, "screen") != 0 --- 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 FILE *fp = 0; int code; @@ -937,7 +926,7 @@ return (code); } --- 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( */ if (fd >= 0) { @@ -964,7 +953,7 @@ myfd = TRUE; } 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++) { TR(TRACE_DATABASE, ("Looking for %s in %s", tn, termpaths[i])); @@ -975,7 +964,7 @@ _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); } @@ -984,7 +973,7 @@ } if (copied != 0) --- 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) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE @@ -1004,8 +993,8 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) --- test/test.priv.h -+++ test/test.priv.h 2019-01-07 07:47:20.084858660 +0000 -@@ -929,12 +929,12 @@ extern char *strnames[], *strcodes[], *s ++++ test/test.priv.h 2019-02-06 07:51:48.457355102 +0000 +@@ -940,12 +940,12 @@ extern char *strnames[], *strcodes[], *s #endif /* out-of-band values for representing absent capabilities */
