ncurses 6.1 - patch 20190302

+ corrected some of the undocumented terminfo names in Caps.hpux11
+ add "Caps-ncurses" file to help with checking inconsistencies in some
  user-defined capabilities.
+ amend check for repeat_char to handle a case where setlocale() was
  called after initscr() (report by "Ampera").

diff --git a/Ada95/make-tar.sh b/Ada95/make-tar.sh
index 1b5165618040d502f07af42f7d932846ae7d6457..fbedca72e23840c207d34fdac6d57907d64d0654 100755 (executable)
--- a/Ada95/make-tar.sh
+++ b/Ada95/make-tar.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: make-tar.sh,v 1.16 2017/08/12 12:22:06 tom Exp $
+# $Id: make-tar.sh,v 1.17 2019/03/02 22:51:42 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 2010-2015,2017 Free Software Foundation, Inc.                #
+# Copyright (c) 2010-2017,2019 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -80,7 +80,7 @@ test -d ./Ada95 && cd ./Ada95
 SOURCE=`cd ..;pwd`
 
 BUILD=$TMPDIR/make-tar$$
 SOURCE=`cd ..;pwd`
 
 BUILD=$TMPDIR/make-tar$$

-trap "cd /; rm -rf $BUILD; exit 0" 0 1 2 3 15
+trap "cd /; rm -rf $BUILD; exit 0" EXIT INT QUIT TERM HUP

 
 umask 077
 if ! ( mkdir $BUILD )
 
 umask 077
 if ! ( mkdir $BUILD )

diff --git a/MANIFEST b/MANIFEST
index 6e4e56cb63dfc0a21384650ef8e2399d9ee356b3..1f03f57f22cae98d807b63f567b9ab87834b9cce 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -533,6 +533,7 @@
 ./form/llib-lformw
 ./form/modules
 ./include/Caps
 ./form/llib-lformw
 ./form/modules
 ./include/Caps

+./include/Caps-ncurses

 ./include/Caps.aix4
 ./include/Caps.hpux11
 ./include/Caps.keys
 ./include/Caps.aix4
 ./include/Caps.hpux11
 ./include/Caps.keys

diff --git a/NEWS b/NEWS
index 5aac7b72ac626e9cab4aec3316b1671e5e42327a..5e0ff3706df2fa6402dd3914b1c553452acb0915 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.3278 2019/02/23 22:52:48 tom Exp $
+-- $Id: NEWS,v 1.3283 2019/03/03 01:12:40 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20190302
+       + corrected some of the undocumented terminfo names in Caps.hpux11
+       + add "Caps-ncurses" file to help with checking inconsistencies in some
+         user-defined capabilities.
+       + amend check for repeat_char to handle a case where setlocale() was
+         called after initscr() (report by "Ampera").
+

 20190223
        + fix typo in adds200 -TD
        + add tic check for consistent alternate character set capabilities.
 20190223
        + fix typo in adds200 -TD
        + add tic check for consistent alternate character set capabilities.

diff --git a/VERSION b/VERSION
index 09faf76f8df8da53d01c917da981408696cbed01..ebda0ff5c08e6633926398824e8755f9e65d9b29 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.1     20190223
+5:0:10 6.1     20190302

diff --git a/dist.mk b/dist.mk
index e51afa36036a953c2d6dc53d8749fb50bbe5180e..718d3d52fb9aa8b015b8b9763f2328eba470d41c 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.1268 2019/02/23 16:29:00 tom Exp $
+# $Id: dist.mk,v 1.1270 2019/02/28 00:12:30 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 1
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 1

-NCURSES_PATCH = 20190223
+NCURSES_PATCH = 20190302

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/include/Caps-ncurses b/include/Caps-ncurses
new file mode 100644 (file)
index 0000000..7577e77
--- /dev/null
+++ b/include/Caps-ncurses
@@ -0,0 +1,145 @@
+##############################################################################
+# Copyright (c) 2019 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 "Software"), #
+# to deal in the Software without restriction, including without limitation  #
+# the rights to use, copy, modify, merge, publish, distribute, distribute    #
+# with modifications, sublicense, and/or sell copies of the Software, and to #
+# permit persons to whom the Software is furnished to do so, subject to the  #
+# following conditions:                                                      #
+#                                                                            #
+# The above copyright notice and this permission notice shall be included in #
+# all copies or substantial portions of the Software.                        #
+#                                                                            #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
+# DEALINGS IN THE SOFTWARE.                                                  #
+#                                                                            #
+# Except as contained in this notice, the name(s) of the above copyright     #
+# holders shall not be used in advertising or otherwise to promote the sale, #
+# use or other dealings in this Software without prior written               #
+# authorization.                                                             #
+##############################################################################
+#
+# Author: Thomas E. Dickey
+#
+# $Id: Caps-ncurses,v 1.2 2019/03/02 22:46:09 tom Exp $
+#
+# This is a table of ncurses user-definable capabilities which applications
+# developers may have used.  ncurses may use the table to check consistency of
+# types/parameters.  Applications may have defined others (such as screen's
+# LP and NF), but where a standard capability is available, those alternatives
+# are not listed here.
+#
+used_by ncurses
+userdef        E3      str     -       clears the terminal's scrollback buffer.
+userdef        RGB     bool    -       use direct colors with 1/3 of color-pair bits per color.
+userdef        RGB     num     n       use direct colors with given number of bits per color.
+userdef        RGB     str     nnn     use direct colors with given bit-layout.
+userdef        TS      str     -       like "tsl", but uses no parameter.
+userdef        U8      num     n       terminal does/does not support VT100 SI/SO when processing UTF-8 encoding.
+userdef        XM      str     -       initialize alternate xterm mouse mode
+userdef        grbom   str     -       disable real bold (not intensity bright) mode.
+userdef        gsbom   str     -       enable real bold (not intensity bright) mode.
+userdef        xm      str     -       mouse response, no parameters
+userdef        xm      str     n       mouse response, p1 = y-ordinate
+userdef        xm      str     nn      mouse response, p2 = x-ordinate
+userdef        xm      str     nnn     mouse response, p3 = button
+userdef        xm      str     nnns    mouse response, p4 = state, e.g., pressed or released
+userdef        xm      str     nnnsn   mouse response, p6 = y-ordinate starting region
+userdef        xm      str     nnnsnn  mouse response, p7 = x-ordinate starting region
+userdef        xm      str     nnnsnnn mouse response, p8 = y-ordinate ending region
+userdef        xm      str     nnnsnnnn        mouse response, p9 = x-ordinate ending region
+#
+used_by screen
+userdef        AN      bool    -       turn on autonuke.
+userdef        AX      bool    -       understands ANSI set default fg/bg color (\E[39m / \E[49m).
+userdef        C0      str     -       use the string as a conversion table for font '0', like acsc.
+userdef        C8      bool    -       terminal shows bold as high-intensity colors.
+userdef        CE      str     -       switch cursor-keys back to normal mode.
+userdef        CS      str     -       switch cursor-keys to application mode.
+userdef        E0      str     -       switch charset 'G0' back to standard charset. Default is '\E(B'.
+userdef        G0      bool    -       terminal can deal with ISO 2022 font selection sequences.
+userdef        KJ      str     s       set the encoding of the terminal.
+userdef        OL      num     n       set the screen program's output buffer limit.
+userdef        S0      str     s       switch charset 'G0' to the specified charset. Default is '\E(%.'.
+userdef        TF      bool    -       add missing capabilities to screen's termcap/info entry. (Set by default).
+userdef        WS      str     nn      resize display. This capability has the desired width and height as arguments. SunView(tm) example: '\E[8;%d;%dt'.
+userdef        XC      str     s       describe a translation of characters to strings depending on the current font.
+userdef        XT      bool    -       terminal understands special xterm sequences (OSC, mouse tracking).
+userdef        Z0      str     -       change width to 132 columns.
+userdef        Z1      str     -       change width to 80 columns.
+#
+used_by tmux
+userdef        Cr      str     -       restore the default cursor color.
+userdef        Cs      str     s       set the cursor color.
+userdef        Csr     str     n       change the cursor style, overriding Ss.
+userdef        Ms      str     ss      store the current buffer in the host terminal's selection (clipboard).
+userdef        Se      str     -       reset the cursor style to the terminal initial state.
+userdef        Smulx   str     n       modify the appearance of underlines in VTE.
+userdef        Ss      str     n       change the cursor style.
+userdef        rmxx    str     -       reset ECMA-48 strikeout/crossed-out attributes.
+userdef        smxx    str     -       set ECMA-48 strikeout/crossed-out attributes.
+#
+used_by xterm
+userdef        kDC3    str     -       alt delete-character
+userdef        kDC4    str     -       shift+alt delete-character
+userdef        kDC5    str     -       control delete-character
+userdef        kDC6    str     -       shift+control delete-character
+userdef        kDC7    str     -       alt+control delete-character
+userdef        kDN     str     -       shift down-cursor
+userdef        kDN3    str     -       alt down-cursor
+userdef        kDN4    str     -       shift+alt down-cursor
+userdef        kDN5    str     -       control down-cursor
+userdef        kDN6    str     -       shift+control down-cursor
+userdef        kDN7    str     -       alt+control down-cursor
+userdef        kEND3   str     -       alt end
+userdef        kEND4   str     -       shift+alt end
+userdef        kEND5   str     -       control end
+userdef        kEND6   str     -       shift+control end
+userdef        kEND7   str     -       alt+control end
+userdef        kHOM3   str     -       alt home
+userdef        kHOM4   str     -       shift+alt home
+userdef        kHOM5   str     -       control home
+userdef        kHOM6   str     -       shift+control home
+userdef        kHOM7   str     -       alt+control home
+userdef        kIC3    str     -       alt insert-character
+userdef        kIC4    str     -       shift+alt insert-character
+userdef        kIC5    str     -       control insert-character
+userdef        kIC6    str     -       shift+control insert-character
+userdef        kIC7    str     -       alt+control insert-character
+userdef        kLFT3   str     -       alt left-cursor
+userdef        kLFT4   str     -       shift+alt left-cursor
+userdef        kLFT5   str     -       control left-cursor
+userdef        kLFT6   str     -       shift+control left-cursor
+userdef        kLFT7   str     -       alt+control left-cursor
+userdef        kNXT3   str     -       alt next
+userdef        kNXT4   str     -       shift+alt next
+userdef        kNXT5   str     -       control next
+userdef        kNXT6   str     -       shift+control next
+userdef        kNXT7   str     -       alt+control next
+userdef        kPRV3   str     -       alt previous
+userdef        kPRV4   str     -       shift+alt previous
+userdef        kPRV5   str     -       control previous
+userdef        kPRV6   str     -       shift+control previous
+userdef        kPRV7   str     -       alt+control previous
+userdef        kRIT3   str     -       alt right-cursor
+userdef        kRIT4   str     -       shift+alt right-cursor
+userdef        kRIT5   str     -       control right-cursor
+userdef        kRIT6   str     -       shift+control right-cursor
+userdef        kRIT7   str     -       alt+control right-cursor
+userdef        kUP     str     -       shift up-cursor
+userdef        kUP3    str     -       alt up-cursor
+userdef        kUP4    str     -       shift+alt up-cursor
+userdef        kUP5    str     -       control up-cursor
+userdef        kUP6    str     -       shift+control up-cursor
+userdef        kUP7    str     -       alt+control up-cursor
+userdef        ka2     str     -       vt220-keypad extensions
+userdef        kb1     str     -       vt220-keypad extensions
+userdef        kb3     str     -       vt220-keypad extensions
+userdef        kc2     str     -       vt220-keypad extensions

diff --git a/include/Caps.hpux11 b/include/Caps.hpux11
index 411d8dcaf3dfc7b0b8b9a74cb9f35a5ae74690cc..e034b3f9b9a74be24716b135a12965a8fd1a7dc8 100644 (file)
--- a/include/Caps.hpux11
+++ b/include/Caps.hpux11
@@ -1,5 +1,5 @@
 ##############################################################################
 ##############################################################################

-# Copyright (c) 2002-2015,2016 Free Software Foundation, Inc.                #
+# Copyright (c) 2002-2016,2019 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -28,7 +28,7 @@
 #
 # Author: Thomas Dickey
 #
 #
 # Author: Thomas Dickey
 #

-# $Id: Caps.hpux11,v 1.8 2016/08/13 17:45:50 tom Exp $
+# $Id: Caps.hpux11,v 1.9 2019/03/03 01:11:38 tom Exp $

 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with HPUX 11.x's terminfo.
 #
 # This is an adaptation of ncurses' termcap/terminfo capability table, which
 # is designed to align with HPUX 11.x's terminfo.


@@ -771,12 +771,12 @@ enter_right_hl_mode               erhlm   str     Xr      -               -       -----   Enter right highlight mode
 enter_top_hl_mode              ethlm   str     Xt      -               -       -----   Enter top highlight mode
 enter_vertical_hl_mode         evhlm   str     Xv      -               -       -----   Enter vertical highlight mode
 set_a_attributes               sgr1    str     sA      -               -       -----   Define second set of video attributes #1-#6
 enter_top_hl_mode              ethlm   str     Xt      -               -       -----   Enter top highlight mode
 enter_vertical_hl_mode         evhlm   str     Xv      -               -       -----   Enter vertical highlight mode
 set_a_attributes               sgr1    str     sA      -               -       -----   Define second set of video attributes #1-#6

-exit_horizontal_hl_mode        rhhlm   str     XH      -               -       ----K   Exit horizontal highlight mode
-exit_left_hl_mode              rlhlm   str     XL      -               -       ----K   Exit left highlight mode
-exit_low_hl_mode               rlohlm  str     XO      -               -       ----K   Exit low highlight mode
-exit_right_hl_mode             rrhlm   str     XR      -               -       ----K   Exit right highlight mode
-exit_top_hl_mode               rthlm   str     XT      -               -       ----K   Exit top highlight mode
-exit_vertical_hl_mode          rvhlm   str     XV      -               -       ----K   Exit vertical highlight mode
+exit_horizontal_hl_mode        rmhhlm  str     XH      -               -       ----K   Exit horizontal highlight mode
+exit_left_hl_mode              rmlhlm  str     XL      -               -       ----K   Exit left highlight mode
+exit_low_hl_mode               rmlohlm str     XO      -               -       ----K   Exit low highlight mode
+exit_right_hl_mode             rmrhlm  str     XR      -               -       ----K   Exit right highlight mode
+exit_top_hl_mode               rmthlm  str     XT      -               -       ----K   Exit top highlight mode
+exit_vertical_hl_mode          rmvhlm  str     XV      -               -       ----K   Exit vertical highlight mode

 #%.TE
 #%.ad
 #
 #%.TE
 #%.ad
 #

diff --git a/include/MKkey_defs.sh b/include/MKkey_defs.sh
index f8b7d19cd6b5dd063a69751eca3503334e33835e..56c1f36566604e8b257e127e25bbf3ceeaed6e89 100755 (executable)
--- a/include/MKkey_defs.sh
+++ b/include/MKkey_defs.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 #! /bin/sh

-# $Id: MKkey_defs.sh,v 1.16 2017/08/12 12:22:06 tom Exp $
+# $Id: MKkey_defs.sh,v 1.17 2019/03/02 22:51:42 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 2001-2013,2017 Free Software Foundation, Inc.                #
+# Copyright (c) 2001-2017,2019 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -42,7 +42,7 @@ pass1=pass1_$$
 pass2=pass2_$$
 pass3=pass3_$$
 pass4=pass4_$$
 pass2=pass2_$$
 pass3=pass3_$$
 pass4=pass4_$$

-trap 'rm -f $data pass[1234]_$$' 0 1 2 3 15
+trap 'rm -f $data pass[1234]_$$' EXIT INT QUIT TERM HUP

 
 # change repeated tabs (used for readability) to single tabs (needed to make
 # awk see the right field alignment of the corresponding columns):
 
 # change repeated tabs (used for readability) to single tabs (needed to make
 # awk see the right field alignment of the corresponding columns):

diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in
index 49c01d9df0f54aa8764a92b2453e896d478c86e2..2c4c6d44eb3a08b260810486d1ccba3e85ea2598 100644 (file)
--- a/include/MKterm.h.awk.in
+++ b/include/MKterm.h.awk.in
@@ -26,7 +26,7 @@ BEGIN {
        lcurl = "{";
        rcurl = "}";
        print  "/****************************************************************************"
        lcurl = "{";
        rcurl = "}";
        print  "/****************************************************************************"

-       print  " * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *"
+       print  " * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *"

        print  " *                                                                          *"
        print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
        print  " * copy of this software and associated documentation files (the            *"
        print  " *                                                                          *"
        print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
        print  " * copy of this software and associated documentation files (the            *"


@@ -59,7 +59,7 @@ BEGIN {
        print  "/*    and: Thomas E. Dickey                        1995-on                  */"
        print  "/****************************************************************************/"
        print  ""
        print  "/*    and: Thomas E. Dickey                        1995-on                  */"
        print  "/****************************************************************************/"
        print  ""

-       print  "/* $Id: MKterm.h.awk.in,v 1.69 2018/06/23 21:35:06 tom Exp $ */"
+       print  "/* $Id: MKterm.h.awk.in,v 1.70 2019/03/02 23:23:58 tom Exp $ */"

        print  ""
        print  "/*"
        print  "**      term.h -- Definition of struct term"
        print  ""
        print  "/*"
        print  "**      term.h -- Definition of struct term"


@@ -168,9 +168,10 @@ $2 == "%%-STOP-HERE-%%" {
        print  "#ifdef __INTERNAL_CAPS_VISIBLE"
 }
 
        print  "#ifdef __INTERNAL_CAPS_VISIBLE"
 }
 

-/^#/ {
-       next;
-}
+/^#/ { next; }
+
+/^used_by/ { next ; }
+/^userdef/ { next ; }

 
 $1 == "acs_chars" {
        acsindex = StringCount;
 
 $1 == "acs_chars" {
        acsindex = StringCount;

diff --git a/include/Makefile.in b/include/Makefile.in
index cfa9876e484934cf9c473111572023c703e2058e..0faf7a89d9d0e25d50780b04349e0ce57493ef46 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.43 2015/08/05 09:25:55 tom Exp $
+# $Id: Makefile.in,v 1.45 2019/03/03 01:41:21 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2013,2015 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2015,2019 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -66,6 +66,8 @@ VERSION               = @cf_cv_rel_version@
 # The "Caps" file specifies the terminfo database format, as well as the list
 # of function keys.
 TERMINFO_CAPS  = $(srcdir)/@TERMINFO_CAPS@
 # The "Caps" file specifies the terminfo database format, as well as the list
 # of function keys.
 TERMINFO_CAPS  = $(srcdir)/@TERMINFO_CAPS@

+CAPLIST        =       $(TERMINFO_CAPS) \
+               $(srcdir)/Caps-ncurses

 
 # These files are generated by the configure script
 CONFIG_SRC = \
 
 # These files are generated by the configure script
 CONFIG_SRC = \


@@ -91,27 +93,30 @@ depend \
 sources \
 install ::     $(AUTO_SRC)
 
 sources \
 install ::     $(AUTO_SRC)
 

-curses.h : $(TERMINFO_CAPS) \
+curses.h :     $(CAPLIST) \

                curses.head \
                $(srcdir)/curses.tail \
                $(srcdir)/MKkey_defs.sh
        cat curses.head >$@
                curses.head \
                $(srcdir)/curses.tail \
                $(srcdir)/MKkey_defs.sh
        cat curses.head >$@

-       AWK=$(AWK) $(SHELL) $(srcdir)/MKkey_defs.sh $(TERMINFO_CAPS) >>$@
+       AWK=$(AWK) $(SHELL) $(srcdir)/MKkey_defs.sh $(CAPLIST) >>$@

        $(SHELL) -c 'if test "@NCURSES_CH_T@" = "cchar_t" ; then cat $(srcdir)/curses.wide >>$@ ; fi'
        cat $(srcdir)/curses.tail >>$@
 
        $(SHELL) -c 'if test "@NCURSES_CH_T@" = "cchar_t" ; then cat $(srcdir)/curses.wide >>$@ ; fi'
        cat $(srcdir)/curses.tail >>$@
 

-term.h: $(TERMINFO_CAPS) MKterm.h.awk
-       $(AWK) -f MKterm.h.awk $(TERMINFO_CAPS) > $@
+term.h:        $(CAPLIST) \
+               MKterm.h.awk
+       $(AWK) -f MKterm.h.awk $(CAPLIST) > $@

        $(SHELL) $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@
 
        $(SHELL) $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@
 

-hashsize.h: $(TERMINFO_CAPS) $(srcdir)/MKhashsize.sh
-       $(SHELL) $(srcdir)/MKhashsize.sh $(TERMINFO_CAPS) >$@
+hashsize.h:    $(CAPLIST) \
+               $(srcdir)/MKhashsize.sh
+       $(SHELL) $(srcdir)/MKhashsize.sh $(CAPLIST) >$@

 
 ncurses_def.h: $(srcdir)/ncurses_defs $(srcdir)/MKncurses_def.sh
        AWK=$(AWK) $(SHELL) $(srcdir)/MKncurses_def.sh $(srcdir)/ncurses_defs >$@
 
 
 ncurses_def.h: $(srcdir)/ncurses_defs $(srcdir)/MKncurses_def.sh
        AWK=$(AWK) $(SHELL) $(srcdir)/MKncurses_def.sh $(srcdir)/ncurses_defs >$@
 

-parametrized.h: $(TERMINFO_CAPS) $(srcdir)/MKparametrized.sh
-       AWK=$(AWK) $(SHELL) $(srcdir)/MKparametrized.sh $(TERMINFO_CAPS) >$@
+parametrized.h: $(CAPLIST) \
+               $(srcdir)/MKparametrized.sh
+       AWK=$(AWK) $(SHELL) $(srcdir)/MKparametrized.sh $(CAPLIST) >$@

 
 # This is required by pthread.h on MinGW
 config.h:
 
 # This is required by pthread.h on MinGW
 config.h:

diff --git a/man/MKterminfo.sh b/man/MKterminfo.sh
index 4d9ae18c91174ac1c58ba26a1efcde83783cf55a..7c0378cdcfdd017396d0e368cc428e11ecab6462 100755 (executable)
--- a/man/MKterminfo.sh
+++ b/man/MKterminfo.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: MKterminfo.sh,v 1.16 2018/03/17 18:03:51 Kir.Kolyshkin Exp $
+# $Id: MKterminfo.sh,v 1.17 2019/03/02 22:18:27 tom Exp $

 #
 # MKterminfo.sh -- generate terminfo.5 from Caps tabular data
 #
 #***************************************************************************
 #
 # MKterminfo.sh -- generate terminfo.5 from Caps tabular data
 #
 #***************************************************************************

-# Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+# Copyright (c) 1998-2018,2019 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            *
 #                                                                          *
 # Permission is hereby granted, free of charge, to any person obtaining a  *
 # copy of this software and associated documentation files (the            *


@@ -50,15 +50,21 @@ if test "${LC_COLLATE+set}"  = set; then LC_COLLATE=C;  export LC_COLLATE;  fi
 
 #
 head=$1
 
 #
 head=$1

-caps=$2
-tail=$3
-cat <<'EOF'
-'\" t
-.\" DO NOT EDIT THIS FILE BY HAND!
-.\" It is generated from terminfo.head, Caps, and terminfo.tail.
-.\"
-.\" Note: this must be run through tbl before nroff.
-.\" The magic cookie on the first line triggers this under some man programs.
+shift 1
+caps=
+while test $# -gt 1
+do
+       caps="$caps $1"
+       shift 1
+done
+tail=$1
+cat <<EOF
+'\\" t
+.\\" DO NOT EDIT THIS FILE BY HAND!
+.\\" It is generated from terminfo.head, $caps, and terminfo.tail.
+.\\"
+.\\" Note: this must be run through tbl before nroff.
+.\\" The magic cookie on the first line triggers this under some man programs.

 EOF
 cat $head
 
 EOF
 cat $head
 


@@ -68,7 +74,7 @@ unsorted=unsorted$$
 trap "code=\$?; rm -f $sorted $temp $unsorted; exit \$code" EXIT HUP INT QUIT TERM
 rm -f $sorted $temp $unsorted
 
 trap "code=\$?; rm -f $sorted $temp $unsorted; exit \$code" EXIT HUP INT QUIT TERM
 rm -f $sorted $temp $unsorted
 

-sed -n <$caps "\
+cat $caps | sed -n "\

 /%%-STOP-HERE-%%/q
 /^#%center/s, expand,,
 /^#%lw25/s, lw6 , lw7 ,
 /%%-STOP-HERE-%%/q
 /^#%center/s, expand,,
 /^#%lw25/s, lw6 , lw7 ,

diff --git a/man/Makefile.in b/man/Makefile.in
index 478c3989f71dc8fe1dc6c1b4f81a1020ad5ca086..8f6b27126fa7e6f9838a38d3f0e74e08f38fff80 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.48 2015/08/05 23:15:41 tom Exp $
+# $Id: Makefile.in,v 1.49 2019/03/02 22:18:27 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2013,2015 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2015,2019 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -68,8 +68,13 @@ uninstall uninstall.man :
        -$(SHELL) ../edit_man.sh normal removing $(EDITARGS)
 
 # We compose terminfo.5 from the real sources...
        -$(SHELL) ../edit_man.sh normal removing $(EDITARGS)
 
 # We compose terminfo.5 from the real sources...

-CAPLIST=$(srcdir)/../include/@TERMINFO_CAPS@
-terminfo.5: $(srcdir)/terminfo.head $(CAPLIST) $(srcdir)/terminfo.tail Makefile $(srcdir)/MKterminfo.sh
+CAPLIST        = \
+       $(srcdir)/../include/@TERMINFO_CAPS@ \
+       $(srcdir)/../include/Caps-ncurses
+terminfo.5: $(srcdir)/terminfo.head \
+               $(CAPLIST) \
+               $(srcdir)/terminfo.tail \
+               Makefile $(srcdir)/MKterminfo.sh

        $(SHELL) $(srcdir)/MKterminfo.sh $(srcdir)/terminfo.head $(CAPLIST) $(srcdir)/terminfo.tail >terminfo.5
 
 mostlyclean :
        $(SHELL) $(srcdir)/MKterminfo.sh $(srcdir)/terminfo.head $(CAPLIST) $(srcdir)/terminfo.tail >terminfo.5
 
 mostlyclean :

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index be9cb1991d0a2e3229b75bc1771fb04ad448f29d..0740f2577edb039fbdf104f78b45eda6190f5105 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.156 2018/03/01 17:37:19 tom Exp $
+# $Id: Makefile.in,v 1.157 2019/03/02 22:18:27 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2018,2019 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -155,6 +155,7 @@ FALLBACK_LIST       = @FALLBACK_LIST@
 
 USE_BIG_STRINGS        = @USE_BIG_STRINGS@
 TERMINFO_CAPS  = $(top_srcdir)/include/@TERMINFO_CAPS@
 
 USE_BIG_STRINGS        = @USE_BIG_STRINGS@
 TERMINFO_CAPS  = $(top_srcdir)/include/@TERMINFO_CAPS@

+CAPLIST                = $(TERMINFO_CAPS) $(top_srcdir)/include/Caps-ncurses

 
 TERMINFO       = @TERMINFO@
 TERMINFO_SRC   = @TERMINFO_SRC@
 
 TERMINFO       = @TERMINFO@
 TERMINFO_SRC   = @TERMINFO_SRC@


@@ -228,7 +229,7 @@ init_keytry.h: make_keys$(BUILD_EXEEXT) keys.list
        ./make_keys$(BUILD_EXEEXT) keys.list > $@
 
 keys.list :    $(tinfo)/MKkeys_list.sh
        ./make_keys$(BUILD_EXEEXT) keys.list > $@
 
 keys.list :    $(tinfo)/MKkeys_list.sh

-       AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | LC_ALL=C sort >$@
+       AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(CAPLIST) | LC_ALL=C sort >$@

 
 make_keys$(BUILD_EXEEXT) : \
                $(tinfo)/make_keys.c \
 
 make_keys$(BUILD_EXEEXT) : \
                $(tinfo)/make_keys.c \


@@ -254,16 +255,16 @@ report_offsets$(BUILD_EXEEXT) : \
                ../include/hashsize.h \
                $(tinfo)/MKcaptab.sh \
                $(tinfo)/MKcaptab.awk
                ../include/hashsize.h \
                $(tinfo)/MKcaptab.sh \
                $(tinfo)/MKcaptab.awk

-       $(SHELL) -e $(tinfo)/MKcaptab.sh $(AWK) $(USE_BIG_STRINGS) $(tinfo)/MKcaptab.awk $(srcdir)/../include/@TERMINFO_CAPS@ > $@
+       $(SHELL) -e $(tinfo)/MKcaptab.sh $(AWK) $(USE_BIG_STRINGS) $(tinfo)/MKcaptab.awk $(CAPLIST) > $@

 
 ./lib_keyname.c: keys.list $(base)/MKkeyname.awk
        $(AWK) -f $(base)/MKkeyname.awk bigstrings=$(USE_BIG_STRINGS) keys.list > $@
 
 ./codes.c: $(tinfo)/MKcodes.awk
 
 ./lib_keyname.c: keys.list $(base)/MKkeyname.awk
        $(AWK) -f $(base)/MKkeyname.awk bigstrings=$(USE_BIG_STRINGS) keys.list > $@
 
 ./codes.c: $(tinfo)/MKcodes.awk

-       $(AWK) -f $(tinfo)/MKcodes.awk bigstrings=$(USE_BIG_STRINGS) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
+       $(AWK) -f $(tinfo)/MKcodes.awk bigstrings=$(USE_BIG_STRINGS) $(CAPLIST) >$@

 
 ./names.c: $(tinfo)/MKnames.awk
 
 ./names.c: $(tinfo)/MKnames.awk

-       $(AWK) -f $(tinfo)/MKnames.awk bigstrings=$(USE_BIG_STRINGS) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
+       $(AWK) -f $(tinfo)/MKnames.awk bigstrings=$(USE_BIG_STRINGS) $(CAPLIST) >$@

 
 ./unctrl.c: $(base)/MKunctrl.awk
        echo | $(AWK) -f $(base)/MKunctrl.awk bigstrings=$(USE_BIG_STRINGS) >$@
 
 ./unctrl.c: $(base)/MKunctrl.awk
        echo | $(AWK) -f $(base)/MKunctrl.awk bigstrings=$(USE_BIG_STRINGS) >$@

diff --git a/ncurses/tinfo/MKkeys_list.sh b/ncurses/tinfo/MKkeys_list.sh
index b669eecce3aa60271e860e8814323e62a6f3328c..158e34d25538df5fbbe4fe62da1448e3467c9b63 100755 (executable)
--- a/ncurses/tinfo/MKkeys_list.sh
+++ b/ncurses/tinfo/MKkeys_list.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 #! /bin/sh

-# $Id: MKkeys_list.sh,v 1.5 2017/08/12 12:22:06 tom Exp $
+# $Id: MKkeys_list.sh,v 1.6 2019/03/02 22:47:33 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 2001-2003,2017 Free Software Foundation, Inc.                #
+# Copyright (c) 2001-2017,2019 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -35,11 +35,16 @@
 # Extract function-key names from the Caps file
 #
 : ${AWK-awk}
 # Extract function-key names from the Caps file
 #
 : ${AWK-awk}

-DATA=${1-../../include/Caps}
+if test $# != 0
+then
+       DATA="$*"
+else
+       DATA=../../include/Caps
+fi

 
 data=data$$
 
 data=data$$

-trap 'rm -f $data' 0 1 2 3 15
-sed -e 's/[    ][      ]*/     /g' < $DATA >$data
+trap 'rm -f $data' EXIT INT QUIT TERM HUP
+cat $DATA | sed -e 's/[        ][      ]*/     /g' >$data

 
 cat <<EOF
 # These definitions were generated by $0 $DATA
 
 cat <<EOF
 # These definitions were generated by $0 $DATA


@@ -53,6 +58,7 @@ ${AWK-awk} <$data '
 /^#/           {next;}
 /^capalias/    {next;}
 /^infoalias/   {next;}
 /^#/           {next;}
 /^capalias/    {next;}
 /^infoalias/   {next;}

+/^userdef/     {next;}

 
 $5 != "-" {
                if (substr($5, 1, 4) == "KEY_" ) {
 
 $5 != "-" {
                if (substr($5, 1, 4) == "KEY_" ) {

diff --git a/ncurses/tty/MKexpanded.sh b/ncurses/tty/MKexpanded.sh
index fb4336fc0e10213e08926827f28fcdc2646c4bdd..89e747416d01b9f3d7486b03d2a5bae06aa10031 100755 (executable)
--- a/ncurses/tty/MKexpanded.sh
+++ b/ncurses/tty/MKexpanded.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 ##############################################################################
 #! /bin/sh
 ##############################################################################

-# Copyright (c) 1998-2015,2017 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2017,2019 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -29,7 +29,7 @@
 #
 # Author: Thomas E. Dickey, 1997-on
 #
 #
 # Author: Thomas E. Dickey, 1997-on
 #

-# $Id: MKexpanded.sh,v 1.20 2017/08/12 12:20:28 tom Exp $
+# $Id: MKexpanded.sh,v 1.21 2019/03/02 22:47:55 tom Exp $

 #
 # Script to generate 'expanded.c', a dummy source that contains functions
 # corresponding to complex macros used in this library.  By making functions,
 #
 # Script to generate 'expanded.c', a dummy source that contains functions
 # corresponding to complex macros used in this library.  By making functions,


@@ -48,7 +48,7 @@ else
 fi
 
 TMP=gen$$.c
 fi
 
 TMP=gen$$.c

-trap "rm -f $TMP" 0 1 2 3 15
+trap "rm -f $TMP" EXIT INT QUIT TERM HUP

 
 cat <<EOF
 /* generated by MKexpanded.sh */
 
 cat <<EOF
 /* generated by MKexpanded.sh */

diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c
index 17f641136d8ac165c0e77df8021cfed92cbd4b68..b86dfe4eb9f8f414030177abee3ecad45723a60a 100644 (file)
--- a/ncurses/tty/tty_update.c
+++ b/ncurses/tty/tty_update.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -84,7 +84,7 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-MODULE_ID("$Id: tty_update.c,v 1.299 2018/09/08 21:33:59 tom Exp $")
+MODULE_ID("$Id: tty_update.c,v 1.300 2019/02/25 21:42:01 tom Exp $")

 
 /*
  * This define controls the line-breakout optimization.  Every once in a
 
 /*
  * This define controls the line-breakout optimization.  Every once in a


@@ -686,8 +686,9 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
            } else if (repeat_char != 0 &&
 #if USE_WIDEC_SUPPORT
                       (!SP_PARM->_screen_unicode &&
            } else if (repeat_char != 0 &&
 #if USE_WIDEC_SUPPORT
                       (!SP_PARM->_screen_unicode &&

-                       ((AttrOf(ntext0) & A_ALTCHARSET) == 0 ||
-                        (CharOf(ntext0) < ACS_LEN))) &&
+                       (CharOf(ntext0) < ((AttrOf(ntext0) & A_ALTCHARSET)
+                                          ? ACS_LEN
+                                          : 256))) &&

 #endif
                       runcount > SP_PARM->_rep_cost) {
                NCURSES_CH_T temp;
 #endif
                       runcount > SP_PARM->_rep_cost) {
                NCURSES_CH_T temp;

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 0d99aee4d37e5db6444b4fccd780242057c76d5a..2c8fc1b7cdfdaa5ab763f6835a59ec59741c55ad 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190223) unstable; urgency=low
+ncurses6 (6.1+20190302) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Feb 2019 11:29:00 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 27 Feb 2019 19:12:30 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 0d99aee4d37e5db6444b4fccd780242057c76d5a..2c8fc1b7cdfdaa5ab763f6835a59ec59741c55ad 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190223) unstable; urgency=low
+ncurses6 (6.1+20190302) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Feb 2019 11:29:00 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 27 Feb 2019 19:12:30 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index 06a3a6f4ba6e73c073a6133557f4d050e441c905..d2f817ef1c0020011f104f782a51e9dcc7d4d674 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190223) unstable; urgency=low
+ncurses6 (6.1+20190302) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Feb 2019 11:29:00 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 27 Feb 2019 19:12:30 -0500

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index ba50be5cd0e06bc42f14f2510f476411e2fda010..a3a06e7ca9a5bb033e4f38aa57224d4c16dca363 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.315 2019/02/23 16:29:00 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.317 2019/02/28 00:12:30 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2019"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2019"\r

-!define VERSION_MMDD  "0223"\r
+!define VERSION_MMDD  "0302"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 353545863b0f23cd0144df622b08ae8d83654a62..0643e365b0b94c6542db8c46f51acbc904383062 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.1
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.1

-Release: 20190223
+Release: 20190302

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 77abab10268b3299011b6befb0e6af86d249a1c8..954b823c0c509e8df2295a12a8f4c9d21542beac 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1

-Release: 20190223
+Release: 20190302

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index 9921122076989d47d244dbbe8043f1a42e3450f1..27fbd956ac0e5630d2d577cea38a940ed88fbc7d 100644 (file)
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.1
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.1

-Release: 20190223
+Release: 20190302

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/progs/capconvert b/progs/capconvert
index 716203ae967e9095f96eef12c156b8f343dfe71c..25c5c45c01ed89a07cbaefcae6411fbb89115490 100755 (executable)
--- a/progs/capconvert
+++ b/progs/capconvert
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
 #!/bin/sh
 ##############################################################################

-# Copyright (c) 1998-2011,2017 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2017,2019 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: capconvert,v 1.6 2017/08/12 12:22:06 tom Exp $
+# $Id: capconvert,v 1.7 2019/03/02 22:51:42 tom Exp $

 #
 # capconvert -- automated conversion from termcap to terminfo
 #
 #
 # capconvert -- automated conversion from termcap to terminfo
 #


@@ -205,14 +205,14 @@ echo "OK, now I will make your private terminfo tree.  This may take a bit..."
 #
 # Kluge alert: we compile terminfo.src in two pieces because a lot of machines
 # with < 16MB RAM choke on tic's core-hog habits.
 #
 # Kluge alert: we compile terminfo.src in two pieces because a lot of machines
 # with < 16MB RAM choke on tic's core-hog habits.

-trap "rm -f tsplit$$.*" 0 1 2 3 15
+trap "rm -f tsplit$$.*" EXIT INT QUIT TERM HUP

 sed -n $master \
        -e '1,/SPLIT HERE/w 'tsplit$$.01 \
        -e '/SPLIT HERE/,$w 'tsplit$$.02 \
        2>/dev/null
 for x in tsplit$$.*; do eval $TIC $x; done
 rm tsplit$$.*
 sed -n $master \
        -e '1,/SPLIT HERE/w 'tsplit$$.01 \
        -e '/SPLIT HERE/,$w 'tsplit$$.02 \
        2>/dev/null
 for x in tsplit$$.*; do eval $TIC $x; done
 rm tsplit$$.*

-trap 0 1 2 3 15
+trap EXIT INT QUIT TERM HUP

 #
 echo "You now have a private tree under $HOME/.terminfo;"
 echo "the ncurses library will automatically read from it,"
 #
 echo "You now have a private tree under $HOME/.terminfo;"
 echo "the ncurses library will automatically read from it,"

diff --git a/test/make-tar.sh b/test/make-tar.sh
index a3d1779039430f4d2b1bc5dddf3bd2bc1e1f58a0..bfafa11a041bd25c19a68bcb4898a13e5ed4c8d9 100755 (executable)
--- a/test/make-tar.sh
+++ b/test/make-tar.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: make-tar.sh,v 1.14 2017/08/12 12:22:06 tom Exp $
+# $Id: make-tar.sh,v 1.15 2019/03/02 22:51:42 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 2010-2015,2017 Free Software Foundation, Inc.                #
+# Copyright (c) 2010-2017,2019 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -80,7 +80,7 @@ test -d ./test && cd ./test
 SOURCE=`cd ..;pwd`
 
 BUILD=$TMPDIR/make-tar$$
 SOURCE=`cd ..;pwd`
 
 BUILD=$TMPDIR/make-tar$$

-trap "cd /; rm -rf $BUILD; exit 0" 0 1 2 3 15
+trap "cd /; rm -rf $BUILD; exit 0" EXIT INT QUIT TERM HUP

 
 umask 077
 if ! ( mkdir $BUILD )
 
 umask 077
 if ! ( mkdir $BUILD )