22 files changed, 125 insertions, 45 deletions

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 4401f1a..ddce3cf 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200212) unstable; urgency=low
+ncurses6 (6.3+20211021) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 09 Feb 2020 18:35:50 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 20 Oct 2021 18:43:08 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw/compat b/package/debian-mingw/compat
index ec63514..f599e28 100644
--- a/package/debian-mingw/compat
+++ b/package/debian-mingw/compat
@@ -1 +1 @@
-9
+10
diff --git a/package/debian-mingw/copyright b/package/debian-mingw/copyright
index 1ce7099..a01b3ee 100644
--- a/package/debian-mingw/copyright
+++ b/package/debian-mingw/copyright
@@ -5,11 +5,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 1998-2019,2020 Free Software Foundation, Inc.
+Copyright: 2017-2020,2021 by Thomas E. Dickey
+Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 Licence: X11
 
 Files: aclocal.m4 package
-Copyright: 1996-2019,2020 by Thomas E. Dickey
+Copyright: 1996-2020,2021 by Thomas E. Dickey
 Licence: X11
 
 Files: doc/html/NCURSES-Programming-HOWTO.html
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 4401f1a..ddce3cf 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200212) unstable; urgency=low
+ncurses6 (6.3+20211021) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 09 Feb 2020 18:35:50 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 20 Oct 2021 18:43:08 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/compat b/package/debian-mingw64/compat
index ec63514..f599e28 100644
--- a/package/debian-mingw64/compat
+++ b/package/debian-mingw64/compat
@@ -1 +1 @@
-9
+10
diff --git a/package/debian-mingw64/copyright b/package/debian-mingw64/copyright
index 1ce7099..a01b3ee 100644
--- a/package/debian-mingw64/copyright
+++ b/package/debian-mingw64/copyright
@@ -5,11 +5,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 1998-2019,2020 Free Software Foundation, Inc.
+Copyright: 2017-2020,2021 by Thomas E. Dickey
+Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 Licence: X11
 
 Files: aclocal.m4 package
-Copyright: 1996-2019,2020 by Thomas E. Dickey
+Copyright: 1996-2020,2021 by Thomas E. Dickey
 Licence: X11
 
 Files: doc/html/NCURSES-Programming-HOWTO.html
diff --git a/package/debian/changelog b/package/debian/changelog
index 4bc6392..da9c2dc 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200212) unstable; urgency=low
+ncurses6 (6.3+20211021) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 09 Feb 2020 18:35:50 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 20 Oct 2021 18:43:08 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/debian/compat b/package/debian/compat
index ec63514..f599e28 100644
--- a/package/debian/compat
+++ b/package/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/package/debian/copyright b/package/debian/copyright
index 1ce7099..a01b3ee 100644
--- a/package/debian/copyright
+++ b/package/debian/copyright
@@ -5,11 +5,12 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 -------------------------------------------------------------------------------
 Files: *
-Copyright: 1998-2019,2020 Free Software Foundation, Inc.
+Copyright: 2017-2020,2021 by Thomas E. Dickey
+Copyright: 1998-2016,2017 Free Software Foundation, Inc.
 Licence: X11
 
 Files: aclocal.m4 package
-Copyright: 1996-2019,2020 by Thomas E. Dickey
+Copyright: 1996-2020,2021 by Thomas E. Dickey
 Licence: X11
 
 Files: doc/html/NCURSES-Programming-HOWTO.html
diff --git a/package/debian/rules b/package/debian/rules
index 06c088a..287c758 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Cristoph Lameter.
+# $Id: rules,v 1.41 2021/10/11 18:18:08 tom Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -69,6 +67,7 @@ configure = \
 		--enable-opaque-menu \
 		--enable-opaque-panel \
 		--enable-pc-files \
+		--enable-stdnoreturn \
 		--enable-warnings \
 		--enable-wgetch-events \
 		--enable-widec \
@@ -90,6 +89,7 @@ configure = \
 		--with-xterm-kbs=DEL \
 		--without-ada \
 		--without-debug \
+		--without-manpage-aliases \
 		--without-normal
 
 NCURSES6_DIR = $(CURDIR)/debian/ncurses6
@@ -120,14 +120,29 @@ build-arch: $(PACKAGES.arch:%=build-%-stamp)
 install-indep: $(PACKAGES.indep:%=install-%-stamp)
 install-arch: $(PACKAGES.arch:%=install-%-stamp)
 
-config-ncurses6-stamp:
+# make the doc-package installable by renaming everything to avoid clashing
+patch-ncurses6-stamp:
+	dh_testdir
+	sed -i.bak \
+		-e 's/-config\.1$$/dev-config.1/;t' \
+		-e 's/\.3ncurses$$/.3ncurses6/' \
+		-e 's/\.3curses$$/.3curses6/' \
+		-e 's/\.3form$$/.3form6/' \
+		-e 's/\.3menu$$/.3menu6/' \
+		-e 's/\.3panel$$/.3panel6/' \
+		-e 's/\.\([157]\)$$/6.\1/' \
+		man/man_db.renames
+	diff -u man/man_db.renames.bak man/man_db.renames || true
+	touch $@
+
+config-ncurses6-stamp: patch-ncurses6-stamp
 	dh_testdir
 	rm -rf t/ncurses6
 	mkdir -p t/ncurses6
 	cd t/ncurses6; $(configure)
 	touch $@
 
-config-ncursest6-stamp:
+config-ncursest6-stamp: patch-ncurses6-stamp
 	dh_testdir
 	rm -rf t/ncursest6
 	mkdir -p t/ncursest6
@@ -194,6 +209,8 @@ install-ncurses6-doc-stamp: build-ncurses6-stamp
 
 	$(MAKE) -C t/ncurses6 install.man DESTDIR=$(NCURSES6_DIR)-doc
 
+	cd $(NCURSES6_DIR)-doc/usr/share/man/man1 && ln -sf tset6.1.gz reset6.1.gz
+
 	touch $@
 
 HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/ncurses6-doc-html
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index f608756..cf26efb 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.377 2020/02/09 23:35:50 tom Exp $

+; $Id: mingw-ncurses.nsi,v 1.486 2021/10/20 22:43:08 tom Exp $

 

 ; TODO add examples

 ; TODO bump ABI to 6

@@ -8,9 +8,9 @@
 !define EXENAME "ncurses.exe"

 

 !define VERSION_MAJOR "6"

-!define VERSION_MINOR "2"

-!define VERSION_YYYY  "2020"

-!define VERSION_MMDD  "0212"

+!define VERSION_MINOR "3"

+!define VERSION_YYYY  "2021"

+!define VERSION_MMDD  "1021"

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}

 

 !define MY_ABI   "5"

@@ -32,7 +32,7 @@ CRCCheck on
 SetCompressor /SOLID lzma

 

 VIAddVersionKey ProductName "${SUBKEY}"

-VIAddVersionKey CompanyName "http://invisible-island.net"

+VIAddVersionKey CompanyName "https://invisible-island.net"

 VIAddVersionKey FileDescription "NCurses Installer (MinGW)"

 VIAddVersionKey FileVersion ${VERSION_FULL}

 VIAddVersionKey ProductVersion ${VERSION_FULL}

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index d529dfb..7dd1f8e 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -2,8 +2,8 @@
 
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
-Version: 6.2
-Release: 20200212
+Version: 6.3
+Release: 20211021
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.map b/package/ncurses.map
index 1c400de..7eb1ed1 100644
--- a/package/ncurses.map
+++ b/package/ncurses.map
@@ -1,4 +1,4 @@
-# $Id: ncurses.map,v 1.51 2020/02/04 11:44:12 tom Exp $
+# $Id: ncurses.map,v 1.55 2021/10/10 15:22:33 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -1206,6 +1206,14 @@ NCURSES_TINFO_6.2.20200212 {
 		_nc_wacs_width;
 		curses_trace;
 		exit_terminfo;
+} NCURSES_TINFO_6.1.20171230;
+
+NCURSES_TINFO_6.2.20211010 {
+	global:
+		_nc_reset_tparm;
+		_nc_safe_fopen;
+		_nc_safe_open3;
+		_nc_tiparm;
 	local:
 		_*;
-} NCURSES_TINFO_6.1.20171230;
+} NCURSES_TINFO_6.2.20200212;
diff --git a/package/ncurses.spec b/package/ncurses.spec
index b628790..e7d1945 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
-Version: 6.2
-Release: 20200212
+Version: 6.3
+Release: 20211021
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
@@ -77,7 +77,8 @@ This package is used for testing ABI %{MY_ABI}.
 	--enable-opaque-menu \\\
 	--enable-opaque-panel \\\
 	--enable-pc-files \\\
-	--enable-rpath \\\
+	--disable-rpath \\\
+	--enable-stdnoreturn \\\
 	--enable-warnings \\\
 	--enable-wgetch-events \\\
 	--enable-widec \\\
@@ -139,6 +140,9 @@ exit 0
 
 %changelog
 
+* Sat Oct 16 2021 Thomas Dickey
+- disable rpath to address QA_RPATHS=1 warning.
+
 * Tue Dec 24 2019 Thomas Dickey
 - drop custom CC_NORMAL warning flags because setting CFLAGS interferes with
   matching Fedora's PIE/PIC configuration.  Also, generate debug/debug-source
diff --git a/package/ncurses.sym b/package/ncurses.sym
index d9f8b93..d2f6fbc 100644
--- a/package/ncurses.sym
+++ b/package/ncurses.sym
@@ -1,4 +1,4 @@
-# $Id: ncurses.sym,v 1.35 2019/12/14 22:40:34 tom Exp $
+# $Id: ncurses.sym,v 1.37 2021/08/19 23:50:26 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -176,6 +176,7 @@ _nc_read_entry_source
 _nc_read_file_entry
 _nc_read_termtype
 _nc_reset_input
+_nc_reset_tparm
 _nc_resolve_uses
 _nc_resolve_uses2
 _nc_retrace_attr_t
@@ -192,6 +193,8 @@ _nc_retrace_void_ptr
 _nc_retrace_win
 _nc_ripoffline
 _nc_rootname
+_nc_safe_fopen
+_nc_safe_open3
 _nc_safe_strcat
 _nc_safe_strcpy
 _nc_screen_chain
@@ -220,6 +223,7 @@ _nc_tic_written
 _nc_timed_wait
 _nc_tinfo_fkeys
 _nc_tinfo_fkeysf
+_nc_tiparm
 _nc_tparm_analyze
 _nc_tparm_err
 _nc_tputs_trace
diff --git a/package/ncursest.map b/package/ncursest.map
index 643dc8e..205265d 100644
--- a/package/ncursest.map
+++ b/package/ncursest.map
@@ -1,4 +1,4 @@
-# $Id: ncursest.map,v 1.49 2020/02/04 11:44:12 tom Exp $
+# $Id: ncursest.map,v 1.53 2021/10/10 15:22:33 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -485,9 +485,17 @@ NCURSES_TINFO_6.2.20200212 {
 		_nc_wacs_width;
 		curses_trace;
 		exit_terminfo;
+} NCURSES_TINFO_6.1.20171230;
+
+NCURSES_TINFO_6.2.20211010 {
+	global:
+		_nc_reset_tparm;
+		_nc_safe_fopen;
+		_nc_safe_open3;
+		_nc_tiparm;
 	local:
 		_*;
-} NCURSES_TINFO_6.1.20171230;
+} NCURSES_TINFO_6.2.20200212;
 
 NCURSEST_5.7.20081102 {
 	global:
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 709539e..35a70b2 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
-Version: 6.2
-Release: 20200212
+Version: 6.3
+Release: 20211021
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncursest.sym b/package/ncursest.sym
index 021b819..f50ce3d 100644
--- a/package/ncursest.sym
+++ b/package/ncursest.sym
@@ -1,4 +1,4 @@
-# $Id: ncursest.sym,v 1.39 2019/12/14 22:42:32 tom Exp $
+# $Id: ncursest.sym,v 1.41 2021/08/19 23:50:26 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -183,6 +183,7 @@ _nc_read_entry_source
 _nc_read_file_entry
 _nc_read_termtype
 _nc_reset_input
+_nc_reset_tparm
 _nc_resolve_uses
 _nc_resolve_uses2
 _nc_retrace_attr_t
@@ -199,6 +200,8 @@ _nc_retrace_void_ptr
 _nc_retrace_win
 _nc_ripoffline
 _nc_rootname
+_nc_safe_fopen
+_nc_safe_open3
 _nc_safe_strcat
 _nc_safe_strcpy
 _nc_screen
@@ -234,6 +237,7 @@ _nc_tic_written
 _nc_timed_wait
 _nc_tinfo_fkeys
 _nc_tinfo_fkeysf
+_nc_tiparm
 _nc_tparm_analyze
 _nc_tparm_err
 _nc_trace_buf
diff --git a/package/ncursestw.map b/package/ncursestw.map
index 0c932b9..f514b97 100644
--- a/package/ncursestw.map
+++ b/package/ncursestw.map
@@ -1,4 +1,4 @@
-# $Id: ncursestw.map,v 1.51 2020/02/04 11:44:12 tom Exp $
+# $Id: ncursestw.map,v 1.56 2021/10/10 15:22:33 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -491,9 +491,19 @@ NCURSES_TINFO_6.2.20200212 {
 		_nc_wacs_width;
 		curses_trace;
 		exit_terminfo;
+} NCURSES_TINFO_6.1.20171230;
+
+NCURSES_TINFO_6.2.20211010 {
+	global:
+		_nc_reset_tparm;
+		_nc_tiparm;
+		_nc_safe_fopen;
+		_nc_safe_open3;
+		erasewchar_sp;
+		killwchar_sp;
 	local:
 		_*;
-} NCURSES_TINFO_6.1.20171230;
+} NCURSES_TINFO_6.2.20200212;
 
 NCURSESTW_5.7.20081102 {
 	global:
diff --git a/package/ncursestw.sym b/package/ncursestw.sym
index 5d12a53..1668f40 100644
--- a/package/ncursestw.sym
+++ b/package/ncursestw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursestw.sym,v 1.38 2019/12/14 22:44:31 tom Exp $
+# $Id: ncursestw.sym,v 1.41 2021/08/19 23:50:26 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -183,6 +183,7 @@ _nc_read_entry_source
 _nc_read_file_entry
 _nc_read_termtype
 _nc_reset_input
+_nc_reset_tparm
 _nc_resolve_uses
 _nc_resolve_uses2
 _nc_retrace_attr_t
@@ -199,6 +200,8 @@ _nc_retrace_void_ptr
 _nc_retrace_win
 _nc_ripoffline
 _nc_rootname
+_nc_safe_fopen
+_nc_safe_open3
 _nc_safe_strcat
 _nc_safe_strcpy
 _nc_screen
@@ -234,6 +237,7 @@ _nc_tic_written
 _nc_timed_wait
 _nc_tinfo_fkeys
 _nc_tinfo_fkeysf
+_nc_tiparm
 _nc_tparm_analyze
 _nc_tparm_err
 _nc_trace_buf
@@ -355,6 +359,7 @@ erase
 erasechar
 erasechar_sp
 erasewchar
+erasewchar_sp
 exit_curses
 exit_terminfo
 extended_color_content
@@ -524,6 +529,7 @@ keypad
 killchar
 killchar_sp
 killwchar
+killwchar_sp
 leaveok
 link_field
 link_fieldtype
diff --git a/package/ncursesw.map b/package/ncursesw.map
index da68b73..13e8faf 100644
--- a/package/ncursesw.map
+++ b/package/ncursesw.map
@@ -1,4 +1,4 @@
-# $Id: ncursesw.map,v 1.54 2020/02/04 11:44:12 tom Exp $
+# $Id: ncursesw.map,v 1.59 2021/10/10 15:22:33 tom Exp $
 # script for shared library symbol-versioning using ld
 #
 # This file was generated by ncu-mapsyms
@@ -485,9 +485,19 @@ NCURSES_TINFO_6.2.20200212 {
 		_nc_wacs_width;
 		curses_trace;
 		exit_terminfo;
+} NCURSES_TINFO_6.1.20171230;
+
+NCURSES_TINFO_6.2.20211010 {
+	global:
+		_nc_reset_tparm;
+		_nc_tiparm;
+		_nc_safe_fopen;
+		_nc_safe_open3;
+		erasewchar_sp;
+		killwchar_sp;
 	local:
 		_*;
-} NCURSES_TINFO_6.1.20171230;
+} NCURSES_TINFO_6.2.20200212;
 
 NCURSESW_5.1.20000708 {
 	global:
diff --git a/package/ncursesw.sym b/package/ncursesw.sym
index d8d3fd8..a17fd79 100644
--- a/package/ncursesw.sym
+++ b/package/ncursesw.sym
@@ -1,4 +1,4 @@
-# $Id: ncursesw.sym,v 1.37 2019/12/14 22:45:41 tom Exp $
+# $Id: ncursesw.sym,v 1.40 2021/08/19 23:50:26 tom Exp $
 # script for shared library symbol-visibility using libtool
 #
 # This file was generated by ncu-mapsyms
@@ -172,6 +172,7 @@ _nc_read_entry_source
 _nc_read_file_entry
 _nc_read_termtype
 _nc_reset_input
+_nc_reset_tparm
 _nc_resolve_uses
 _nc_resolve_uses2
 _nc_retrace_attr_t
@@ -188,6 +189,8 @@ _nc_retrace_void_ptr
 _nc_retrace_win
 _nc_ripoffline
 _nc_rootname
+_nc_safe_fopen
+_nc_safe_open3
 _nc_safe_strcat
 _nc_safe_strcpy
 _nc_screen_chain
@@ -215,6 +218,7 @@ _nc_tic_expand
 _nc_tic_written
 _nc_timed_wait
 _nc_tinfo_fkeys
+_nc_tiparm
 _nc_tparm_analyze
 _nc_tparm_err
 _nc_tputs_trace
@@ -232,11 +236,11 @@ _nc_visbuf
 _nc_visbuf2
 _nc_visbufn
 _nc_viscbuf
-_nc_wacs_width
 _nc_viswbuf
 _nc_viswbufn
 _nc_viswibuf
 _nc_wacs
+_nc_wacs_width
 _nc_warning
 _nc_wchstrlen
 _nc_wcrtomb
@@ -343,6 +347,7 @@ erase
 erasechar
 erasechar_sp
 erasewchar
+erasewchar_sp
 exit_curses
 exit_terminfo
 extended_color_content
@@ -512,6 +517,7 @@ keypad
 killchar
 killchar_sp
 killwchar
+killwchar_sp
 leaveok
 link_field
 link_fieldtype