Hello community,
here is the log from the commit of package ncurses for openSUSE:Factory checked
in at 2018-03-30 11:54:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ncurses (Old)
and /work/SRC/openSUSE:Factory/.ncurses.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses"
Fri Mar 30 11:54:47 2018 rev:144 rq:589658 version:6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2018-03-08
10:41:57.754898422 +0100
+++ /work/SRC/openSUSE:Factory/.ncurses.new/ncurses.changes 2018-03-30
11:54:53.020939825 +0200
@@ -1,0 +2,24 @@
+Wed Mar 21 07:46:36 UTC 2018 - wer...@suse.de
+
+- Change baselibs.conf to avoid mixed version requirements (bsc#1082744)
+
+-------------------------------------------------------------------
+Mon Mar 19 09:23:35 UTC 2018 - wer...@suse.de
+
+- Add ncurses patch 6.1-20180317
+ + fix a check in infotocap which may not have detected a problem when
+ it should have.
+ + add a check in tic for the case where setf/setb are given using
+ different strings, but provide identical results to setaf/setab.
+ + further improve fix for terminfo.5 (patch by Kir Kolyshkin).
+ + reorder loop-limit checks in winsnstr() in case the string has no
+ terminating null and only the number of characters is used (patch
+ by Gyorgy Jeney).
+
+-------------------------------------------------------------------
+Thu Mar 8 10:06:24 UTC 2018 - wer...@suse.de
+
+- Avoid opaque libraries for Leap 15 and SLES 15
+- No tests on Leap 15 and SLES 15
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ncurses.spec ++++++
--- /var/tmp/diff_new_pack.Oqgbik/_old 2018-03-30 11:54:53.896908144 +0200
+++ /var/tmp/diff_new_pack.Oqgbik/_new 2018-03-30 11:54:53.900908000 +0200
@@ -433,10 +433,12 @@
--enable-interop \
--with-pthread \
--enable-reentrant \
+%if 0%{?suse_version} > 1500
--enable-opaque-curses \
--enable-opaque-form \
--enable-opaque-menu \
--enable-opaque-panel \
+%endif
--enable-ext-mouse \
--enable-widec \
--with-termlib=%{soname_tinfo} \
@@ -561,6 +563,7 @@
ldd ./tack
popd
unset LD_LIBRARY_PATH
+%if 0%{?suse_version} > 1500
#
# Make the test suite for ncursesw6
#
@@ -574,6 +577,7 @@
make distclean
popd
%endif
+%endif
test ! -L tack || rm -f tack
make clean
#
@@ -684,7 +688,7 @@
#
# Some tests
#
-%if 0%{?qemu_user_space_build:1}%{?_crossbuild}
+%if 0%{?qemu_user_space_build:1}%{?_crossbuild} || 0%{?suse_version} <= 1500
echo "Skipping tests due to running under QEMU / cross-building"
%else
#
@@ -985,6 +989,7 @@
%if %{with onlytinfo}
nm -D %{buildroot}/%{_lib}/libtinfo.so.%{version} | grep -q _nc_read_entry2
%endif
+%if 0%{?suse_version} > 1500
pushd test
expect -d <<-'EOF'
set env(TERM) xterm
@@ -1014,6 +1019,7 @@
EOF
popd
%endif
+%endif
%post -n libncurses5 -p /sbin/ldconfig
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.Oqgbik/_old 2018-03-30 11:54:53.968905541 +0200
+++ /var/tmp/diff_new_pack.Oqgbik/_new 2018-03-30 11:54:53.968905541 +0200
@@ -4,8 +4,10 @@
obsoletes "ncurses-<targettype> <= <version>"
libncurses6
targettype x86 provides "baselibs-x86:<prefix>/lib/libncurses.so.6"
- provides "libncurses6-<targettype> = 6.0"
+ provides "libncurses6-<targettype> = <version>"
ncurses-devel
requires -ncurses-<targettype>
+ requires "libncurses6-<targettype> = <version>"
+ncurses5-devel
+ requires -ncurses-<targettype>
requires "libncurses5-<targettype> = <version>"
- requires "libncurses6-<targettype> = 6.0"
++++++ ncurses-6.1-patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/patches/ncurses-6.1-20180317.patch
new/patches/ncurses-6.1-20180317.patch
--- old/patches/ncurses-6.1-20180317.patch 1970-01-01 01:00:00.000000000
+0100
+++ new/patches/ncurses-6.1-20180317.patch 2018-03-19 10:20:59.873049607
+0100
@@ -0,0 +1,360 @@
+# ncurses 6.1 - patch 20180317 - Thomas E. Dickey
+#
+#
------------------------------------------------------------------------------
+#
+# Ncurses 6.1 is at
+# ftp.gnu.org:/pub/gnu
+#
+# Patches for ncurses 6.1 can be found at
+# ftp://ftp.invisible-island.net/ncurses/6.1
+# http://invisible-mirror.net/archives/ncurses/6.1
+#
+#
------------------------------------------------------------------------------
+# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20180317.patch.gz
+# patch by Thomas E. Dickey <dic...@invisible-island.net>
+# created Sun Mar 18 01:26:15 UTC 2018
+#
------------------------------------------------------------------------------
+# NEWS | 12 +++++++
+# VERSION | 2 -
+# dist.mk | 4 +-
+# include/nc_tparm.h | 5 +--
+# man/MKterminfo.sh | 4 +-
+# ncurses/base/lib_insnstr.c | 6 +--
+# package/debian-mingw/changelog | 4 +-
+# package/debian-mingw64/changelog | 4 +-
+# package/debian/changelog | 4 +-
+# package/mingw-ncurses.nsi | 4 +-
+# package/mingw-ncurses.spec | 2 -
+# package/ncurses.spec | 2 -
+# progs/tic.c | 58 ++++++++++++++++++++++++++++---------
+# 13 files changed, 76 insertions(+), 35 deletions(-)
+#
------------------------------------------------------------------------------
+Index: NEWS
+Prereq: 1.3096
+--- ncurses-6.1-20180303+/NEWS 2018-03-03 22:07:39.000000000 +0000
++++ ncurses-6.1-20180317/NEWS 2018-03-17 19:47:51.000000000 +0000
+@@ -25,7 +25,7 @@
+ -- sale, use or other dealings in this Software without prior written
--
+ -- authorization.
--
+
-------------------------------------------------------------------------------
+--- $Id: NEWS,v 1.3096 2018/03/03 22:07:39 tom Exp $
++-- $Id: NEWS,v 1.3102 2018/03/17 19:47:51 tom Exp $
+
-------------------------------------------------------------------------------
+
+ This is a log of changes that ncurses has gone through since Zeyd started
+@@ -45,6 +45,16 @@
+ Changes through 1.9.9e did not credit all contributions;
+ it is not possible to add this information.
+
++20180317
++ + fix a check in infotocap which may not have detected a problem when
++ it should have.
++ + add a check in tic for the case where setf/setb are given using
++ different strings, but provide identical results to setaf/setab.
++ + further improve fix for terminfo.5 (patch by Kir Kolyshkin).
++ + reorder loop-limit checks in winsnstr() in case the string has no
++ terminating null and only the number of characters is used (patch
++ by Gyorgy Jeney).
++
+ 20180303
+ + modify TurnOn/TurnOff macros in lib_vidattr.c and lib_vid_attr.c to
+ avoid expansion of "CUR" in trace.
+Index: VERSION
+--- ncurses-6.1-20180303+/VERSION 2018-02-26 23:33:42.000000000 +0000
++++ ncurses-6.1-20180317/VERSION 2018-03-17 16:49:57.000000000 +0000
+@@ -1 +1 @@
+-5:0:10 6.1 20180303
++5:0:10 6.1 20180317
+Index: dist.mk
+Prereq: 1.1213
+--- ncurses-6.1-20180303+/dist.mk 2018-02-26 23:33:42.000000000 +0000
++++ ncurses-6.1-20180317/dist.mk 2018-03-17 16:49:57.000000000 +0000
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written #
+ # authorization. #
+ ##############################################################################
+-# $Id: dist.mk,v 1.1213 2018/02/26 23:33:42 tom Exp $
++# $Id: dist.mk,v 1.1215 2018/03/17 16:49:57 tom Exp $
+ # Makefile for creating ncurses distributions.
+ #
+ # This only needs to be used directly as a makefile by developers, but
+@@ -37,7 +37,7 @@
+ # These define the major/minor/patch versions of ncurses.
+ NCURSES_MAJOR = 6
+ NCURSES_MINOR = 1
+-NCURSES_PATCH = 20180303
++NCURSES_PATCH = 20180317
+
+ # We don't append the patch to the version, since this only applies to
releases
+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
+Index: include/nc_tparm.h
+Prereq: 1.8
+--- ncurses-6.1-20180303+/include/nc_tparm.h 2017-07-22 17:09:46.000000000
+0000
++++ ncurses-6.1-20180317/include/nc_tparm.h 2018-03-17 19:19:58.000000000
+0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2006-2012,2017 Free Software Foundation, Inc. *
++ * Copyright (c) 2006-2017,2018 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+ * copy of this software and associated documentation files (the *
+@@ -30,7 +30,7 @@
+ * Author: Thomas E. Dickey 2006 *
+ ****************************************************************************/
+
+-/* $Id: nc_tparm.h,v 1.8 2017/07/22 17:09:46 tom Exp $ */
++/* $Id: nc_tparm.h,v 1.9 2018/03/17 19:19:58 tom Exp $ */
+
+ #ifndef NC_TPARM_included
+ #define NC_TPARM_included 1
+@@ -73,7 +73,6 @@
+ #define TPARM_3(a,b,c,d) TPARM_4(a,b,c,d,0)
+ #define TPARM_2(a,b,c) TPARM_3(a,b,c,0)
+ #define TPARM_1(a,b) TPARM_2(a,b,0)
+-#define TPARM_1(a,b) TPARM_2(a,b,0)
+ #define TPARM_0(a) TPARM_1(a,0)
+ #endif
+
+Index: man/MKterminfo.sh
+Prereq: 1.15
+--- ncurses-6.1-20180303+/man/MKterminfo.sh 2018-03-03 19:25:58.000000000
+0000
++++ ncurses-6.1-20180317/man/MKterminfo.sh 2018-03-17 18:03:51.000000000
+0000
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-# $Id: MKterminfo.sh,v 1.15 2018/03/03 19:25:58 tom Exp $
++# $Id: MKterminfo.sh,v 1.16 2018/03/17 18:03:51 Kir.Kolyshkin Exp $
+ #
+ # MKterminfo.sh -- generate terminfo.5 from Caps tabular data
+ #
+@@ -71,7 +71,7 @@
+ sed -n <$caps "\
+ /%%-STOP-HERE-%%/q
+ /^#%center/s, expand,,
+-/^#%lw[1-9]/s, lw[1-9][0-9]*\., l.,
++/^#%lw25/s, lw6 , lw7 ,
+ /^#%/s/#%//p
+ /^#/d
+ s/[ ][ ]*/ /g
+Index: ncurses/base/lib_insnstr.c
+Prereq: 1.5
+--- ncurses-6.1-20180303+/ncurses/base/lib_insnstr.c 2016-05-28
21:03:33.000000000 +0000
++++ ncurses-6.1-20180317/ncurses/base/lib_insnstr.c 2018-03-10
20:13:59.000000000 +0000
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2004-2009,2016 Free Software Foundation, Inc. *
++ * Copyright (c) 2004-2016,2018 Free Software Foundation, Inc. *
+ * *
+ * Permission is hereby granted, free of charge, to any person obtaining a *
+ * copy of this software and associated documentation files (the *
+@@ -40,7 +40,7 @@
+ #include <curses.priv.h>
+ #include <ctype.h>
+
+-MODULE_ID("$Id: lib_insnstr.c,v 1.5 2016/05/28 21:03:33 tom Exp $")
++MODULE_ID("$Id: lib_insnstr.c,v 1.6 2018/03/10 20:13:59 Gyorgy.Jeney Exp $")
+
+ NCURSES_EXPORT(int)
+ winsnstr(WINDOW *win, const char *s, int n)
+@@ -81,7 +81,7 @@
+ NCURSES_SIZE_T ox = win->_curx;
+ const unsigned char *cp;
+
+- for (cp = str; *cp && (n <= 0 || (cp - str) < n); cp++) {
++ for (cp = str; (n <= 0 || (cp - str) < n) && *cp; cp++) {
+ _nc_insert_ch(sp, win, (chtype) UChar(*cp));
+ }
+ win->_curx = ox;
+Index: package/debian-mingw/changelog
+--- ncurses-6.1-20180303+/package/debian-mingw/changelog 2018-02-26
23:33:42.000000000 +0000
++++ ncurses-6.1-20180317/package/debian-mingw/changelog 2018-03-17
16:49:57.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20180303) unstable; urgency=low
++ncurses6 (6.1+20180317) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dic...@invisible-island.net> Mon, 26 Feb 2018 18:33:42
-0500
++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 17 Mar 2018 12:49:57
-0400
+
+ ncurses6 (5.9-20131005) unstable; urgency=low
+
+Index: package/debian-mingw64/changelog
+--- ncurses-6.1-20180303+/package/debian-mingw64/changelog 2018-02-26
23:33:42.000000000 +0000
++++ ncurses-6.1-20180317/package/debian-mingw64/changelog 2018-03-17
16:49:57.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20180303) unstable; urgency=low
++ncurses6 (6.1+20180317) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dic...@invisible-island.net> Mon, 26 Feb 2018 18:33:42
-0500
++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 17 Mar 2018 12:49:57
-0400
+
+ ncurses6 (5.9-20131005) unstable; urgency=low
+
+Index: package/debian/changelog
+--- ncurses-6.1-20180303+/package/debian/changelog 2018-02-26
23:33:42.000000000 +0000
++++ ncurses-6.1-20180317/package/debian/changelog 2018-03-17
16:49:57.000000000 +0000
+@@ -1,8 +1,8 @@
+-ncurses6 (6.1+20180303) unstable; urgency=low
++ncurses6 (6.1+20180317) unstable; urgency=low
+
+ * latest weekly patch
+
+- -- Thomas E. Dickey <dic...@invisible-island.net> Mon, 26 Feb 2018 18:33:42
-0500
++ -- Thomas E. Dickey <dic...@invisible-island.net> Sat, 17 Mar 2018 12:49:57
-0400
+
+ ncurses6 (5.9-20120608) unstable; urgency=low
+
+Index: package/mingw-ncurses.nsi
+Prereq: 1.260
+--- ncurses-6.1-20180303+/package/mingw-ncurses.nsi 2018-02-26
23:33:42.000000000 +0000
++++ ncurses-6.1-20180317/package/mingw-ncurses.nsi 2018-03-17
16:49:57.000000000 +0000
+@@ -1,4 +1,4 @@
+-; $Id: mingw-ncurses.nsi,v 1.260 2018/02/26 23:33:42 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.262 2018/03/17 16:49:57 tom Exp $
+
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@
+ !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "1"
+ !define VERSION_YYYY "2018"
+-!define VERSION_MMDD "0303"
++!define VERSION_MMDD "0317"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+
+ !define MY_ABI "5"
+Index: package/mingw-ncurses.spec
+--- ncurses-6.1-20180303+/package/mingw-ncurses.spec 2018-02-26
23:33:42.000000000 +0000
++++ ncurses-6.1-20180317/package/mingw-ncurses.spec 2018-03-17
16:49:57.000000000 +0000
+@@ -3,7 +3,7 @@
+ Summary: shared libraries for terminal handling
+ Name: mingw32-ncurses6
+ Version: 6.1
+-Release: 20180303
++Release: 20180317
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: package/ncurses.spec
+--- ncurses-6.1-20180303+/package/ncurses.spec 2018-02-26 23:33:42.000000000
+0000
++++ ncurses-6.1-20180317/package/ncurses.spec 2018-03-17 16:49:57.000000000
+0000
+@@ -1,7 +1,7 @@
+ Summary: shared libraries for terminal handling
+ Name: ncurses6
+ Version: 6.1
+-Release: 20180303
++Release: 20180317
+ License: X11
+ Group: Development/Libraries
+ Source: ncurses-%{version}-%{release}.tgz
+Index: progs/tic.c
+Prereq: 1.252
+--- ncurses-6.1-20180303+/progs/tic.c 2018-01-25 19:16:50.000000000 +0000
++++ ncurses-6.1-20180317/progs/tic.c 2018-03-18 00:05:10.000000000 +0000
+@@ -48,7 +48,7 @@
+ #include <parametrized.h>
+ #include <transform.h>
+
+-MODULE_ID("$Id: tic.c,v 1.252 2018/01/25 19:16:50 tom Exp $")
++MODULE_ID("$Id: tic.c,v 1.256 2018/03/18 00:05:10 tom Exp $")
+
+ #define STDIN_NAME "<stdin>"
+
+@@ -1129,6 +1129,27 @@
+ }
+ }
+
++static bool
++same_color(NCURSES_CONST char *oldcap, NCURSES_CONST char *newcap, int limit)
++{
++ bool result = FALSE;
++ if (limit > 16)
++ limit = 16;
++ if (limit >= 8) {
++ int n;
++ int same;
++ for (n = same = 0; n < limit; ++n) {
++ char *oldvalue = strdup(TPARM_1(oldcap, n));
++ char *newvalue = strdup(TPARM_1(newcap, n));
++ same += !strcmp(oldvalue, newvalue);
++ free(oldvalue);
++ free(newvalue);
++ }
++ result = (same == limit);
++ }
++ return result;
++}
++
+ /*
+ * Check if the color capabilities are consistent
+ */
+@@ -1145,21 +1166,29 @@
+ PAIRED(set_color_pair, initialize_pair);
+
+ if (VALID_STRING(set_foreground)
+- && VALID_STRING(set_a_foreground)
+- && !_nc_capcmp(set_foreground, set_a_foreground))
+- _nc_warning("expected setf/setaf to be different");
++ && VALID_STRING(set_a_foreground)) {
++ if (!_nc_capcmp(set_foreground, set_a_foreground)) {
++ _nc_warning("expected setf/setaf to be different");
++ } else if (same_color(set_foreground, set_a_foreground, max_colors)) {
++ _nc_warning("setf/setaf are equivalent");
++ }
++ }
+
+ if (VALID_STRING(set_background)
+- && VALID_STRING(set_a_background)
+- && !_nc_capcmp(set_background, set_a_background))
+- _nc_warning("expected setb/setab to be different");
++ && VALID_STRING(set_a_background)) {
++ if (!_nc_capcmp(set_background, set_a_background)) {
++ _nc_warning("expected setb/setab to be different");
++ } else if (same_color(set_background, set_a_background, max_colors)) {
++ _nc_warning("setb/setab are equivalent");
++ }
++ }
+
+ /* see: has_colors() */
+ if (VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs)
+- && (((set_foreground != NULL)
+- && (set_background != NULL))
+- || ((set_a_foreground != NULL)
+- && (set_a_background != NULL))
++ && ((VALID_STRING(set_foreground)
++ && VALID_STRING(set_background))
++ || (VALID_STRING(set_a_foreground)
++ && VALID_STRING(set_a_background))
+ || set_color_pair)) {
+ if (!VALID_STRING(orig_pair) && !VALID_STRING(orig_colors))
+ _nc_warning("expected either op/oc string for resetting colors");
+@@ -2075,7 +2104,7 @@
+ myParam(9));
+ break;
+ }
+- return result;
++ return strdup(result);
+ }
+
+ #define IsDelay(ch) ((ch) == '.' || isdigit(UChar(ch)))
+@@ -2227,7 +2256,8 @@
+ || !strcmp(name, "setb")
+ || !strcmp(name, "setaf")
+ || !strcmp(name, "setab")) {
+- limit = max_colors;
++ if ((limit = max_colors) > 16)
++ limit = 16;
+ }
+ for (count = 0; count < limit; ++count) {
+ char *ti_check = check_1_infotocap(name, ti_value, count);
+@@ -2243,6 +2273,8 @@
+ _nc_warning("tparm-conversion of %s(%d) differs
between\n\tterminfo %s\n\ttermcap %s",
+ name, count, ti_check, tc_check);
+ }
++ free(ti_check);
++ free(tc_check);
+ }
+ } else if (params == 0 && !same_ti_tc(ti_value, tc_value, &embedded)) {
+ if (embedded) {
