ncurses 6.3 - patch 20221001

+ modify configure/scripts to work around interference by GNU grep 3.8
  (report by Sam James).
+ update CF_XOPEN_SOURCE, adding variants "gnueabi" and "gnueabihf" to
  get _DEFAULT_SOURCE special case (report by Adam Sampson)

diff --git a/Ada95/configure b/Ada95/configure
index aa0dfc1cfb0eeae385541acd0a4ec30916e557ba..ee43a442d590b8118c7c21e870a54dddca9d1f52 100755 (executable)
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -18716,6 +18716,8 @@ cat >>"$CONFIG_STATUS" <<EOF
 AWK="$AWK"
 DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
 DFT_LWR_MODEL="$DFT_LWR_MODEL"
+EGREP="${EGREP-grep -E}"
+FGREP="${FGREP-grep -F}"
 LIB_NAME="$LIB_NAME"
 LIB_PREFIX="$LIB_PREFIX"
 LIB_SUFFIX="$LIB_SUFFIX"
@@ -18749,7 +18751,7 @@ do
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
-  *) { { echo "$as_me:18752: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:18754: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -19109,7 +19111,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:19112: creating $ac_file" >&5
+    { echo "$as_me:19114: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -19127,7 +19129,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19130: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19132: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19140,7 +19142,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19143: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19145: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19156,7 +19158,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:19159: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:19161: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -19165,7 +19167,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:19168: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:19170: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -19202,7 +19204,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
-              { echo "$as_me:19205: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:19207: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -19213,7 +19215,7 @@ $ac_seen" >&2;}
     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
-      { echo "$as_me:19216: WARNING: Some variables may not be substituted:
+      { echo "$as_me:19218: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -19262,7 +19264,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:19265: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:19267: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -19273,7 +19275,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:19276: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:19278: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -19286,7 +19288,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:19289: error: cannot find input file: $f" >&5
+           { { echo "$as_me:19291: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -19344,7 +19346,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:19347: $ac_file is unchanged" >&5
+      { echo "$as_me:19349: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

diff --git a/Ada95/configure.in b/Ada95/configure.in
index 1fbd5935533868f58091340a85a4a3e17b77800f..f31ada44ea4cd4f2cf96cc33b33e5799836f9284 100644 (file)
--- a/Ada95/configure.in
+++ b/Ada95/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: configure.in,v 1.85 2022/03/05 22:20:52 tom Exp $
+dnl $Id: configure.in,v 1.86 2022/10/01 14:12:41 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210509)
-AC_REVISION($Revision: 1.85 $)
+AC_REVISION($Revision: 1.86 $)
 AC_INIT(gen/gen.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -598,6 +598,8 @@ fi
 AWK="$AWK"
 DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
 DFT_LWR_MODEL="$DFT_LWR_MODEL"
+EGREP="${EGREP-grep -E}"
+FGREP="${FGREP-grep -F}"
 LIB_NAME="$LIB_NAME"
 LIB_PREFIX="$LIB_PREFIX"
 LIB_SUFFIX="$LIB_SUFFIX"

diff --git a/Makefile.in b/Makefile.in
index f87c19fd5f684fe104b2a00e8bfe098f1f53e33b..1303e171cfa1ab97d189b39d12e8f72e8870a3fa 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.45 2021/08/07 22:06:59 tom Exp $
+# $Id: Makefile.in,v 1.46 2022/10/01 22:53:36 tom Exp $
 ##############################################################################
-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
 # Copyright 1998-2014,2015 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -62,6 +62,8 @@ pkgdir                = @PKG_CONFIG_LIBDIR@
 
 include_dir    = ${includedir}${includesubdir}
 
+FGREP          = @FGREP@
+
 INSTALL                = @INSTALL@
 INSTALL_DATA   = @INSTALL_DATA@
 
@@ -103,10 +105,10 @@ preinstall :
        @ test "$(include_dir)" = "$(prefix)/include" || \
                echo '** Include-directory is not in a standard location'
        @ test ! -f $(include_dir)/termcap.h || \
-               fgrep NCURSES_VERSION $(include_dir)/termcap.h >/dev/null || \
+               $(FGREP) NCURSES_VERSION $(include_dir)/termcap.h >/dev/null || \
                echo '** Will overwrite non-ncurses termcap.h'
        @ test ! -f $(include_dir)/curses.h || \
-               fgrep NCURSES_VERSION $(include_dir)/curses.h >/dev/null || \
+               $(FGREP) NCURSES_VERSION $(include_dir)/curses.h >/dev/null || \
                echo '** Will overwrite non-ncurses curses.h'
 
 distclean \

diff --git a/NEWS b/NEWS
index 2fc4c83dcdb887d184f6800a0c03a318a7ece79f..71154b9346d4989a21c300fb1634b6d30dc4ec4e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3860 2022/09/24 20:40:35 tom Exp $
+-- $Id: NEWS,v 1.3862 2022/10/01 22:20:28 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,12 @@ 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.
 
+20221001
+       + modify configure/scripts to work around interference by GNU grep 3.8
+         (report by Sam James).
+       + update CF_XOPEN_SOURCE, adding variants "gnueabi" and "gnueabihf" to
+         get _DEFAULT_SOURCE special case (report by Adam Sampson)
+
 20220924
        + modify configure macro CF_BUILD_CC to check if the build-compiler
          works, rather than that it is different from the cross-compiler, e.g.,

diff --git a/VERSION b/VERSION
index 9345ed3d0b487b5fe49597921047d302d38dc5d9..a5e3c00cf267a95a6c377fc812d60cb15f12685c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.3     20220924
+5:0:10 6.3     20221001

diff --git a/aclocal.m4 b/aclocal.m4
index 7363779658a9dd75070af66e5bbf5676044c8f82..bf8065783e40e59234e17cdcc59f2e29a29c3074 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1012 2022/09/24 20:41:12 tom Exp $
+dnl $Id: aclocal.m4,v 1.1014 2022/10/01 13:24:04 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -5690,7 +5690,7 @@ if test -n "$cf_unknown" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MANPAGE_RENAMES version: 12 updated: 2021/01/01 16:53:59
+dnl CF_MANPAGE_RENAMES version: 13 updated: 2022/10/01 09:13:09
 dnl ------------------
 dnl The Debian people have their own naming convention for manpages.  This
 dnl option lets us override the name of the file containing renaming, or
@@ -5729,7 +5729,7 @@ if test "$MANPAGE_RENAMES" != no ; then
        # Construct a sed-script to perform renaming within man-pages
        if test -n "$MANPAGE_RENAMES" ; then
                test ! -d man && mkdir man
-               $SHELL "$srcdir/man/make_sed.sh" "$MANPAGE_RENAMES" >./edit_man.sed
+               FGREP="${FGREP-grep -F}" $SHELL "$srcdir/man/make_sed.sh" "$MANPAGE_RENAMES" >./edit_man.sed
        fi
 fi
 
@@ -9873,7 +9873,7 @@ fi
 AC_SUBST(no_x11_rgb)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 60 updated: 2022/09/10 15:16:16
+dnl CF_XOPEN_SOURCE version: 61 updated: 2022/09/30 04:05:55
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -9924,7 +9924,7 @@ case "$host_os" in
        cf_xopen_source="-D_SGI_SOURCE"
        cf_XOPEN_SOURCE=
        ;;
-(linux*gnu|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
+(linux*gnu|linux*gnueabi|linux*gnueabihf|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
        CF_GNU_SOURCE($cf_XOPEN_SOURCE)
        ;;
 (minix*)

diff --git a/configure b/configure
index 4c87cd54740ea0d0d69bccd42f45fabf1b4e48a6..df715aec50ec47c716073e478885a3970f7374d8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.748 .
+# From configure.in Revision: 1.749 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20210509.
 #
@@ -9989,7 +9989,7 @@ case "$host_os" in
        cf_xopen_source="-D_SGI_SOURCE"
        cf_XOPEN_SOURCE=
        ;;
-(linux*gnu|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
+(linux*gnu|linux*gnueabi|linux*gnueabihf|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
@@ -14774,7 +14774,7 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
        # Construct a sed-script to perform renaming within man-pages
        if test -n "$MANPAGE_RENAMES" ; then
                test ! -d man && mkdir man
-               $SHELL "$srcdir/man/make_sed.sh" "$MANPAGE_RENAMES" >./edit_man.sed
+               FGREP="${FGREP-grep -F}" $SHELL "$srcdir/man/make_sed.sh" "$MANPAGE_RENAMES" >./edit_man.sed
        fi
 fi
 
@@ -29609,7 +29609,9 @@ CXX_NAME="$CXX_NAME"
 DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
 DFT_LWR_MODEL="$DFT_LWR_MODEL"
 ECHO_LD="$ECHO_LD"
+EGREP="${EGREP-grep -E}"
 EXTRA_SUFFIX="$EXTRA_SUFFIX"
+FGREP="${FGREP-grep -F}"
 FORM_NAME="$FORM_NAME"
 LDCONFIG="$LDCONFIG"
 LIBTOOL_VERSION="$LIBTOOL_VERSION"
@@ -29691,7 +29693,7 @@ do
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
-  *) { { echo "$as_me:29694: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:29696: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -30204,7 +30206,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:30207: creating $ac_file" >&5
+    { echo "$as_me:30209: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -30222,7 +30224,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30225: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30227: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30235,7 +30237,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30238: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30240: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30251,7 +30253,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:30254: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:30256: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -30260,7 +30262,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:30263: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:30265: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -30297,7 +30299,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
-              { echo "$as_me:30300: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:30302: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -30308,7 +30310,7 @@ $ac_seen" >&2;}
     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
-      { echo "$as_me:30311: WARNING: Some variables may not be substituted:
+      { echo "$as_me:30313: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -30357,7 +30359,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:30360: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:30362: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -30368,7 +30370,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:30371: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:30373: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -30381,7 +30383,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:30384: error: cannot find input file: $f" >&5
+           { { echo "$as_me:30386: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -30439,7 +30441,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:30442: $ac_file is unchanged" >&5
+      { echo "$as_me:30444: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -30826,7 +30828,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
                                (cygdll|msysdll|mingw|msvcdll)
                                        test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "  overriding CXX_MODEL to SHARED" 1>&6
 
-echo "${as_me:-configure}:30829: testing overriding CXX_MODEL to SHARED ..." 1>&5
+echo "${as_me:-configure}:30831: testing overriding CXX_MODEL to SHARED ..." 1>&5
 
                                        with_shared_cxx=yes
                                        ;;

diff --git a/configure.in b/configure.in
index a66e5948b8e19b6264970f79991e5ba7e3780492..70e8ae1c727db4d1732cbfbc2ccec44d11ed08ac 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.748 2022/09/10 18:17:55 tom Exp $
+dnl $Id: configure.in,v 1.749 2022/10/01 13:16:18 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.748 $)
+AC_REVISION($Revision: 1.749 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -2569,7 +2569,9 @@ CXX_NAME="$CXX_NAME"
 DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX"
 DFT_LWR_MODEL="$DFT_LWR_MODEL"
 ECHO_LD="$ECHO_LD"
+EGREP="${EGREP-grep -E}"
 EXTRA_SUFFIX="$EXTRA_SUFFIX"
+FGREP="${FGREP-grep -F}"
 FORM_NAME="$FORM_NAME"
 LDCONFIG="$LDCONFIG"
 LIBTOOL_VERSION="$LIBTOOL_VERSION"

diff --git a/dist.mk b/dist.mk
index 1c29d8a3dcdf3b0c72ac94711ae30847f26bd33f..fe6721fa4c6a4cc3cd3df77bdd48cb3d50b141a9 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1503 2022/09/24 08:24:58 tom Exp $
+# $Id: dist.mk,v 1.1505 2022/10/01 13:15:31 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 3
-NCURSES_PATCH = 20220924
+NCURSES_PATCH = 20221001
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
@@ -129,12 +129,12 @@ manhtml:
        @rm -f subst.tmp
        @for f in man/*.[0-9]* ; do \
           m=`basename $$f` ;\
-          T=`egrep '^.TH' $$f|sed -e 's/^.TH //' -e s'/"//g' -e 's/[   ]\+$$//'` ; \
+          T=`$${EGREP-grep -E} '^.TH' $$f|sed -e 's/^.TH //' -e s'/"//g' -e 's/[       ]\+$$//'` ; \
           g=$${m}.html ;\
           if [ -f doc/html/$$g ]; then chmod +w doc/html/$$g; fi;\
           echo "Converting $$m to HTML" ;\
           echo '<!--' > doc/html/man/$$g ;\
-          egrep '^.\\"[^#]' $$f | \
+          $${EGREP-grep -E} '^.\\"[^#]' $$f | \
                sed     -e 's/\$$/@/g' \
                        -e 's/^.../  */' \
                        -e 's/</\&lt;/g' \

diff --git a/man/make_sed.sh b/man/make_sed.sh
index a0fdb0585822a60726057a6ab1464c8a63fa4de9..2a290f0b1d9f7e0e5752e1e2c7d737b4e86b16c7 100755 (executable)
--- a/man/make_sed.sh
+++ b/man/make_sed.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: make_sed.sh,v 1.15 2022/07/16 20:20:00 tom Exp $
+# $Id: make_sed.sh,v 1.16 2022/10/01 13:14:07 tom Exp $
 ##############################################################################
 # Copyright 2020-2021,2022 Thomas E. Dickey                                  #
 # Copyright 1998-2005,2017 Free Software Foundation, Inc.                    #
@@ -29,7 +29,7 @@
 # authorization.                                                             #
 ##############################################################################
 #
-# Author: Thomas E. Dickey 1997-2005
+# Author: Thomas E. Dickey 1997
 #
 # Construct a sed-script to perform renaming within man-pages.  Originally
 # written in much simpler form, this one accounts for the common cases of
@@ -48,7 +48,7 @@ RESULT=result$$
 rm -f $UPPER $SCRIPT $RESULT
 trap "rm -f $COL.* $INPUT $UPPER $SCRIPT $RESULT; exit 1" 1 2 3 15
 trap "rm -f $COL.* $INPUT $UPPER $SCRIPT $RESULT" 0
-fgrep -v \# "$1" | \
+${FGREP-grep -F} -v \# "$1" | \
 sed    -e 's/[ ][      ]*/     /g' >$INPUT
 
 for F in 1 2 3 4

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index aba25fdaaaae2a5220c61ad9b21bc009cd095e26..59e80d05fb865ecda3eca49793358e83cf4b187f 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.182 2021/08/19 23:43:40 tom Exp $
+# $Id: Makefile.in,v 1.183 2022/10/01 12:47:39 tom Exp $
 ##############################################################################
-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2018-2021,2022 Thomas E. Dickey                                  #
 # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -245,7 +245,7 @@ $(DESTDIR)$(libdir) :
        $(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) "$(TIC_PATH)" "$(INFOCMP_PATH)" $(FALLBACK_LIST) >$@
 
 ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
-       $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
+       FGREP="@FGREP@" $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
 
 init_keytry.h : make_keys$(BUILD_EXEEXT) keys.list
        ./make_keys$(BUILD_EXEEXT) keys.list > $@
@@ -333,7 +333,7 @@ realclean :: distclean
 test_progs : $(TEST_PROGS)
 
 ./link_test.c : $(base)/MKlib_gen.sh ../include/curses.h
-       $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" implemented <../include/curses.h >$@
+       FGREP="@FGREP@" $(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" implemented <../include/curses.h >$@
 
 captoinfo$x : $(tinfo)/captoinfo.c $(TEST_DEPS)
        @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DMAIN $(tinfo)/captoinfo.c $(TEST_LDFLAGS)

diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index f5a74ad91e4365c303cb2fae91db1584a77b6399..f0ac0452e8ef909d0f0ef626d586a8909374e351 100755 (executable)
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,7 +2,7 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.72 2022/02/05 20:39:10 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.73 2022/10/01 13:14:20 tom Exp $)
 #
 ##############################################################################
 # Copyright 2018-2021,2022 Thomas E. Dickey                                  #
@@ -83,7 +83,7 @@ USE="$3"
 #      https://gcc.gnu.org/gcc-5/porting_to.html
 
 PRG=`echo "$1" | "$AWK" '{ sub(/^[     ]*/,""); sub(/[         ].*$/, ""); print; }' || exit 0`
-FSF=`("$PRG" --version 2>/dev/null || exit 0) | fgrep "Free Software Foundation" | head -n 1`
+FSF=`("$PRG" --version 2>/dev/null || exit 0) | ${FGREP-grep -F} "Free Software Foundation" | head -n 1`
 ALL=`"$PRG" -dumpversion 2>/dev/null || exit 0`
 ONE=`echo "$ALL" | sed -e 's/[^0-9].*$//'`
 if test -n "$FSF" && test -n "$ALL" && test -n "$ONE" ; then

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 48c7f6d49cbc473218bda3862c7f5c95750e40d8..6cb5c7a2dd2d20f6049a06cba915b442a2cca7ee 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.3+20220924) unstable; urgency=low
+ncurses6 (6.3+20221001) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Sep 2022 04:24:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 30 Sep 2022 20:16:53 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 48c7f6d49cbc473218bda3862c7f5c95750e40d8..6cb5c7a2dd2d20f6049a06cba915b442a2cca7ee 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.3+20220924) unstable; urgency=low
+ncurses6 (6.3+20221001) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Sep 2022 04:24:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 30 Sep 2022 20:16:53 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index f14076499c7e6eab1fcf4448cf45856ab4eb6e22..28f08aa543c2228177b4e0416418546c1f0bb8be 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.3+20220924) unstable; urgency=low
+ncurses6 (6.3+20221001) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Sep 2022 04:24:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 30 Sep 2022 20:16:53 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index eb13c6753548ceee85c8af798fe2c67587ea04d0..e00eccb7996fa5ec14bed440b1be1a8dbc0bc48d 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.543 2022/09/24 08:24:58 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.544 2022/10/01 09:34:57 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 "3"\r
 !define VERSION_YYYY  "2022"\r
-!define VERSION_MMDD  "0924"\r
+!define VERSION_MMDD  "1001"\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 87fa86ea778162cb98bc43839e1f7fae717e9d6c..6ca2069a239eca21d93d028dcb1bf9c47c850f3b 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.3
-Release: 20220924
+Release: 20221001
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 4ba3b99484e9d1dbd75928bff09acf1f1274951a..f2ccaaac9321a04f296d2fb519358bb09b374694 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.3
-Release: 20220924
+Release: 20221001
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index dc26c4e1684681e797f6588b640ee75a01d689c8..0075bdfb2b604ac859e426209f965fdb4d39daa2 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.3
-Release: 20220924
+Release: 20221001
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/test/configure b/test/configure
index 3c3977ca0ac93d50563a9d75bf2b34a8d58b7f11..6cc12021ac18d160d86fe9aa1e9150218cc4f175 100755 (executable)
--- a/test/configure
+++ b/test/configure
@@ -23820,6 +23820,8 @@ cat >>"$CONFIG_STATUS" <<EOF
 AWK="$AWK"
 ECHO_CC="$ECHO_CC"
 ECHO_LD="$ECHO_LD"
+EGREP="${EGREP-grep -E}"
+FGREP="${FGREP-grep -F}"
 SHOW_CC="$SHOW_LD"
 
 EOF
@@ -23832,7 +23834,7 @@ do
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
-  *) { { echo "$as_me:23835: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:23837: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -24139,7 +24141,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:24142: creating $ac_file" >&5
+    { echo "$as_me:24144: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -24157,7 +24159,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24160: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24162: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24170,7 +24172,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24173: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24175: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24186,7 +24188,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:24189: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:24191: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -24195,7 +24197,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:24198: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:24200: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -24232,7 +24234,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`${EGREP-egrep} '[         ]*'$ac_name'[   ]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
-              { echo "$as_me:24235: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:24237: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -24243,7 +24245,7 @@ $ac_seen" >&2;}
     ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
-      { echo "$as_me:24246: WARNING: Some variables may not be substituted:
+      { echo "$as_me:24248: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -24292,7 +24294,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:24295: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:24297: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -24303,7 +24305,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:24306: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:24308: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -24316,7 +24318,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:24319: error: cannot find input file: $f" >&5
+           { { echo "$as_me:24321: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -24374,7 +24376,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
-      { echo "$as_me:24377: $ac_file is unchanged" >&5
+      { echo "$as_me:24379: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

diff --git a/test/configure.in b/test/configure.in
index 6591f3ed509609e28300790faa97e5ae09bd59bc..4e947eb9cd8181b17a12c9c14f59d8bddfc65e46 100644 (file)
--- a/test/configure.in
+++ b/test/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1996-on
 dnl
-dnl $Id: configure.in,v 1.166 2022/08/20 16:35:33 tom Exp $
+dnl $Id: configure.in,v 1.167 2022/10/01 14:13:34 tom Exp $
 dnl This is a simple configuration-script for the ncurses test programs that
 dnl allows the test-directory to be separately configured against a reference
 dnl system (i.e., sysvr4 curses)
@@ -538,5 +538,7 @@ fi
 AWK="$AWK"
 ECHO_CC="$ECHO_CC"
 ECHO_LD="$ECHO_LD"
+EGREP="${EGREP-grep -E}"
+FGREP="${FGREP-grep -F}"
 SHOW_CC="$SHOW_LD"
 ],cat)