ncurses 5.9 - patch 20120826

+ increase size of ncurses' output-buffer, in case of very small
  initial screen-sizes.
+ fix evaluation of TERMINFO and TERMINFO_DIRS default values as needed
  after changes to use --datarootdir (reports by Gabriele Balducci,
  Roumen Petrov).

diff --git a/NEWS b/NEWS
index 0d43f493935598aad5ea513df6ddc8dbe5a76198..4c44aacaf3732d710016c4dde7d10fdbd9468966 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.1943 2012/08/25 20:02:00 tom Exp $
+-- $Id: NEWS,v 1.1945 2012/08/26 21:12:55 tom Exp $
 -------------------------------------------------------------------------------
 
 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.
 
+20120826
+       + increase size of ncurses' output-buffer, in case of very small
+         initial screen-sizes.
+       + fix evaluation of TERMINFO and TERMINFO_DIRS default values as needed
+         after changes to use --datarootdir (reports by Gabriele Balducci,
+         Roumen Petrov).
+
 20120825
        + change output buffering scheme, using buffer maintained by ncurses
          rather than stdio, to avoid problems with SIGTSTP handling (report

diff --git a/aclocal.m4 b/aclocal.m4
index 7fc85227f4aa8ed53abeae02eec6a7ea7d99bd4e..892e62827fc707ddbc4e79137e640fbc5036c6a6 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.621 2012/08/11 23:36:44 tom Exp $
+dnl $Id: aclocal.m4,v 1.622 2012/08/26 14:01:23 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -6838,7 +6838,7 @@ ifelse([$4],,[withval="${$3}"],[withval="${$3:-ifelse([$5],,[$4],[$5])}"]))dnl
 if ifelse([$5],,true,[test -n "$5"]) ; then
 CF_PATH_SYNTAX(withval)
 fi
-$3="$withval"
+eval $3="$withval"
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -6879,7 +6879,7 @@ esac
 cf_dst_path=`echo "$cf_dst_path" | sed -e 's/\\\\/\\\\\\\\/g'`
 ])
 
-eval '$3="$cf_dst_path"'
+eval $3="$cf_dst_path"
 AC_SUBST($3)dnl
 
 ])dnl

diff --git a/configure b/configure
index ac79995eafc38874a787c8cb00ac17180365c730..4363727c8c4cc8e5855914ca4377313ad5aff8b6 100755 (executable)
--- a/configure
+++ b/configure
@@ -6385,7 +6385,7 @@ esac
 done
 IFS="$ac_save_ifs"
 
-eval 'TERMINFO_DIRS="$cf_dst_path"'
+eval TERMINFO_DIRS="$cf_dst_path"
 
 echo "$as_me:6390: result: $TERMINFO_DIRS" >&5
 echo "${ECHO_T}$TERMINFO_DIRS" >&6
@@ -6436,7 +6436,7 @@ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
 esac
 
 fi
-TERMINFO="$withval"
+eval TERMINFO="$withval"
 
 echo "$as_me:6441: result: $TERMINFO" >&5
 echo "${ECHO_T}$TERMINFO" >&6
@@ -6622,7 +6622,7 @@ esac
 done
 IFS="$ac_save_ifs"
 
-eval 'TERMPATH="$cf_dst_path"'
+eval TERMPATH="$cf_dst_path"
 
 echo "$as_me:6627: result: $TERMPATH" >&5
 echo "${ECHO_T}$TERMPATH" >&6
@@ -19667,7 +19667,7 @@ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
 esac
 
 fi
-ADA_INCLUDE="$withval"
+eval ADA_INCLUDE="$withval"
 
 echo "$as_me:19672: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6
@@ -19715,7 +19715,7 @@ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
 esac
 
 fi
-ADA_OBJECTS="$withval"
+eval ADA_OBJECTS="$withval"
 
 echo "$as_me:19720: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6

diff --git a/dist.mk b/dist.mk
index 98aca55f9c658d92f84dae7cc7b32a5ad54ef98f..70ea57b50150c56058aebf6d8dab6ce9d9c0969f 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.887 2012/08/25 16:47:15 tom Exp $
+# $Id: dist.mk,v 1.888 2012/08/26 13:32:39 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 = 20120825
+NCURSES_PATCH = 20120826
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 3ed5e72431394834013eaf2e844680748c7eb8d1..03dff27947f2f99c484ed98da72935f5d6d48b8c 100644 (file)
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -47,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_set_term.c,v 1.143 2012/08/25 20:10:40 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.144 2012/08/26 21:11:49 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
@@ -376,7 +376,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     fflush(output);
     sp->_ofd = output ? fileno(output) : -1;
     sp->_ofp = output;
-    sp->out_limit = (size_t) (slines * scolumns);
+    sp->out_limit = (size_t) ((2 + slines) * (6 + scolumns));
     if ((sp->out_buffer = malloc(sp->out_limit)) == 0)
        sp->out_limit = 0;
     sp->out_inuse = 0;

diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c
index 67467d4251a99552ce9b8889117361d44318826d..90e73d6bc5990d75160bebe28003389a1bb39389 100644 (file)
--- a/ncurses/tinfo/db_iterator.c
+++ b/ncurses/tinfo/db_iterator.c
@@ -43,7 +43,7 @@
 #include <hashed_db.h>
 #endif
 
-MODULE_ID("$Id: db_iterator.c,v 1.34 2012/06/30 16:30:10 tom Exp $")
+MODULE_ID("$Id: db_iterator.c,v 1.35 2012/08/25 21:55:00 tom Exp $")
 
 #define HaveTicDirectory _nc_globals.have_tic_directory
 #define KeepTicDirectory _nc_globals.keep_tic_directory

diff --git a/package/debian/changelog b/package/debian/changelog
index 163b5289ff8b03e83c131dd4e124708d4ebe8210..fb933d66fdc482872995e872989eabc24196da38 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (5.9-20120825) unstable; urgency=low
+ncurses6 (5.9-20120826) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 25 Aug 2012 16:49:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 26 Aug 2012 09:34:48 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/ncurses.spec b/package/ncurses.spec
index bd18e24aa3f9808d82c0816c4ca7f62f511a6388..3a178646f141ddb74e63bfba081478a9a4e18830 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: 20120825
+Version: 20120826
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{release}-%{version}.tgz