ncurses 6.1 - patch 20191228

+ in gen-pkgconfig.in, move the RPATH_LIST and PRIVATE_LIBS assignments
  past the various prefix/libdir assignments, to allow for using those
  symbols, e.g., as done via CF_SHARED_OPTS.
+ improve ncurses*-config and pc-files by filtering out linker-specs.
+ modify test-package to more closely match Fedora's configuration
  for PIE/PIC feature and debug-packages.

diff --git a/NEWS b/NEWS
index 8650eabec07f346742493128cec123a5df832aea..50b5795887ebc2d64ad230abf6883880df70a53a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3420 2019/12/21 22:43:54 tom Exp $
+-- $Id: NEWS,v 1.3422 2019/12/25 23:16:49 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,14 @@ 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.
 
+20191228
+       + in gen-pkgconfig.in, move the RPATH_LIST and PRIVATE_LIBS assignments
+         past the various prefix/libdir assignments, to allow for using those
+         symbols, e.g., as done via CF_SHARED_OPTS.
+       + improve ncurses*-config and pc-files by filtering out linker-specs.
+       + modify test-package to more closely match Fedora's configuration
+         for PIE/PIC feature and debug-packages.
+
 20191221
        + correct pathname used in Ada95 sample programs for explain.txt, to
          work with test-packages.

diff --git a/VERSION b/VERSION
index fa5d276d5179324e27a49dde24b72141f9fbe569..18cc86e7d82dc212a9e6ceba38416f7da12392dd 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.1     20191221
+5:0:10 6.1     20191228

diff --git a/dist.mk b/dist.mk
index 5e73c04dfc9513303f0ef1b3bb68b71cce8da54e..408da639cebd00a5cf92d21477e0ec2340278f08 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1320 2019/12/21 11:16:12 tom Exp $
+# $Id: dist.mk,v 1.1321 2019/12/28 15:45:41 tom Exp $
 # 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
-NCURSES_PATCH = 20191221
+NCURSES_PATCH = 20191228
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 51a1a649533e740e3ddd61d5780c70ccfafe448f..0c0506371f734bfdd0117b14d1c20f9a49570b00 100644 (file)
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.40 2019/10/12 22:27:10 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.42 2019/12/25 23:09:13 tom Exp $
 ##############################################################################
 # Copyright (c) 2009-2018,2019 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -46,8 +46,6 @@ CXX_NAME=@CXX_NAME@
 DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
 TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@
 CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
-RPATH_LIST=@RPATH_LIST@
-PRIVATE_LIBS="@PRIVATE_LIBS@"
 
 suffix=@PC_MODULE_SUFFIX@
 prefix="@prefix@"
@@ -55,6 +53,9 @@ exec_prefix="@exec_prefix@"
 includedir="@includedir@@includesubdir@"
 libdir="@libdir@"
 
+RPATH_LIST=@RPATH_LIST@
+PRIVATE_LIBS="@PRIVATE_LIBS@"
+
 show_prefix='@prefix@'
 show_exec_prefix='@exec_prefix@'
 show_includedir='@includedir@@includesubdir@'
@@ -84,6 +85,9 @@ do
        -l*) # LIBS is handled specially below
                continue
                ;;
+       -specs*) # ignore linker specs-files which were used to build library
+               continue
+               ;;
        -Wl,-z,*) # ignore flags used to manipulate shared image
                continue
                ;;

diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index 244e592c1cf8aceee7b6183e8782695c5a6d0a2d..9028fc5e10c1d719b0deac8ac1b39d0ca7dde470 100644 (file)
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.41 2019/10/12 21:25:17 tom Exp $
+# $Id: ncurses-config.in,v 1.42 2019/12/25 00:54:55 tom Exp $
 ##############################################################################
 # Copyright (c) 2006-2018,2019 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -103,6 +103,9 @@ lib_flags=
 for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS
 do
        case $opt in
+       -specs*) # ignore linker specs-files which were used to build library
+               continue
+               ;;
        -Wl,-z,*) # ignore flags used to manipulate shared image
                continue
                ;;

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index e67dfe017fb6ef317b5b2fe004d7dc1d47a033b8..4660cb15a8d7a973d0ab7e555853143a059fc4aa 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191221) unstable; urgency=low
+ncurses6 (6.1+20191228) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Dec 2019 06:16:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 24 Dec 2019 06:02:28 -0500
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index e67dfe017fb6ef317b5b2fe004d7dc1d47a033b8..4660cb15a8d7a973d0ab7e555853143a059fc4aa 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191221) unstable; urgency=low
+ncurses6 (6.1+20191228) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Dec 2019 06:16:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 24 Dec 2019 06:02:28 -0500
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index a20c7e6965f95d3539d7c004c48f16a4d9116c86..c062ca5b3e4f33296a82bc6b4e02a85312300a94 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191221) unstable; urgency=low
+ncurses6 (6.1+20191228) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 21 Dec 2019 06:16:12 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 24 Dec 2019 06:02:28 -0500
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 09d348381d4064aa44c4b1731a6e5b1c0326bd1d..aa7d52f8c9b65a4de6e61a7b61d9774a137e5e0e 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.366 2019/12/21 11:16:12 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.367 2019/12/24 11:02:28 tom Exp $\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_MMDD  "1221"\r
+!define VERSION_MMDD  "1228"\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 2627ccfdff85feae69c3a206c229be12250230dc..62b3b1f153acadc76ac4bd24738f940419939d95 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
-Release: 20191221
+Release: 20191228
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 2209e1df99cabf970946f3bd52ed96f2b6ebe9c1..b21721a107687a1a4b4430eb41d3950aab7e9838 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,15 +1,12 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1
-Release: 20191221
+Release: 20191228
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 # URL: https://invisible-island.net/ncurses/
 
-%define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
-%define CC_STRICT %{CC_NORMAL} -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
-
 %global MY_ABI 6
 
 # save value before redefining
@@ -33,8 +30,11 @@ This package is used for testing ABI %{MY_ABI}.
 %global is_redhat   %(test -f /etc/redhat-release && echo 1 || echo 0)
 %global is_suse     %(test -f /etc/SuSE-release && echo 1 || echo 0)
 
-# nor are debug-symbols
+%if %{is_redhat}
+# generate debug/debug-source packages.
+%else
 %define debug_package %{nil}
+%endif
 
 %if %{is_mandriva}
 %define _disable_ld_as_needed 1
@@ -100,8 +100,6 @@ This package is used for testing ABI %{MY_ABI}.
        --without-debug \\\
        --without-normal
 
-CFLAGS="%{CC_NORMAL}" \
-RPATH_LIST=../lib:%{_libdir} \
 %configure %{CFG_OPTS}
 
 make
@@ -113,6 +111,11 @@ make install.libs install.progs
 rm -f test/ncurses
 ( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncurses%{MY_ABI} )
 
+%if %{is_redhat}
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets c++-libs
+%endif
+
 %clean
 if rm -rf $RPM_BUILD_ROOT; then
   echo OK
@@ -129,6 +132,11 @@ exit 0
 
 %changelog
 
+* 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
+  packages.
+
 * Sat Nov 16 2019 Thomas Dickey
 - modify clean-rule to work around Fedora NFS bugs.
 

diff --git a/package/ncursest.spec b/package/ncursest.spec
index 6f21a2f7f45b69ad9332168f856600e74cc78a14..cd16f5ebbee5a623ccc1b527bbb037eca1d47ab8 100644 (file)
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,15 +1,12 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.1
-Release: 20191221
+Release: 20191228
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 # URL: https://invisible-island.net/ncurses/
 
-%define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
-%define CC_STRICT %{CC_NORMAL} -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
-
 %global MY_ABI 6
 
 # save value before redefining
@@ -33,8 +30,11 @@ This package is used for testing ABI %{MY_ABI} with POSIX threads.
 %global is_redhat   %(test -f /etc/redhat-release && echo 1 || echo 0)
 %global is_suse     %(test -f /etc/SuSE-release && echo 1 || echo 0)
 
-# nor are debug-symbols
+%if %{is_redhat}
+# generate debug/debug-source packages.
+%else
 %define debug_package %{nil}
+%endif
 
 %if %{is_mandriva}
 %define _disable_ld_as_needed 1
@@ -54,7 +54,6 @@ This package is used for testing ABI %{MY_ABI} with POSIX threads.
 %setup -q -n ncurses-%{version}-%{release}
 
 %build
-%define my_srcdir ..
 %define CFG_OPTS \\\
        --target %{_target_platform} \\\
        --prefix=%{_prefix} \\\
@@ -101,8 +100,6 @@ This package is used for testing ABI %{MY_ABI} with POSIX threads.
        --without-debug \\\
        --without-normal
 
-CFLAGS="%{CC_NORMAL}" \
-RPATH_LIST=../lib:%{_libdir} \
 %configure %{CFG_OPTS} \
        --enable-interop \
        --enable-sp-funcs \
@@ -117,6 +114,11 @@ make install.libs install.progs
 rm -f test/ncurses
 ( cd test && make ncurses LOCAL_LIBDIR=%{_libdir} && mv ncurses $RPM_BUILD_ROOT/%{_bindir}/ncursest%{MY_ABI} )
 
+%if %{is_redhat}
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets c++-libs
+%endif
+
 %clean
 if rm -rf $RPM_BUILD_ROOT; then
   echo OK
@@ -133,6 +135,11 @@ exit 0
 
 %changelog
 
+* 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
+  packages.
+
 * Sat Nov 16 2019 Thomas Dickey
 - modify clean-rule to work around Fedora NFS bugs.