ncurses 5.9 - patch 20121110

+ modify configure macro CF_INCLUDE_DIRS to put $CPPFLAGS after the
  local -I include options in case someone has set conflicting -I
  options in $CPPFLAGS (prompted by patch for ncurses/Makefile.in by
  Vassili Courzakis).
+ modify the ncurses*-config scripts to eliminate relative paths from
  the RPATH_LIST variable, e.g., "../lib" as used in installing shared
  libraries or executables.

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 7ebfd2688f5df832b1bca36dcc7fb31cc3194e57..6794cb4648312953175b68a287c99084c5d77ad6 100644 (file)
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.60 2012/10/27 17:18:49 tom Exp $
+dnl $Id: aclocal.m4,v 1.62 2012/11/11 00:18:37 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -1548,7 +1548,7 @@ AC_DEFUN([CF_HELP_MESSAGE],
 [AC_DIVERT_HELP([$1])dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INCLUDE_DIRS version: 6 updated: 2009/01/06 19:37:40
+dnl CF_INCLUDE_DIRS version: 7 updated: 2012/11/10 19:15:05
 dnl ---------------
 dnl Construct the list of include-options according to whether we're building
 dnl in the source directory or using '--srcdir=DIR' option.  If we're building
@@ -1556,21 +1556,21 @@ dnl with gcc, don't append the includedir if it happens to be /usr/include,
 dnl since that usually breaks gcc's shadow-includes.
 AC_DEFUN([CF_INCLUDE_DIRS],
 [
-CPPFLAGS="$CPPFLAGS -I. -I../include"
-if test "$srcdir" != "."; then
-       CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
-fi
 if test "$GCC" != yes; then
-       CPPFLAGS="$CPPFLAGS -I\${includedir}"
+       CPPFLAGS="-I\${includedir} $CPPFLAGS"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
                if test $prefix != /usr ; then
-                       CPPFLAGS="$CPPFLAGS -I\${includedir}"
+                       CPPFLAGS="-I\${includedir} $CPPFLAGS"
                fi
        else
-               CPPFLAGS="$CPPFLAGS -I\${includedir}"
+               CPPFLAGS="-I\${includedir} $CPPFLAGS"
        fi
 fi
+if test "$srcdir" != "."; then
+       CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
+fi
+CPPFLAGS="-I. -I../include $CPPFLAGS"
 AC_SUBST(CPPFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

diff --git a/Ada95/configure b/Ada95/configure
index b0108b64ce7e8482aa751ea8057cdbbbb7686812..617f96eee84badaf3598b2a1255922444eef52ba 100644 (file)
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -11815,21 +11815,21 @@ TINFO_LIBS=
 
 ### Construct the list of include-directories to be generated
 
-CPPFLAGS="$CPPFLAGS -I. -I../include"
-if test "$srcdir" != "."; then
-       CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
-fi
 if test "$GCC" != yes; then
-       CPPFLAGS="$CPPFLAGS -I\${includedir}"
+       CPPFLAGS="-I\${includedir} $CPPFLAGS"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
                if test $prefix != /usr ; then
-                       CPPFLAGS="$CPPFLAGS -I\${includedir}"
+                       CPPFLAGS="-I\${includedir} $CPPFLAGS"
                fi
        else
-               CPPFLAGS="$CPPFLAGS -I\${includedir}"
+               CPPFLAGS="-I\${includedir} $CPPFLAGS"
        fi
 fi
+if test "$srcdir" != "."; then
+       CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
+fi
+CPPFLAGS="-I. -I../include $CPPFLAGS"
 
 ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS"
 if test "$srcdir" != "."; then

diff --git a/NEWS b/NEWS
index ac4741d1eafb2056f5c39ca15f1e4a3aa2edf543..b3d48e933e239cc6a3e26d71c56134b5e39fda02 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.1971 2012/11/03 23:02:35 tom Exp $
+-- $Id: NEWS,v 1.1973 2012/11/10 21:44:29 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,15 @@ 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.
 
+20121110
+       + modify configure macro CF_INCLUDE_DIRS to put $CPPFLAGS after the
+         local -I include options in case someone has set conflicting -I
+         options in $CPPFLAGS (prompted by patch for ncurses/Makefile.in by
+         Vassili Courzakis).
+       + modify the ncurses*-config scripts to eliminate relative paths from
+         the RPATH_LIST variable, e.g., "../lib" as used in installing shared
+         libraries or executables.
+
 20121102
        + realign these related pages:
            curs_add_wchstr.3x

diff --git a/aclocal.m4 b/aclocal.m4
index d7b8ffc9c23067742264faebf94df450f8bcd949..351e4b64383192b61cce846a9c836d357d2ef15a 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.640 2012/11/03 19:39:23 tom Exp $
+dnl $Id: aclocal.m4,v 1.643 2012/11/11 00:17:28 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -2716,7 +2716,7 @@ AC_DEFUN([CF_HELP_MESSAGE],
 [AC_DIVERT_HELP([$1])dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INCLUDE_DIRS version: 6 updated: 2009/01/06 19:37:40
+dnl CF_INCLUDE_DIRS version: 7 updated: 2012/11/10 19:15:05
 dnl ---------------
 dnl Construct the list of include-options according to whether we're building
 dnl in the source directory or using '--srcdir=DIR' option.  If we're building
@@ -2724,21 +2724,21 @@ dnl with gcc, don't append the includedir if it happens to be /usr/include,
 dnl since that usually breaks gcc's shadow-includes.
 AC_DEFUN([CF_INCLUDE_DIRS],
 [
-CPPFLAGS="$CPPFLAGS -I. -I../include"
-if test "$srcdir" != "."; then
-       CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
-fi
 if test "$GCC" != yes; then
-       CPPFLAGS="$CPPFLAGS -I\${includedir}"
+       CPPFLAGS="-I\${includedir} $CPPFLAGS"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
                if test $prefix != /usr ; then
-                       CPPFLAGS="$CPPFLAGS -I\${includedir}"
+                       CPPFLAGS="-I\${includedir} $CPPFLAGS"
                fi
        else
-               CPPFLAGS="$CPPFLAGS -I\${includedir}"
+               CPPFLAGS="-I\${includedir} $CPPFLAGS"
        fi
 fi
+if test "$srcdir" != "."; then
+       CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
+fi
+CPPFLAGS="-I. -I../include $CPPFLAGS"
 AC_SUBST(CPPFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

diff --git a/configure b/configure
index a0909a0df86c7b07b27f5c290c2b3e2659a04777..4a94a5963de787b680d19dea28b66f588dd51a75 100755 (executable)
--- a/configure
+++ b/configure
@@ -19460,21 +19460,21 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
 
 ### Construct the list of include-directories to be generated
 
-CPPFLAGS="$CPPFLAGS -I. -I../include"
-if test "$srcdir" != "."; then
-       CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
-fi
 if test "$GCC" != yes; then
-       CPPFLAGS="$CPPFLAGS -I\${includedir}"
+       CPPFLAGS="-I\${includedir} $CPPFLAGS"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
                if test $prefix != /usr ; then
-                       CPPFLAGS="$CPPFLAGS -I\${includedir}"
+                       CPPFLAGS="-I\${includedir} $CPPFLAGS"
                fi
        else
-               CPPFLAGS="$CPPFLAGS -I\${includedir}"
+               CPPFLAGS="-I\${includedir} $CPPFLAGS"
        fi
 fi
+if test "$srcdir" != "."; then
+       CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
+fi
+CPPFLAGS="-I. -I../include $CPPFLAGS"
 
 ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS"
 if test "$srcdir" != "."; then

diff --git a/dist.mk b/dist.mk
index 9afe49dfe8d5ca3479864eeaf6ae65508fda52b5..92767c2987e84ea24c948510a0fb20f4a7648e43 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.899 2012/11/03 14:12:24 tom Exp $
+# $Id: dist.mk,v 1.900 2012/11/10 21:02:17 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 = 5
 NCURSES_MINOR = 9
-NCURSES_PATCH = 20121102
+NCURSES_PATCH = 20121110
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index b08e13e239e78ef251f7e02de501d80671c02dd3..f5e6e7ede45d676690f9998d8c2318fe2a908e1c 100644 (file)
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.28 2012/08/11 21:45:20 tom Exp $
+# $Id: ncurses-config.in,v 1.30 2012/11/11 00:14:28 tom Exp $
 ##############################################################################
-# Copyright (c) 2006-2010,2011 Free Software Foundation, Inc.                #
+# Copyright (c) 2006-2011,2012 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"), #
@@ -30,6 +30,11 @@
 #
 # Author: Thomas E. Dickey, 2006-on
 
+LANG=C;                export LANG
+LANGUAGE=C;    export LANGUAGE
+LC_ALL=C;      export LC_ALL
+LC_CTYPE=C;    export LC_CTYPE
+
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 
@@ -44,10 +49,29 @@ THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
 TINFO_LIB="@TINFO_ARG_SUFFIX@"
 RPATH_LIST="@RPATH_LIST@"
 
-LANG=C;                export LANG
-LANGUAGE=C;    export LANGUAGE
-LC_ALL=C;      export LC_ALL
-LC_CTYPE=C;    export LC_CTYPE
+# Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty.
+# We cannot filter it out within the build-process since the variable is used
+# in some special cases of installation using a relative path.
+if test -n "$RPATH_LIST"
+then
+       save_IFS="$IFS"
+       IFS='@PATH_SEPARATOR@'
+       filtered=
+       for item in $RPATH_LIST
+       do
+               case "$item" in
+               ./*|../*|*/..|*/../*)
+                       ;;
+               *)
+                       test -n "$filtered" && filtered="${filtered}@PATH_SEPARATOR@"
+                       filtered="${filtered}${item}"
+                       ;;
+               esac
+       done
+       IFS="$save_IFS"
+       # if the result is empty, there is little we can do to fix it
+       RPATH_LIST="$filtered"
+fi
 
 # with --disable-overwrite, we installed into a subdirectory, but transformed
 # the headers to include like this:

diff --git a/misc/terminfo.src b/misc/terminfo.src
index 3900797e253d02ddcfa4b16ae330ee8daf80bd14..e8b02f3d750cd4130fe166057df7cac76cb96b87 100644 (file)
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #      bug-ncurses@gnu.org
 #
-#      $Revision: 1.469 $
-#      $Date: 2012/11/03 18:58:05 $
+#      $Revision: 1.470 $
+#      $Date: 2012/11/04 15:59:03 $
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
@@ -4826,7 +4826,7 @@ st-256color|simpleterm with 256 colors,
        ccc@,
        initc@, use=xterm+256color, use=simpleterm,
 
-### TERMINATOR
+#### TERMINATOR
 # http://software.jessies.org/terminator/
 # Tested using their Debian package org.jessies.terminator 6.104.3256 on 64-bit
 # Debian/current -TD (2011/8/20)
@@ -22741,7 +22741,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2009-12-12
 #      * updated nsterm* entries (Benjamin Sittler, Emanuele Giaquinta)
 #
-# 2009-12-12
+# 2009-12-19
 #      * add bw (auto-left-margin) to nsterm* entries (Benjamin Sittler)
 #      * rename minix to minix-1.7, add minix entry for Minux3 -TD
 #

diff --git a/package/debian/changelog b/package/debian/changelog
index b72623ff535d87127315e5b29a62a9de9076361c..bcc4a375ba0f3e114a149f26ea0e2b250386f9c2 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (5.9-20121102) unstable; urgency=low
+ncurses6 (5.9-20121110) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Nov 2012 15:21:53 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Nov 2012 16:02:42 -0500
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/ncurses.spec b/package/ncurses.spec
index c08436533935ea48dd6073f27dedbb15b514bec7..35f69bc538917f7dafa9573beedf84c0c970625d 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Release: 5.9
-Version: 20121102
+Version: 20121110
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{release}-%{version}.tgz