--- bash-2.03.orig/support/rlvers.sh +++ bash-2.03/support/rlvers.sh @@ -52,7 +52,7 @@ } EOF -if eval ${CC} -L${RL_LIBDIR} -o /tmp/rlvers /tmp/rlvers.c -lreadline -ltermcap -lcurses; +if eval ${CC} -L${RL_LIBDIR} -o /tmp/rlvers /tmp/rlvers.c -lreadline -lcurses; then v=`/tmp/rlvers` else --- bash-2.03.orig/configure +++ bash-2.03/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in for Bash 2.03, version 2.49, from autoconf version 2.12 +# From configure.in for Bash 2.03, version 2.49, from autoconf version 2.13 @@ -90,7 +90,7 @@ # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -196,6 +196,7 @@ # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 @@ -479,7 +480,7 @@ verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -649,9 +650,11 @@ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -691,26 +694,26 @@ # Make sure we can run config.sub. -if $ac_config_sub sun4 >/dev/null 2>&1; then : +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:700: checking host system type" >&5 +echo "configure:703: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) - if host_alias=`$ac_config_guess`; then : + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac -host=`$ac_config_sub $host_alias` +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` @@ -1101,15 +1104,16 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1105: checking for $ac_word" >&5 +echo "configure:1108: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -1130,16 +1134,17 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1134: checking for $ac_word" >&5 +echo "configure:1138: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then @@ -1174,25 +1179,61 @@ echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1189: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1182: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1221: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -cat > conftest.$ac_ext < conftest.$ac_ext << EOF + +#line 1232 "configure" #include "confdefs.h" + main(){return(0);} EOF -if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1206,18 +1247,24 @@ ac_cv_prog_cc_works=no fi rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1216: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1263: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1221: checking whether we are using GNU C" >&5 +echo "configure:1268: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1226,7 +1273,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1237,11 +1284,15 @@ if test $ac_cv_prog_gcc = yes; then GCC=yes - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1245: checking whether ${CC-cc} accepts -g" >&5 +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:1296: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1256,20 +1307,24 @@ fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-O2" + CFLAGS="-g" fi else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi echo $ac_n "checking whether large file support needs explicit enabling""... $ac_c" 1>&6 -echo "configure:1273: checking whether large file support needs explicit enabling" >&5 +echo "configure:1328: checking whether large file support needs explicit enabling" >&5 ac_getconfs='' ac_result=yes ac_set='' @@ -1301,7 +1356,7 @@ esac echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1305: checking for POSIXized ISC" >&5 +echo "configure:1360: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1322,7 +1377,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1326: checking how to run the C preprocessor" >&5 +echo "configure:1381: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1337,14 +1392,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -1354,14 +1409,31 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -1374,6 +1446,8 @@ rm -f conftest* fi rm -f conftest* +fi +rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" @@ -1384,18 +1458,18 @@ ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1388: checking for minix/config.h" >&5 +echo "configure:1462: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -1494,13 +1568,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1498: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1572: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1518,7 +1592,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1549,7 +1623,7 @@ test "x$exec_prefix" = xNONE && _rl_exec_prefix=${_rl_prefix} || _rl_exec_prefix=${exec_prefix} echo $ac_n "checking version of installed readline library""... $ac_c" 1>&6 -echo "configure:1553: checking version of installed readline library" >&5 +echo "configure:1627: checking version of installed readline library" >&5 _rl_version=`exec_prefix=${_rl_exec_prefix} ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/rlvers.sh -C "${CC}" -L ${libdir}` echo "$ac_t""$_rl_version" 1>&6 @@ -1623,28 +1697,30 @@ # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1631: checking for a BSD compatible install" >&5 +echo "configure:1706: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in ginstall installbsd scoinst install; do + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" @@ -1674,20 +1750,23 @@ # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1683: checking for $ac_word" >&5 +echo "configure:1761: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_AR="ar" @@ -1708,15 +1787,16 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1712: checking for $ac_word" >&5 +echo "configure:1791: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" @@ -1739,15 +1819,16 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1743: checking for $ac_word" >&5 +echo "configure:1823: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_YACC="$ac_prog" @@ -1769,7 +1850,7 @@ test -n "$YACC" || YACC="yacc" echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1773: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1854: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1805,19 +1886,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1809: checking for working alloca.h" >&5 +echo "configure:1890: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1838,25 +1919,30 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1842: checking for alloca" >&5 +echo "configure:1923: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +# ifdef _MSC_VER +# include +# define alloca _alloca # else -# ifdef _AIX - #pragma alloca +# if HAVE_ALLOCA_H +# include # else -# ifndef alloca /* predefined by HP cc +Olibcalls */ +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); +# endif # endif # endif # endif @@ -1866,7 +1952,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:1870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1891,19 +1977,19 @@ # that cause trouble. Some versions do not even contain alloca or # contain a buggy version. If you still want to use their alloca, # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.o + ALLOCA=alloca.${ac_objext} cat >> confdefs.h <<\EOF #define C_ALLOCA 1 EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1902: checking whether alloca needs Cray hooks" >&5 +echo "configure:1988: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1932: checking for $ac_func" >&5 +echo "configure:2018: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1983,7 +2069,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1987: checking stack direction for C alloca" >&5 +echo "configure:2073: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1991,7 +2077,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2032,7 +2118,7 @@ fi echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:2036: checking whether getpgrp takes no argument" >&5 +echo "configure:2122: checking whether getpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2040,7 +2126,7 @@ { echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_getpgrp_void=yes else @@ -2119,7 +2205,7 @@ fi echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:2123: checking whether setvbuf arguments are reversed" >&5 +echo "configure:2209: checking whether setvbuf arguments are reversed" >&5 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2127,7 +2213,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < /* If setvbuf has the reversed format, exit 0. */ @@ -2141,7 +2227,7 @@ exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:2145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -2165,12 +2251,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2169: checking for vprintf" >&5 +echo "configure:2255: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2217,12 +2303,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2221: checking for _doprnt" >&5 +echo "configure:2307: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2270,7 +2356,7 @@ fi echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6 -echo "configure:2274: checking for wait3 that fills in rusage" >&5 +echo "configure:2360: checking for wait3 that fills in rusage" >&5 if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2278,7 +2364,7 @@ ac_cv_func_wait3_rusage=no else cat > conftest.$ac_ext < #include @@ -2309,7 +2395,7 @@ } } EOF -if { (eval echo configure:2313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_wait3_rusage=yes else @@ -2332,7 +2418,7 @@ fi echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:2336: checking for working strcoll" >&5 +echo "configure:2422: checking for working strcoll" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcoll_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2340,7 +2426,7 @@ ac_cv_func_strcoll_works=no else cat > conftest.$ac_ext < main () @@ -2350,7 +2436,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:2354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_strcoll_works=yes else @@ -2375,9 +2461,9 @@ if test "$ac_cv_func_vprintf" = no; then echo $ac_n "checking for declaration of vprintf in stdio.h""... $ac_c" 1>&6 -echo "configure:2379: checking for declaration of vprintf in stdio.h" >&5 +echo "configure:2465: checking for declaration of vprintf in stdio.h" >&5 cat > conftest.$ac_ext < EOF @@ -2398,12 +2484,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2402: checking return type of signal handlers" >&5 +echo "configure:2488: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2420,7 +2506,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2440,12 +2526,12 @@ echo $ac_n "checking for __setostype""... $ac_c" 1>&6 -echo "configure:2444: checking for __setostype" >&5 +echo "configure:2530: checking for __setostype" >&5 if eval "test \"`echo '$''{'ac_cv_func___setostype'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___setostype=yes" else @@ -2491,12 +2577,12 @@ fi echo $ac_n "checking for wait3""... $ac_c" 1>&6 -echo "configure:2495: checking for wait3" >&5 +echo "configure:2581: checking for wait3" >&5 if eval "test \"`echo '$''{'ac_cv_func_wait3'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_wait3=yes" else @@ -2543,12 +2629,12 @@ echo $ac_n "checking for mkfifo""... $ac_c" 1>&6 -echo "configure:2547: checking for mkfifo" >&5 +echo "configure:2633: checking for mkfifo" >&5 if eval "test \"`echo '$''{'ac_cv_func_mkfifo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_mkfifo=yes" else @@ -2603,12 +2689,12 @@ getrlimit getrusage gettimeofday waitpid tcgetpgrp rename do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2607: checking for $ac_func" >&5 +echo "configure:2693: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2662,12 +2748,12 @@ siginterrupt memmove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2666: checking for $ac_func" >&5 +echo "configure:2752: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2719,18 +2805,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2723: checking for $ac_hdr" >&5 +echo "configure:2809: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -2758,12 +2844,12 @@ for ac_func in gettext textdomain bindtextdomain do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2762: checking for $ac_func" >&5 +echo "configure:2848: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2813,7 +2899,7 @@ if test "$ac_cv_func_bindtextdomain" = "no"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:2817: checking for bindtextdomain in -lintl" >&5 +echo "configure:2903: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2821,7 +2907,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2863,12 +2949,12 @@ for ac_func in gettext textdomain bindtextdomain do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2867: checking for $ac_func" >&5 +echo "configure:2953: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2920,7 +3006,7 @@ if test "$opt_static_link" != yes; then echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2924: checking for dlopen in -ldl" >&5 +echo "configure:3010: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2928,7 +3014,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2969,12 +3055,12 @@ for ac_func in dlopen dlclose dlsym do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2973: checking for $ac_func" >&5 +echo "configure:3059: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3024,12 +3110,12 @@ fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:3028: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:3114: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3041,7 +3127,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:3045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -3067,12 +3153,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:3071: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3157: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -3080,7 +3166,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3105,7 +3191,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:3109: checking for opendir in -ldir" >&5 +echo "configure:3195: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3113,7 +3199,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3146,7 +3232,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3150: checking for opendir in -lx" >&5 +echo "configure:3236: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3154,7 +3240,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3188,12 +3274,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3192: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3278: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3202,7 +3288,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3229,18 +3315,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3233: checking for $ac_hdr" >&5 +echo "configure:3319: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -3271,18 +3357,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3275: checking for $ac_hdr" >&5 +echo "configure:3361: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -3314,14 +3400,14 @@ _bash_needmsg= else echo $ac_n "checking for socket library""... $ac_c" 1>&6 -echo "configure:3318: checking for socket library" >&5 +echo "configure:3404: checking for socket library" >&5 _bash_needmsg=yes fi if eval "test \"`echo '$''{'bash_cv_have_socklib'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for getpeername in -lsocket""... $ac_c" 1>&6 -echo "configure:3325: checking for getpeername in -lsocket" >&5 +echo "configure:3411: checking for getpeername in -lsocket" >&5 ac_lib_var=`echo socket'_'getpeername | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3329,7 +3415,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket -lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3373,14 +3459,14 @@ _bash_needmsg= else echo $ac_n "checking for libnsl""... $ac_c" 1>&6 -echo "configure:3377: checking for libnsl" >&5 +echo "configure:3463: checking for libnsl" >&5 _bash_needmsg=yes fi if eval "test \"`echo '$''{'bash_cv_have_libnsl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for t_open in -lnsl""... $ac_c" 1>&6 -echo "configure:3384: checking for t_open in -lnsl" >&5 +echo "configure:3470: checking for t_open in -lnsl" >&5 ac_lib_var=`echo nsl'_'t_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3388,7 +3474,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3444,12 +3530,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3448: checking for uid_t in sys/types.h" >&5 +echo "configure:3534: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -3478,7 +3564,7 @@ fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:3482: checking type of array argument to getgroups" >&5 +echo "configure:3568: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3486,7 +3572,7 @@ ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -3525,7 +3611,7 @@ if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -3549,12 +3635,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3553: checking for ANSI C header files" >&5 +echo "configure:3639: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3562,8 +3648,8 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes @@ -3579,7 +3665,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3597,7 +3683,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3618,7 +3704,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3629,7 +3715,7 @@ exit (0); } EOF -if { (eval echo configure:3633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3653,12 +3739,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3657: checking for off_t" >&5 +echo "configure:3743: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3667,7 +3753,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_off_t=yes else @@ -3686,12 +3772,12 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3690: checking for mode_t" >&5 +echo "configure:3776: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3700,7 +3786,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_mode_t=yes else @@ -3719,12 +3805,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3723: checking for uid_t in sys/types.h" >&5 +echo "configure:3809: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -3753,12 +3839,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3757: checking for pid_t" >&5 +echo "configure:3843: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3767,7 +3853,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_pid_t=yes else @@ -3786,12 +3872,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3790: checking for size_t" >&5 +echo "configure:3876: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3800,7 +3886,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_size_t=yes else @@ -3819,12 +3905,12 @@ fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:3823: checking for time_t" >&5 +echo "configure:3909: checking for time_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3833,7 +3919,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "time_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])time_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_time_t=yes else @@ -3853,12 +3939,12 @@ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3857: checking return type of signal handlers" >&5 +echo "configure:3943: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3875,7 +3961,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:3879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3895,7 +3981,7 @@ echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:3899: checking size of int" >&5 +echo "configure:3985: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3903,7 +3989,7 @@ ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -3914,7 +4000,7 @@ exit(0); } EOF -if { (eval echo configure:3918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -3934,7 +4020,7 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:3938: checking size of long" >&5 +echo "configure:4024: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3942,7 +4028,7 @@ ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -3953,7 +4039,7 @@ exit(0); } EOF -if { (eval echo configure:3957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -3973,7 +4059,7 @@ echo $ac_n "checking size of char *""... $ac_c" 1>&6 -echo "configure:3977: checking size of char *" >&5 +echo "configure:4063: checking size of char *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3981,7 +4067,7 @@ ac_cv_sizeof_char_p=4 else cat > conftest.$ac_ext < main() @@ -3992,7 +4078,7 @@ exit(0); } EOF -if { (eval echo configure:3996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char_p=`cat conftestval` else @@ -4012,7 +4098,7 @@ echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:4016: checking size of double" >&5 +echo "configure:4102: checking size of double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4020,7 +4106,7 @@ ac_cv_sizeof_double=8 else cat > conftest.$ac_ext < main() @@ -4031,7 +4117,7 @@ exit(0); } EOF -if { (eval echo configure:4035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -4054,12 +4140,12 @@ if test "$ac_cv_sizeof_int" = 4; then echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:4058: checking for int32_t" >&5 +echo "configure:4144: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4068,7 +4154,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_int32_t=yes else @@ -4088,12 +4174,12 @@ elif test "$ac_cv_sizeof_long" = 4; then echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:4092: checking for int32_t" >&5 +echo "configure:4178: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4102,7 +4188,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_int32_t=yes else @@ -4122,12 +4208,12 @@ else echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:4126: checking for int32_t" >&5 +echo "configure:4212: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4136,7 +4222,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_int32_t=yes else @@ -4159,12 +4245,12 @@ if test "$ac_cv_sizeof_int" = 4; then echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6 -echo "configure:4163: checking for u_int32_t" >&5 +echo "configure:4249: checking for u_int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4173,7 +4259,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "u_int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])u_int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_u_int32_t=yes else @@ -4193,12 +4279,12 @@ elif test "$ac_cv_sizeof_long" = 4; then echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6 -echo "configure:4197: checking for u_int32_t" >&5 +echo "configure:4283: checking for u_int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4207,7 +4293,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "u_int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])u_int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_u_int32_t=yes else @@ -4227,12 +4313,12 @@ else echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6 -echo "configure:4231: checking for u_int32_t" >&5 +echo "configure:4317: checking for u_int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4241,7 +4327,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "u_int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])u_int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_u_int32_t=yes else @@ -4264,12 +4350,12 @@ if test "$ac_cv_sizeof_int" = "$ac_cv_sizeof_char_p"; then echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6 -echo "configure:4268: checking for ptrdiff_t" >&5 +echo "configure:4354: checking for ptrdiff_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ptrdiff_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4278,7 +4364,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ptrdiff_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])ptrdiff_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_ptrdiff_t=yes else @@ -4298,12 +4384,12 @@ elif test "$ac_cv_sizeof_long" = "$ac_cv_sizeof_char_p"; then echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6 -echo "configure:4302: checking for ptrdiff_t" >&5 +echo "configure:4388: checking for ptrdiff_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ptrdiff_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4312,7 +4398,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ptrdiff_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])ptrdiff_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_ptrdiff_t=yes else @@ -4332,12 +4418,12 @@ else echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6 -echo "configure:4336: checking for ptrdiff_t" >&5 +echo "configure:4422: checking for ptrdiff_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ptrdiff_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4346,7 +4432,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "ptrdiff_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])ptrdiff_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_ptrdiff_t=yes else @@ -4369,12 +4455,12 @@ if test "$ac_sv_sizeof_char_p" = 8; then echo $ac_n "checking for bits64_t""... $ac_c" 1>&6 -echo "configure:4373: checking for bits64_t" >&5 +echo "configure:4459: checking for bits64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_bits64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4383,7 +4469,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "bits64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])bits64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_bits64_t=yes else @@ -4403,12 +4489,12 @@ elif test "$ac_cv_sizeof_double" = 8; then echo $ac_n "checking for bits64_t""... $ac_c" 1>&6 -echo "configure:4407: checking for bits64_t" >&5 +echo "configure:4493: checking for bits64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_bits64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4417,7 +4503,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "bits64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])bits64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_bits64_t=yes else @@ -4437,12 +4523,12 @@ elif test "$ac_cv_sizeof_long" = 8; then echo $ac_n "checking for bits64_t""... $ac_c" 1>&6 -echo "configure:4441: checking for bits64_t" >&5 +echo "configure:4527: checking for bits64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_bits64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4451,7 +4537,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "bits64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])bits64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_bits64_t=yes else @@ -4471,12 +4557,12 @@ else echo $ac_n "checking for bits64_t""... $ac_c" 1>&6 -echo "configure:4475: checking for bits64_t" >&5 +echo "configure:4561: checking for bits64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_bits64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4485,7 +4571,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "bits64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])bits64_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_bits64_t=yes else @@ -4507,12 +4593,12 @@ echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:4511: checking whether stat file-mode macros are broken" >&5 +echo "configure:4597: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4563,7 +4649,7 @@ fi cat > conftest.$ac_ext < EOF @@ -4576,7 +4662,7 @@ if test -z "$bash_cv_struct_timeval"; then cat > conftest.$ac_ext < EOF @@ -4599,14 +4685,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4603: checking whether byte ordering is bigendian" >&5 +echo "configure:4689: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -4617,11 +4703,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:4621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -4632,7 +4718,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:4636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4652,7 +4738,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -4692,7 +4778,7 @@ # Pull the hash mark out of the macro call to avoid m4 problems. ac_msg="whether #! works in shell scripts" echo $ac_n "checking $ac_msg""... $ac_c" 1>&6 -echo "configure:4696: checking $ac_msg" >&5 +echo "configure:4782: checking $ac_msg" >&5 if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4710,6 +4796,7 @@ fi echo "$ac_t""$ac_cv_sys_interpreter" 1>&6 +interpval="$ac_cv_sys_interpreter" if test $ac_cv_sys_interpreter = yes; then cat >> confdefs.h <<\EOF @@ -4718,7 +4805,7 @@ fi echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6 -echo "configure:4722: checking for restartable system calls" >&5 +echo "configure:4809: checking for restartable system calls" >&5 if eval "test \"`echo '$''{'ac_cv_sys_restartable_syscalls'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4726,7 +4813,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sys_restartable_syscalls=yes else @@ -4769,12 +4856,12 @@ if test "$ac_cv_func_lstat" = "no"; then echo $ac_n "checking for lstat""... $ac_c" 1>&6 -echo "configure:4773: checking for lstat" >&5 +echo "configure:4860: checking for lstat" >&5 if eval "test \"`echo '$''{'bash_cv_func_lstat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4784,7 +4871,7 @@ lstat(".",(struct stat *)0); ; return 0; } EOF -if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* bash_cv_func_lstat=yes else @@ -4807,7 +4894,7 @@ fi echo $ac_n "checking if dup2 fails to clear the close-on-exec flag""... $ac_c" 1>&6 -echo "configure:4811: checking if dup2 fails to clear the close-on-exec flag" >&5 +echo "configure:4898: checking if dup2 fails to clear the close-on-exec flag" >&5 if eval "test \"`echo '$''{'bash_cv_dup2_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4816,7 +4903,7 @@ bash_cv_dup2_broken=no else cat > conftest.$ac_ext < @@ -4836,7 +4923,7 @@ } EOF -if { (eval echo configure:4840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_dup2_broken=yes else @@ -4861,7 +4948,7 @@ echo $ac_n "checking whether pgrps need synchronization""... $ac_c" 1>&6 -echo "configure:4865: checking whether pgrps need synchronization" >&5 +echo "configure:4952: checking whether pgrps need synchronization" >&5 if eval "test \"`echo '$''{'bash_cv_pgrp_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4870,7 +4957,7 @@ bash_cv_pgrp_pipe=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_pgrp_pipe=no else @@ -4947,13 +5034,13 @@ echo $ac_n "checking for type of signal functions""... $ac_c" 1>&6 -echo "configure:4951: checking for type of signal functions" >&5 +echo "configure:5038: checking for type of signal functions" >&5 if eval "test \"`echo '$''{'bash_cv_signal_vintage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -4966,7 +5053,7 @@ ; return 0; } EOF -if { (eval echo configure:4970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* bash_cv_signal_vintage=posix else @@ -4975,7 +5062,7 @@ rm -rf conftest* cat > conftest.$ac_ext < int main() { @@ -4985,7 +5072,7 @@ ; return 0; } EOF -if { (eval echo configure:4989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* bash_cv_signal_vintage=4.2bsd else @@ -4994,7 +5081,7 @@ rm -rf conftest* cat > conftest.$ac_ext < @@ -5007,7 +5094,7 @@ ; return 0; } EOF -if { (eval echo configure:5011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* bash_cv_signal_vintage=svr3 else @@ -5049,7 +5136,7 @@ if test "$ac_cv_sys_restartable_syscalls" = "no"; then echo $ac_n "checking for restartable system calls with posix sigaction""... $ac_c" 1>&6 -echo "configure:5053: checking for restartable system calls with posix sigaction" >&5 +echo "configure:5140: checking for restartable system calls with posix sigaction" >&5 if eval "test \"`echo '$''{'bash_cv_sys_restartable_syscalls'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5057,7 +5144,7 @@ echo "configure: warning: cannot check restartable syscalls if cross compiling" 1>&2 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_sys_restartable_syscalls=yes else @@ -5117,12 +5204,12 @@ fi echo $ac_n "checking for sys_errlist and sys_nerr""... $ac_c" 1>&6 -echo "configure:5121: checking for sys_errlist and sys_nerr" >&5 +echo "configure:5208: checking for sys_errlist and sys_nerr" >&5 if eval "test \"`echo '$''{'bash_cv_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -5131,7 +5218,7 @@ char *msg = sys_errlist[sys_nerr - 1]; ; return 0; } EOF -if { (eval echo configure:5135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* bash_cv_sys_errlist=yes else @@ -5152,7 +5239,7 @@ echo $ac_n "checking for sys_siglist in system C library""... $ac_c" 1>&6 -echo "configure:5156: checking for sys_siglist in system C library" >&5 +echo "configure:5243: checking for sys_siglist in system C library" >&5 if eval "test \"`echo '$''{'bash_cv_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5161,7 +5248,7 @@ bash_cv_sys_siglist=no else cat > conftest.$ac_ext < @@ -5178,7 +5265,7 @@ exit(msg == 0); } EOF -if { (eval echo configure:5182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_sys_siglist=yes else @@ -5201,12 +5288,12 @@ fi echo $ac_n "checking for _sys_siglist in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:5205: checking for _sys_siglist in signal.h or unistd.h" >&5 +echo "configure:5292: checking for _sys_siglist in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'bash_cv_decl_under_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5218,7 +5305,7 @@ char *msg = _sys_siglist[2]; ; return 0; } EOF -if { (eval echo configure:5222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_decl_under_sys_siglist=yes else @@ -5239,7 +5326,7 @@ echo $ac_n "checking for _sys_siglist in system C library""... $ac_c" 1>&6 -echo "configure:5243: checking for _sys_siglist in system C library" >&5 +echo "configure:5330: checking for _sys_siglist in system C library" >&5 if eval "test \"`echo '$''{'bash_cv_under_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5248,7 +5335,7 @@ bash_cv_under_sys_siglist=no else cat > conftest.$ac_ext < @@ -5265,7 +5352,7 @@ exit(msg == 0); } EOF -if { (eval echo configure:5269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_under_sys_siglist=yes else @@ -5289,12 +5376,12 @@ echo $ac_n "checking whether signal handlers are of type void""... $ac_c" 1>&6 -echo "configure:5293: checking whether signal handlers are of type void" >&5 +echo "configure:5380: checking whether signal handlers are of type void" >&5 if eval "test \"`echo '$''{'bash_cv_void_sighandler'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5309,7 +5396,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:5313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_void_sighandler=yes else @@ -5329,12 +5416,12 @@ fi echo $ac_n "checking for clock_t""... $ac_c" 1>&6 -echo "configure:5333: checking for clock_t" >&5 +echo "configure:5420: checking for clock_t" >&5 if eval "test \"`echo '$''{'bash_cv_type_clock_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5365,12 +5452,12 @@ fi echo $ac_n "checking for sigset_t""... $ac_c" 1>&6 -echo "configure:5369: checking for sigset_t" >&5 +echo "configure:5456: checking for sigset_t" >&5 if eval "test \"`echo '$''{'bash_cv_type_sigset_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5401,12 +5488,12 @@ fi echo $ac_n "checking for quad_t""... $ac_c" 1>&6 -echo "configure:5405: checking for quad_t" >&5 +echo "configure:5492: checking for quad_t" >&5 if eval "test \"`echo '$''{'bash_cv_type_quad_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5442,12 +5529,12 @@ fi echo $ac_n "checking for size and type of struct rlimit fields""... $ac_c" 1>&6 -echo "configure:5446: checking for size and type of struct rlimit fields" >&5 +echo "configure:5533: checking for size and type of struct rlimit fields" >&5 if eval "test \"`echo '$''{'bash_cv_type_rlimit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5455,7 +5542,7 @@ rlim_t xxx; ; return 0; } EOF -if { (eval echo configure:5459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_type_rlimit=rlim_t else @@ -5468,7 +5555,7 @@ bash_cv_type_rlimit=long else cat > conftest.$ac_ext < @@ -5484,7 +5571,7 @@ exit(1); } EOF -if { (eval echo configure:5488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_type_rlimit=quad_t else @@ -5516,12 +5603,12 @@ echo $ac_n "checking for a c_line member of struct termios""... $ac_c" 1>&6 -echo "configure:5520: checking for a c_line member of struct termios" >&5 +echo "configure:5607: checking for a c_line member of struct termios" >&5 if eval "test \"`echo '$''{'bash_cv_termios_ldisc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5529,7 +5616,7 @@ struct termios t; int i; i = t.c_line; ; return 0; } EOF -if { (eval echo configure:5533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_termios_ldisc=yes else @@ -5549,12 +5636,12 @@ fi echo $ac_n "checking for a c_line member of struct termio""... $ac_c" 1>&6 -echo "configure:5553: checking for a c_line member of struct termio" >&5 +echo "configure:5640: checking for a c_line member of struct termio" >&5 if eval "test \"`echo '$''{'bash_cv_termio_ldisc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5562,7 +5649,7 @@ struct termio t; int i; i = t.c_line; ; return 0; } EOF -if { (eval echo configure:5566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_termio_ldisc=yes else @@ -5583,12 +5670,12 @@ echo $ac_n "checking if struct dirent has a d_ino member""... $ac_c" 1>&6 -echo "configure:5587: checking if struct dirent has a d_ino member" >&5 +echo "configure:5674: checking if struct dirent has a d_ino member" >&5 if eval "test \"`echo '$''{'bash_cv_dirent_has_dino'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5617,7 +5704,7 @@ ; return 0; } EOF -if { (eval echo configure:5621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_dirent_has_dino=yes else @@ -5639,12 +5726,12 @@ echo $ac_n "checking if struct dirent has a d_fileno member""... $ac_c" 1>&6 -echo "configure:5643: checking if struct dirent has a d_fileno member" >&5 +echo "configure:5730: checking if struct dirent has a d_fileno member" >&5 if eval "test \"`echo '$''{'bash_cv_dirent_has_d_fileno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5673,7 +5760,7 @@ ; return 0; } EOF -if { (eval echo configure:5677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_dirent_has_d_fileno=yes else @@ -5694,12 +5781,12 @@ fi echo $ac_n "checking for struct winsize in sys/ioctl.h and termios.h""... $ac_c" 1>&6 -echo "configure:5698: checking for struct winsize in sys/ioctl.h and termios.h" >&5 +echo "configure:5785: checking for struct winsize in sys/ioctl.h and termios.h" >&5 if eval "test \"`echo '$''{'bash_cv_struct_winsize_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5707,7 +5794,7 @@ struct winsize x; ; return 0; } EOF -if { (eval echo configure:5711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_struct_winsize_header=ioctl_h else @@ -5715,7 +5802,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < #include @@ -5723,7 +5810,7 @@ struct winsize x; ; return 0; } EOF -if { (eval echo configure:5727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_struct_winsize_header=termios_h else @@ -5756,12 +5843,12 @@ echo $ac_n "checking for the existence of strsignal""... $ac_c" 1>&6 -echo "configure:5760: checking for the existence of strsignal" >&5 +echo "configure:5847: checking for the existence of strsignal" >&5 if eval "test \"`echo '$''{'bash_cv_have_strsignal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5769,7 +5856,7 @@ char *s = (char *)strsignal(2); ; return 0; } EOF -if { (eval echo configure:5773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* bash_cv_have_strsignal=yes else @@ -5790,7 +5877,7 @@ fi echo $ac_n "checking if opendir() opens non-directories""... $ac_c" 1>&6 -echo "configure:5794: checking if opendir() opens non-directories" >&5 +echo "configure:5881: checking if opendir() opens non-directories" >&5 if eval "test \"`echo '$''{'bash_cv_opendir_not_robust'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5800,7 +5887,7 @@ else cat > conftest.$ac_ext < @@ -5826,17 +5913,23 @@ main() { DIR *dir; -int fd; -unlink("/tmp/not_a_directory"); -fd = open("/tmp/not_a_directory", O_WRONLY|O_CREAT, 0666); +int fd, err; + +err = mkdir("/tmp/bash-aclocal", 0700); +if (err == -1) { + perror("mkdir"); + exit (1); +} +fd = open("/tmp/bash-aclocal/not_a_directory", O_WRONLY|O_CREAT, 0666); write(fd, "\n", 1); close(fd); -dir = opendir("/tmp/not_a_directory"); -unlink("/tmp/not_a_directory"); +dir = opendir("/tmp/bash-aclocal/not_a_directory"); +unlink("/tmp/bash-aclocal/not_a_directory"); +rmdir("/tmp/bash-aclocal"); exit (dir == 0); } EOF -if { (eval echo configure:5840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_opendir_not_robust=yes else @@ -5859,7 +5952,7 @@ fi echo $ac_n "checking for declaration of printf in ""... $ac_c" 1>&6 -echo "configure:5863: checking for declaration of printf in " >&5 +echo "configure:5956: checking for declaration of printf in " >&5 if eval "test \"`echo '$''{'bash_cv_printf_declared'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5869,7 +5962,7 @@ else cat > conftest.$ac_ext < @@ -5886,7 +5979,7 @@ } EOF -if { (eval echo configure:5890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_printf_declared=yes else @@ -5909,7 +6002,7 @@ fi echo $ac_n "checking whether ulimit can substitute for getdtablesize""... $ac_c" 1>&6 -echo "configure:5913: checking whether ulimit can substitute for getdtablesize" >&5 +echo "configure:6006: checking whether ulimit can substitute for getdtablesize" >&5 if eval "test \"`echo '$''{'bash_cv_ulimit_maxfds'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5919,7 +6012,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_ulimit_maxfds=yes else @@ -5952,7 +6045,7 @@ fi echo $ac_n "checking to see if getenv can be redefined""... $ac_c" 1>&6 -echo "configure:5956: checking to see if getenv can be redefined" >&5 +echo "configure:6049: checking to see if getenv can be redefined" >&5 if eval "test \"`echo '$''{'bash_cv_getenv_redef'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5962,7 +6055,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_getenv_redef=yes else @@ -6020,7 +6113,7 @@ fi echo $ac_n "checking if getcwd() calls popen()""... $ac_c" 1>&6 -echo "configure:6024: checking if getcwd() calls popen()" >&5 +echo "configure:6117: checking if getcwd() calls popen()" >&5 if eval "test \"`echo '$''{'bash_cv_getcwd_calls_popen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6030,7 +6123,7 @@ else cat > conftest.$ac_ext < @@ -6085,7 +6178,7 @@ } EOF -if { (eval echo configure:6089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_getcwd_calls_popen=no else @@ -6108,12 +6201,12 @@ fi echo $ac_n "checking for declaration of sbrk in ""... $ac_c" 1>&6 -echo "configure:6112: checking for declaration of sbrk in " >&5 +echo "configure:6205: checking for declaration of sbrk in " >&5 if eval "test \"`echo '$''{'bash_cv_sbrk_declared'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -6139,7 +6232,7 @@ echo $ac_n "checking for presence of POSIX-style sigsetjmp/siglongjmp""... $ac_c" 1>&6 -echo "configure:6143: checking for presence of POSIX-style sigsetjmp/siglongjmp" >&5 +echo "configure:6236: checking for presence of POSIX-style sigsetjmp/siglongjmp" >&5 if eval "test \"`echo '$''{'bash_cv_func_sigsetjmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6149,7 +6242,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_func_sigsetjmp=present else @@ -6214,7 +6307,7 @@ echo $ac_n "checking whether or not strcoll and strcmp differ""... $ac_c" 1>&6 -echo "configure:6218: checking whether or not strcoll and strcmp differ" >&5 +echo "configure:6311: checking whether or not strcoll and strcmp differ" >&5 if eval "test \"`echo '$''{'bash_cv_func_strcoll_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6224,7 +6317,7 @@ else cat > conftest.$ac_ext < @@ -6263,7 +6356,7 @@ } EOF -if { (eval echo configure:6267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_func_strcoll_broken=yes else @@ -6289,7 +6382,7 @@ echo $ac_n "checking if signal handlers must be reinstalled when invoked""... $ac_c" 1>&6 -echo "configure:6293: checking if signal handlers must be reinstalled when invoked" >&5 +echo "configure:6386: checking if signal handlers must be reinstalled when invoked" >&5 if eval "test \"`echo '$''{'bash_cv_must_reinstall_sighandlers'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6299,7 +6392,7 @@ else cat > conftest.$ac_ext < @@ -6346,7 +6439,7 @@ } EOF -if { (eval echo configure:6350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_must_reinstall_sighandlers=no else @@ -6370,7 +6463,7 @@ echo $ac_n "checking for presence of necessary job control definitions""... $ac_c" 1>&6 -echo "configure:6374: checking for presence of necessary job control definitions" >&5 +echo "configure:6467: checking for presence of necessary job control definitions" >&5 if eval "test \"`echo '$''{'bash_cv_job_control_missing'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6380,7 +6473,7 @@ else cat > conftest.$ac_ext < @@ -6427,7 +6520,7 @@ exit(0); } EOF -if { (eval echo configure:6431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_job_control_missing=present else @@ -6450,7 +6543,7 @@ fi echo $ac_n "checking for presence of named pipes""... $ac_c" 1>&6 -echo "configure:6454: checking for presence of named pipes" >&5 +echo "configure:6547: checking for presence of named pipes" >&5 if eval "test \"`echo '$''{'bash_cv_sys_named_pipes'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6460,7 +6553,7 @@ else cat > conftest.$ac_ext < @@ -6472,7 +6565,7 @@ /* Add more tests in here as appropriate. */ main() { -int fd; +int fd, err; #if defined (HAVE_MKFIFO) exit (0); @@ -6486,15 +6579,21 @@ exit (1); #endif -fd = mknod ("/tmp/sh-np-autoconf", 0666 | S_IFIFO, 0); +err = mkdir ("/tmp/bash-aclocal", 0700); +if (err == -1) { + perror ("mkdir"); + exit (1); +} +fd = mknod ("/tmp/bash-aclocal/sh-np-autoconf", 0666 | S_IFIFO, 0); if (fd == -1) exit (1); close(fd); -unlink ("/tmp/sh-np-autoconf"); +unlink ("/tmp/bash-aclocal/sh-np-autoconf"); +rmdir ("/tmp/bash-aclocal"); exit(0); } EOF -if { (eval echo configure:6498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then bash_cv_sys_named_pipes=present else @@ -6518,12 +6617,12 @@ echo $ac_n "checking for TIOCGWINSZ in sys/ioctl.h""... $ac_c" 1>&6 -echo "configure:6522: checking for TIOCGWINSZ in sys/ioctl.h" >&5 +echo "configure:6621: checking for TIOCGWINSZ in sys/ioctl.h" >&5 if eval "test \"`echo '$''{'bash_cv_tiocgwinsz_in_ioctl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6531,7 +6630,7 @@ int x = TIOCGWINSZ; ; return 0; } EOF -if { (eval echo configure:6535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_tiocgwinsz_in_ioctl=yes else @@ -6552,12 +6651,12 @@ fi echo $ac_n "checking for TIOCSTAT in sys/ioctl.h""... $ac_c" 1>&6 -echo "configure:6556: checking for TIOCSTAT in sys/ioctl.h" >&5 +echo "configure:6655: checking for TIOCSTAT in sys/ioctl.h" >&5 if eval "test \"`echo '$''{'bash_cv_tiocstat_in_ioctl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6565,7 +6664,7 @@ int x = TIOCSTAT; ; return 0; } EOF -if { (eval echo configure:6569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_tiocstat_in_ioctl=yes else @@ -6586,12 +6685,12 @@ fi echo $ac_n "checking for FIONREAD in sys/ioctl.h""... $ac_c" 1>&6 -echo "configure:6590: checking for FIONREAD in sys/ioctl.h" >&5 +echo "configure:6689: checking for FIONREAD in sys/ioctl.h" >&5 if eval "test \"`echo '$''{'bash_cv_fionread_in_ioctl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6599,7 +6698,7 @@ int x = FIONREAD; ; return 0; } EOF -if { (eval echo configure:6603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6702: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_fionread_in_ioctl=yes else @@ -6621,19 +6720,19 @@ echo $ac_n "checking for speed_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:6625: checking for speed_t in sys/types.h" >&5 +echo "configure:6724: checking for speed_t in sys/types.h" >&5 if eval "test \"`echo '$''{'bash_cv_speed_t_in_sys_types'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { speed_t x; ; return 0; } EOF -if { (eval echo configure:6637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_speed_t_in_sys_types=yes else @@ -6654,12 +6753,12 @@ fi echo $ac_n "checking whether programs are able to redeclare getpw functions""... $ac_c" 1>&6 -echo "configure:6658: checking whether programs are able to redeclare getpw functions" >&5 +echo "configure:6757: checking whether programs are able to redeclare getpw functions" >&5 if eval "test \"`echo '$''{'bash_cv_can_redecl_getpw'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6670,7 +6769,7 @@ struct passwd *z; z = getpwent(); z = getpwuid(0); z = getpwnam("root"); ; return 0; } EOF -if { (eval echo configure:6674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_can_redecl_getpw=yes else @@ -6693,12 +6792,12 @@ case "$host_os" in hpux*) echo $ac_n "checking whether $host_os needs _KERNEL for RLIMIT defines""... $ac_c" 1>&6 -echo "configure:6697: checking whether $host_os needs _KERNEL for RLIMIT defines" >&5 +echo "configure:6796: checking whether $host_os needs _KERNEL for RLIMIT defines" >&5 if eval "test \"`echo '$''{'bash_cv_kernel_rlimit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6711,7 +6810,7 @@ ; return 0; } EOF -if { (eval echo configure:6715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_kernel_rlimit=no else @@ -6719,7 +6818,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -6734,7 +6833,7 @@ ; return 0; } EOF -if { (eval echo configure:6738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bash_cv_kernel_rlimit=yes else @@ -6768,14 +6867,14 @@ _bash_needmsg=yes else echo $ac_n "checking which library has the termcap functions""... $ac_c" 1>&6 -echo "configure:6772: checking which library has the termcap functions" >&5 +echo "configure:6871: checking which library has the termcap functions" >&5 _bash_needmsg= fi if eval "test \"`echo '$''{'bash_cv_termcap_lib'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:6779: checking for tgetent in -ltermcap" >&5 +echo "configure:6878: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6783,7 +6882,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6813,7 +6912,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:6817: checking for tgetent in -lcurses" >&5 +echo "configure:6916: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6821,7 +6920,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6851,7 +6950,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:6855: checking for tgetent in -lncurses" >&5 +echo "configure:6954: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6859,7 +6958,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6899,7 +6998,7 @@ if test "X$_bash_needmsg" = "Xyes"; then echo $ac_n "checking which library has the termcap functions""... $ac_c" 1>&6 -echo "configure:6903: checking which library has the termcap functions" >&5 +echo "configure:7002: checking which library has the termcap functions" >&5 fi echo "$ac_t""using $bash_cv_termcap_lib" 1>&6 if test $bash_cv_termcap_lib = gnutermcap && test -z "$prefer_curses"; then @@ -6922,7 +7021,7 @@ echo $ac_n "checking whether /dev/fd is available""... $ac_c" 1>&6 -echo "configure:6926: checking whether /dev/fd is available" >&5 +echo "configure:7025: checking whether /dev/fd is available" >&5 if eval "test \"`echo '$''{'bash_cv_dev_fd'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6958,7 +7057,7 @@ fi echo $ac_n "checking for default mail directory""... $ac_c" 1>&6 -echo "configure:6962: checking for default mail directory" >&5 +echo "configure:7061: checking for default mail directory" >&5 if eval "test \"`echo '$''{'bash_cv_mail_dir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7085,7 +7184,7 @@ if test "$ac_cv_func_dlopen" = "yes" && test -f ${srcdir}/support/shobj-conf then echo $ac_n "checking shared object configuration for loadable builtins""... $ac_c" 1>&6 -echo "configure:7089: checking shared object configuration for loadable builtins" >&5 +echo "configure:7188: checking shared object configuration for loadable builtins" >&5 eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C ${CC} -c ${host_cpu} -o ${host_os} -v ${host_vendor}` @@ -7160,7 +7259,7 @@ # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -7227,7 +7326,7 @@ echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.12" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -7250,9 +7349,11 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g @@ -7293,6 +7394,7 @@ s%@HISTORY_DEP@%$HISTORY_DEP%g s%@HIST_LIBDIR@%$HIST_LIBDIR%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@AR@%$AR%g s%@RANLIB@%$RANLIB%g --- bash-2.03.orig/debian/skel.bash_logout +++ bash-2.03/debian/skel.bash_logout @@ -0,0 +1,7 @@ +# ~/.bash_logout: executed by bash(1) when login shell exits. + +# when leaving the console clear the screen to increase privacy + +case "`tty`" in + /dev/tty[0-9]) clear +esac --- bash-2.03.orig/debian/rules +++ bash-2.03/debian/rules @@ -0,0 +1,299 @@ +#! /usr/bin/make -f +# -*- makefile -*- + +# architecture dependent variables +ARCH := $(shell dpkg --print-gnu-build-architecture) +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) + +CCLIBC1 = $(ARCH)-linuxlibc1-gcc +STRIP = strip +SHELL = bash +IX = install -o 0 -g 0 +ID = install -o 0 -g 0 -m 644 + +# build a statically linked bash? +with_static = yes + +# built with installed libreadline4 and do not build readline packages? +#with_installed_rl = yes +with_installed_rl = no + +#ifneq ($(with_installed_rl),yes) +# BINARY_ARCH_TARGETS += binary-rl binary-rld binary-rlg +# BUILD_TARGETS += build-rl-stamp +#endif + +#ifeq ($(filter $(ARCH),i486 m68k),$(ARCH)) +# BINARY_ARCH_TARGETS += binary-rl-libc5 binary-rld-libc5 +# BINARY_BUILD_TARGETS = build-libc5 +#endif + +debflags = +#ifeq ($(with_installed_rl),yes) +# debflags = \ +# READLINE_LDFLAGS= \ +# HISTORY_LDFLAGS= +#endif +#ifeq ($(with_static),yes) +# debflags = \ +# READLINE_LIBRARY=$(builddir)/lib/readline/static/libreadline.a \ +# READLINE_LDFLAGS="-L$(builddir)/lib/readline/static" \ +# READLINE_LIB="-Wl,-Bstatic -lreadline -Wl,-Bdynamic" \ +# HISTORY_LIBRARY=$(builddir)/lib/readline/static/libhistory.a \ +# HISTORY_LDFLAGS="-L$(builddir)/lib/readline/static" \ +# HISTORY_LIB="-Wl,-Bstatic -lhistory -Wl,-Bdynamic" +#endif +ifeq ($(with_static),yes) + debflags = \ + READLINE_LIBRARY=$(builddir)/lib/readline/static/libreadline.a \ + READLINE_LDFLAGS="-L$(builddir)/lib/readline/static" \ + READLINE_LIB="-Wl,-Bstatic -lreadline -Wl,-Bdynamic" \ + HISTORY_LIBRARY=$(builddir)/lib/readline/static/libhistory.a \ + HISTORY_LDFLAGS="-L$(builddir)/lib/readline/static" \ + HISTORY_LIB="-Wl,-Bstatic -lhistory -Wl,-Bdynamic" +endif + +PWD := $(shell pwd) +p = bash +p_bins = bash-builtins +p_doc = bash-doc + +d = debian/tmp +#d_bash = debian/tmp +d_bins = debian/tmp-b +d_doc = debian/tmp-doc + +srcdir = $(PWD) +builddir = $(PWD)/build + +default: build + +configure: configure-stamp +configure-stamp: patch-stamp + $(checkdir) + rm -rf $(builddir) + mkdir $(builddir) +ifeq ($(with_installed_rl),yes) + cd $(builddir) && $(srcdir)/configure --host=$(DEB_HOST_GNU_TYPE) \ + --with-curses --with-installed-readline --prefix=/usr +else + cd $(builddir) && $(srcdir)/configure --host=$(DEB_HOST_GNU_TYPE) \ + --with-curses --prefix=/usr +endif + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + $(checkdir) + $(MAKE) -C $(builddir) SOVERSION=$(soversion) \ + CFLAGS='-g -O2' \ + deb_builddir=$(builddir)/ $(debflags) + cd debian; $(CC) -O2 -s -o bash.preinst bash.preinst.c + touch build-stamp + +clean: + $(checkdir) + rm -f configure*-stamp build*-stamp + rm -rf $(builddir) $(builddir_libc5) + rm -rf $(d) $(d_doc) $(d_bins) \ + $(d_rl) $(d_rld) $(d_rlg) $(d_rl5) $(d_rl5d) + rm -f debian/{bash.preinst,rl.postinst} + $(MAKE) -f debian/rules unpatch + rm -rf debian/{files*,substvars,rl-libc[56].postinst} + find . \( -name '*~' -o -name '*.rej' -o -name '*.orig' \) \ + -print0 | xargs -0 rm -f + +install: checkroot install-stamp +install-stamp: build-stamp + $(checkdir) + rm -rf $(d) + rm -rf $(d) $(d_doc) $(d_bins) \ + $(d_rl) $(d_rld) $(d_rlg) $(d_rl5) $(d_rl5d) + mkdir -p $(d)/{bin,usr} + $(MAKE) -C $(builddir) install \ + prefix=$(PWD)/$(d)/usr \ + mandir=$(PWD)/$(d)/usr/share/man \ + infodir=$(PWD)/$(d)/usr/share/info \ + $(debflags) + mv $(d)/usr/bin/bash $(d)/bin/. + mkdir -p $(d_doc)/usr/share/info + mv $(d)/usr/share/info/bash.info $(d_doc)/usr/share/info/. + touch install-stamp + +binary-indep: checkroot build install + $(IX) -d $(d_doc)/DEBIAN \ + $(d_doc)/usr/share/doc/{$(p_doc),$(p)/examples/loadables} + $(ID) CWRU/changelog $(d_doc)/usr/share/doc/$(p) + find examples -type d \ + | xargs -i $(IX) -d '$(d_doc)/usr/share/doc/$(p)/{}' + find examples -type f \ + | xargs -i $(ID) '{}' '$(d_doc)/usr/share/doc/$(p)/{}' + rm -rf $(d_doc)/usr/share/doc/$(p)/examples/loadables + ln -sf ../$(p)/examples $(d_doc)/usr/share/doc/$(p_doc)/examples + $(ID) debian/changelog $(d_doc)/usr/share/doc/$(p_doc)/changelog.Debian + find $(d_doc)/usr/share/{info,doc} ! -name '*.gz' -type f \ + | xargs gzip -9f + ln -sf ../$(p)/changelog.gz \ + $(d_doc)/usr/share/doc/$(p_doc)/changelog.gz + $(ID) debian/bash.copyright $(d_doc)/usr/share/doc/$(p_doc)/copyright + $(IX) debian/bash-doc.postinst $(d_doc)/DEBIAN/postinst + $(IX) debian/bash-doc.prerm $(d_doc)/DEBIAN/prerm + dpkg-gencontrol -isp -p$(p_doc) -P$(d_doc) + dpkg --build $(d_doc) .. + +binary-arch: binary-bash binary-b + +binary-bash: checkroot build install + $(checkdir) +# rm -rf $(d) + $(IX) -d $(d)/DEBIAN $(d)/{etc/skel,usr/share/doc/$(p)} + ln -sf bash $(d)/bin/rbash + $(STRIP) --strip-unneeded $(d)/bin/bash + ln -sf bash $(d)/bin/sh + ln -sf bash.1.gz $(d)/usr/share/man/man1/sh.1.gz +# $(ID) debian/etc.profile $(d)/etc/profile + $(ID) debian/etc.bash.bashrc $(d)/etc/bash.bashrc + $(ID) debian/skel.bashrc $(d)/etc/skel/.bashrc + $(ID) debian/skel.bash_profile $(d)/etc/skel/.bash_profile + $(ID) debian/skel.bash_logout $(d)/etc/skel/.bash_logout + $(ID) NEWS COMPAT CHANGES doc/{FAQ,INTRO} CWRU/POSIX.NOTES \ + $(d)/usr/share/doc/$(p) + $(ID) debian/README.Debian $(d)/usr/share/doc/bash/. + $(ID) doc/{builtins.1,rbash.1} $(d)/usr/share/man/man1 + $(ID) debian/changelog $(d)/usr/share/doc/$(p)/changelog.Debian + find $(d)/usr/share/{doc,man} ! -name '*.gz' -type f | xargs gzip -9f + $(ID) debian/bash.copyright $(d)/usr/share/doc/$(p)/copyright + $(IX) debian/bash.preinst $(d)/DEBIAN/preinst + $(IX) debian/bash.postinst $(d)/DEBIAN/postinst + $(IX) debian/bash.prerm $(d)/DEBIAN/prerm + $(ID) debian/bash.conffiles $(d)/DEBIAN/conffiles + dpkg-shlibdeps -dPre-Depends $(d)/bin/bash debian/bash.preinst + dpkg-gencontrol -isp -p$(p) + dpkg --build $(d) .. + +# Even though it contains only headers and example files, +# bash-builtins is NOT arch-independent because the config.h* files +# differ on different archs. +binary-b: checkroot build install + $(checkdir) + rm -rf $(d_bins) + $(IX) -d $(d_bins)/{DEBIAN,usr/share/doc/$(p)/examples/loadables} \ + $(d_bins)/{usr/{include/bash/{builtins,lib/{glob,tilde}}}} + $(ID) *.h config-top.h config-bot.h $(d_bins)/usr/include/bash/ + $(ID) builtins/*.h $(d_bins)/usr/include/bash/builtins/ + $(ID) lib/glob/*.h $(d_bins)/usr/include/bash/lib/glob/ + $(ID) lib/tilde/*.h $(d_bins)/usr/include/bash/lib/tilde/ + $(ID) examples/loadables/{README,*.c} \ + $(d_bins)/usr/share/doc/$(p)/examples/loadables + $(ID) $(builddir)/examples/loadables/Makefile \ + $(d_bins)/usr/share/doc/$(p)/examples/loadables + ln -sf bash $(d_bins)/usr/share/doc/$(p_bins) + find $(d_bins)/usr/share/doc ! -name '*.gz' -type f | xargs gzip -9f + $(IX) debian/bins.postinst $(d_bins)/DEBIAN/postinst + $(IX) debian/bins.prerm $(d_bins)/DEBIAN/prerm + dpkg-gencontrol -isp -p$(p_bins) -P$(d_bins) + dpkg --build $(d_bins) .. + + +define checkdir + test -f bashline.c -a -f debian/rules +endef + + +binary: binary-indep binary-arch + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +checkroot: + $(checkdir) + test root = "`whoami`" + + +# rules to patch the unpacked files in the source directory +# --------------------------------------------------------------------------- +# various rules to unpack addons and (un)apply patches. +# - patch / apply-patches +# - unpatch / reverse-patches + +patchdir = debian/patches + +# which patches should be applied? +debian_patches = \ + builtin-echo \ + bashbug-editor \ + conf-update \ + deb-build \ + deb-defpath \ + dont-report-sigpipe \ + examples \ + jobs-segfault \ + mailcheck \ + manpages \ + man-vx-opts \ + privmode \ + random \ + system-bashrc \ + tempnam \ + various \ + rl-inputrc \ + rl-ctrl-char \ + rl-deb-build \ + rl-examples \ + rl-del-backspace-policy \ + rl-paren-matching \ + rl-shell-unknown-bug \ + secure-build \ + job-control-segfault + +# privmode # see comment from upstream author in patch +# applied-upstream +# rl-todo +# todo + +patch: patch-stamp +apply-patches: patch-stamp + +patch-stamp: $(foreach p,$(debian_patches),patch-stamp-$(p)) + echo -e "\nPatches applied in this version:" > pxxx + for i in $(debian_patches); do \ + echo -e "\n$$i:" >> pxxx; \ + sed -n 's/^# *DP: */ /p' $(patchdir)/$$i.dpatch >> pxxx; \ + done + mv -f pxxx $@ + +reverse-patches: unpatch +unpatch: + for stamp in none `ls -1t patch-stamp-* 2>/dev/null`; do \ + case "$$stamp" in none|patched-stamp|patched-\*) continue; esac; \ + patch=`echo $$stamp | sed -e 's,patch-stamp-,,'`; \ + echo "trying to revert patch $$patch ..."; \ + if [ -x $(patchdir)/$$patch.dpatch ]; then true; else \ + chmod +x $(patchdir)/$$patch.dpatch; fi; \ + if $(patchdir)/$$patch.dpatch -unpatch -d $(srcdir); then \ + echo "reverted $$patch patch."; \ + rm -f $$stamp; \ + else \ + echo "error in reverting $$patch patch."; \ + exit 1; \ + fi; \ + done + rm -f patched-stamp + +patch-stamp-%: $(patchdir)/%.dpatch + if [ -x $< ]; then true; else chmod +x $<; fi + if [ -f $@ ]; then \ + echo "$* patches already applied."; exit 1; \ + fi + $< -patch -d $(srcdir) + echo "$* patches applied." > $@ + + +.PHONY: binary binary-arch binary-indep clean checkroot + +# Local Variables: +# mode: makefile +# end: --- bash-2.03.orig/debian/bash.preinst.old +++ bash-2.03/debian/bash.preinst.old @@ -0,0 +1,5 @@ +#!/bin/sh +set -e +dpkg --assert-support-predepends || + ( echo -e "\nPlease upgrade to a newer version of dpkg\n"; exit 1 ) + --- bash-2.03.orig/debian/changelog +++ bash-2.03/debian/changelog @@ -0,0 +1,457 @@ +bash (2.03-6) frozen unstable; urgency=medium + + * debian/bash.preinst.c: Evil kludge, deal with arbitrary name lengths + (fixes #54876). + * Apply NMU (fixes #55887). + * debian/rules: Install debian/bash.conffiles (fixes #57963, #58541). + + -- Matthias Klose Sun, 20 Feb 2000 19:50:48 +0100 + +bash (2.03-5.1) unstable; urgency=low + + * debian/patches/job-control-segfault.dpatch: Patch from Eric Weigel + . Closes: #55887 + + -- Adam Heath Sat, 22 Jan 2000 15:10:50 -0600 + +bash (2.03-5) unstable; urgency=low + + * Update rl.ctrl-char patch from Dan Jacobowitz. + Fixes #54805, #54639, #54612. + * Add autoconf to Build-Depends (finally, Roman ...) + + -- Matthias Klose Tue, 11 Jan 2000 20:50:31 +0100 + +bash (2.03-4) unstable; urgency=low + + * debian/control: Fix build dependencies (fixes #52777). + * debian/rules: Cleanup. + * debian/patches/rl-ctrl-char.dpatch: Don't assume char is signed by + default (fixes #53252). + * Build with libncurses5-dev (fixes #54165). + * Fix changelog symlink in bash-doc package (fixes #54240). + * debian/README.Debian: Add paragraph for writing prompts. + * debian/README.Debian: Add paragraph about hashing of moved commands + (and closing #36877). + * Install more verbose skeleton files (closes #39728). + * The `-l' option to test is not included by intent (fixes #13645). + Comment from upstream: "The `-l' option should never have been documented, + and it was a mistake to include it in the first place -- it screws up the + grammar. Old Bourne shells and test commands had it because there was no + other way to find the length of a variable's value. Since bash has + ${#variable}, there's no need for it. POSIX.2 says, in the rationale, + that implementation is irregular and that the shell supports it directly. + * Report #26720: perl -e 'print ":;" x 100000' > foo; . ./foo dumps core. + Comment from upstream: This is not a bash bug; it is a process resource + problem. The default resource limit for stack size is 8M on my version of + Linux. The call tree created by the parser for the script (100000 calls + to `:') is 99999 nodes deep, and requires that many recursive calls to the + command execution routines. This overflows the stack, and bash segfaults. + I couldn't reproduce it anywhere but Linux, because the machines I tested + on all have reasonable default stack sizes. Raising the limit to 16M is + sufficient to cause the script to run successfully (I didn't try anything + between 8M and 16M). + * Report #30460: redirection is different from standard: bash --posix + $ mkdir foo; cd foo; echo anything goes > "this file" + $ for f in *; do tr ay \ o < $f | cat; done + sh: $f: ambiguous redirect + This is POSIX.2 behaviour. + * debian/bash.preinst.c: Check if /bin/sh points to something other than + bash and is not diverted and point to README.Debian how to divert + a file (fixes #34717, #45656). + + -- Matthias Klose Fri, 7 Jan 2000 07:19:00 +0100 + +bash (2.03-3) unstable; urgency=low + + * Moved /etc/profile to base-files package (closes #52987). + * debian/skel.bash_profile: Use umask 022 as in debian/etc.profile + (closes #53020). + * debian/patches/secure-build.dpatch: Build bash without using guessable + file names in /tmp (closes #36027). + * debian/patches/bashbug-editor.dpatch: Use editor command, not emacs + (closes #32576, #32577). + * Fixed in 2.03 or before: #16013, #20455, #30803 (according to upstream + author, bug submitter does not respond). + * #44015 not a bug. Bash is more liberal than POSIX specifies, but function + names that are not identifiers is something that may go away in the future. + * #40242 not a bug: Non-interactive bash shells have always unset PS1, + so scripts and so on can test for it. + * Report #21645: */text* completion doesn't work anymore. According to the + upstream author, this feature was removed in bash-2.01.1. The TAB + completion only succeeds with globbing characters if there is a single + completion. It caused too many problems otherwise. + * Define DONT_REPORT_SIGPIPE: We don't want to see `Broken pipe' messages + when a job like `cat jobs.c | exit 1' is executed. Fixes part of #7047, + #10259, #10433 and #10494. Comment from the upstream author: "The default + bash behavior with respect to the exit status of a pipeline will not + change. Changing it as suggested in the discussion of #10494 would render + bash incompatible with every other shell out there.". Closed these reports. + * debian/etc.bash.bashrc: Set checkwinsize. + + -- Matthias Klose Sun, 19 Dec 1999 15:58:43 +0100 + +bash (2.03-2) unstable; urgency=low + + * Apply privmode patch (do not drop privileges, if called as /sh. + Closes #52586). + + -- Matthias Klose Mon, 13 Dec 1999 22:25:22 +0100 + +bash (2.03-1) unstable; urgency=low + + * New maintainer. + * New upstream version (closes: #34077, #35642, #46916). For a terse + description of new features and bug fixes see /usr/share/doc/bash/NEWS.gz. + * Fixed in upstream release (closes: #14229, #16856, #21363, #22498, #28849, + #29863, #37971, #38411, #40930, #49702). #37971 either here or in libc6. + #30803. + * Separate out documentation and examples to bash-doc package. + * Do not build shared readline libs from this source. According to the + upstream author: "It's not appropriate to build shared libraries from + the readline shipped with bash. That is designed to be linked directly + into bash." + * Link statically with included libreadline. It's intended, because + potato does not have a libreadline4 yet. Wait for bash-2.04 and + it's version of libreadline. + * debian/README.Debian: Sort of FAQ suggested by Guy Maor. + * debian/copyright: Updated URL. + * debian/rules: Introduced some variables for packages and directories. + * debian/control: Updated package names. Add Build-Depends. + * Point to /usr/doc/share in man pages (rbash.1, builtins.1). + * Make /usr/doc compatibility links (all but libreadline.postinst, which + is a C file). + * debian/patches/conf-update.dpatch: New config files from automake + (closes #33745). + * debian/patches/bashbug-editor.dpatch: Use EDITOR variable + (closes #32576, #32577). + * debian/etc.profile: Fixed comment that /etc/profile is used for Bourne + shell and Bourne compatible shells (closes: #3459). + * debian/patches/tempnam.dpatch: Applied patch from report #35975 + (closes: #35975). + * bash is not responsible for setting $USER in login shells (closes: #36103). + * Compile with -DSYS_BASHRC defined. /etc/bash.bashrc is empty by default + (closes #27055). + * Fixed with boot-floppies 2.1.3 (closes: #22517). + * debian/patches/mailcheck.dpatch: Add maildir support. Patch from + Miquel van Smoorenburg (closes #38794). + * Patches from NMU are applied (should close #43096). + * debian/control: Make builtins depend on source version of bash. + * Build for i386, not i486. + * Report #28811: "dpkg segfaults trying to install bash. Logging in then + produces segfault. Still having to run 2.00.0(1)". Not reproducable. + * Report #15165: "If the last command in the pipeline is killed by a signal, + bash does not report it even though $? contains the correct value". + Not reproducable. + * Report #21645: "If you type `rm */text*', previous versions would + complete text given that they're under the same directory. 2.01.1-1 + doesn't do that anymore.". Not documented anywhere. It seems, this was + a bug disguised as a feature ;-) + * Report #36027: "During compiling bash package, files with hardcoded names + are created in /tmp. In a malicious multi-user environment, this allows + attacks to the user's files and possibly allow creating trojan packages. + If the compiling user is root...". + Submitter cannot be reached. autoconf/automake issues? Reassign to general? + * Report #16700: "bash terminated when I asked it "mailq -v", while in an + xterm, with a sysload of approx 1"; not reproducable. Submitter offers + core file. + * Report #37637: Not reproduceable (should close #37637). + * Report #37275: A dpkg error? Or just another reason to completely link + bash statically? + * Report #34978, #42858: The prerm now is a binary pragram. + #34977 as well? #36016 (patch)? + * Report #43737: Non bug. Behaviour changed from 1.4 to 2.0 (closes: #43737). + * Report #36459: Non bug (closes #36459). + * Report #19211: Wanted behaviour? + * Report #11938: The included patch is applied upstream (closes: #11938). + * Report #10699, #45656: Todo: See #34717 ... + * Report #35127: Apply included patch. TODO: test and forward upstream. + * Report #41082: Obsoleted patches (closes: #35130, #41802). + * Reports tested and still in this version (should be forwarded ...): + #2301, #21901, #26619, #26720, #27090, #30460, #33900, #34833, + #36877 + #38804, #41916 (update docs?), + #46901, #47990. + * Report #47849: You *must* reset OPTIND to 1 before reusing getopts. + * Report #45841: This is a POSIX.2/XPG5 requirement. + * Report #35979, #45379: set -e works on simple commands only. + (command) is not a simple command. + * Report #38244: -x and -v and all of the rest of the options are documented + in the `set' builtin section. The OPTIONS section of the man page refers + to `set'. + * Report #37654: When in a pipeline, `tty' prints `not a tty'. This is why + grep is looking for `not' in file `a'. Try `w | echo $(tty)'. + * Report #33822: This is a locale problem. The de_DE locale gives lower case + and upper case letters the same collating weight. POSIX.2 warns that + range expressions are not portable across locales. + * Report #28789, #22291: resizing xterm bash doesn' t update window limits. + Use `shopt -s checkwinsize'. (closes: #28789, #22291). + * Report #39728: Suggestion to add something to /etc/skel files. A matter + of taste. Added comments where to find `fancy' startup files. + + * Work needed: #33822 (huh?), #42916 and #44015 (update docs, dashs in + identifiers). + + * Not tested: (#7047, #10259, #10433, #10494), #14287 (how to test?), + #14658 (how to test?), #16013, #16797, #20455 (alpha arch), #20821, + #22632, #26571, #29610, #35994 (powerpc arch), + #36652, #40242, #47179. + + -- Matthias Klose Sat, 4 Dec 1999 17:03:47 +0100 + +bash (2.02.1-1.8) unstable; urgency=low + + * Applied Anthonies patch and recompiled as the libc5 version did + not compile for him (closes: #34717, #43050, #43096, #10699). + * Bumped the version number of libreadline and recompiled, + hopefully in time before the dinstall run ;) + + -- Torsten Landschoff Sat, 18 Sep 1999 19:26:20 +0200 + +bash (2.02.1-1.7) unstable; urgency=low + + * Non-maintainer release. + * Make bash not Pre-Depend on itself. That is, make bash's preinst + something other than a /bin/sh script; in this case a reasonably + simple binary. + * Remove /bin/sh from the .deb, and reinstate it in the postinst if + it's not already present. Hence make the postinst a /bin/bash script + instead of a /bin/sh script. + + -- Anthony Towns Sat, 28 Aug 1999 01:09:08 +1000 + +bash (2.02.1-1.6) unstable; urgency=low + + * Non-maintainer release. + * Link bash statically with libreadline. Closes: #42858. + + -- Thomas Quinot Fri, 13 Aug 1999 21:47:35 +0200 + +bash (2.02.1-1.5) unstable; urgency=low + + * Non-maintainer release. + * Updated to standards version 3.0.0. + * Fixed dependency on libreadlineg2. Closes: #35130, #39280, #41802. + + -- Thomas Quinot Thu, 29 Jul 1999 13:05:26 +0200 + +bash (2.02.1-1.4) unstable; urgency=low + + * Non-maintainer release. + * Make libreadlineg2 conflict with bash (<< 2.02.1-1.2) + + -- Joel Klecker Thu, 25 Mar 1999 09:40:39 -0800 + +bash (2.02.1-1.3) unstable; urgency=low + + * Non-maintainer release. + * Recompile against ncurses 4.2-3.2 for versioned dependency. + * Add (>= 2.1-13.1) depend to readline shlibs. + + -- Joel Klecker Thu, 18 Mar 1999 12:33:28 -0800 + +bash (2.02.1-1.2) unstable; urgency=low + + * Non-maintainer release. + * Recompile against glibc 2.1 for libreadline. + + -- Joel Klecker Fri, 5 Mar 1999 09:36:54 -0800 + +bash (2.02.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Replaced config.{sub,guess} with newer ones for ARM. + + -- Jim Pick Mon, 22 Feb 1999 23:57:53 -0800 + +bash (2.02.1-1) unstable; urgency=low + + * libreadline 2.1-13 + * Upstream upgrade, closes: #26582 + * Bugs fixed upstream: closes: #21511, #24004. + * Rules, control fixes for hurd, powerpc, alpha closes: #29123, #29395, + #24931, #31289. + * Included paren-matching feature in readline, closes: #27707. + * Removed convert-meta comment from etc/inputrc, closes: #23035. + * Use system random instead of lousy builtin one, closes: #22104. + + -- Guy Maor Mon, 15 Feb 1999 12:57:53 -0800 + +bash (2.01.1-4.1) unstable; urgency=low + + * Non-maintainer upload. + * libreadline 2.1-12 + * Rebuild with ncurses4.0 to avoid packages linked with libreadline + depending on two versions of ncurses; reported by Martin Mitchell + . [#27762] + * debian/rl.shlibs: bump versioned dependency to >= 2.1-12. + * debian/rules (build): add --with-curses to avoid ever linking with + termcap; reported by, ehm, Guy Maor . [#25118] + + -- James Troup Tue, 20 Oct 1998 03:24:03 +0100 + +bash (2.01.1-3.1) frozen unstable; urgency=low + + * Non-maintainer release. + * Build with ncurses3.0-altdev, so libreadline2 doesn't depend on libc6. + * Use -linux instead of -debian-linux. + + -- Joel Klecker Tue, 14 July 1998 16:26:43 -0700 + +bash (2.01.1-3) unstable frozen; urgency=medium + + * libreadline 2.1-10 + * Make libreadlineg2's postinst a c program, like libreadline2. + * Check return code from tempfile in bashbug, closes: #22349. + * glibc 2.1 patch, closes #22532. + * remove . from /etc/profile PATH, closes #22738. + + -- Guy Maor Mon, 25 May 1998 22:41:06 -0700 + +bash (2.01.1-2) unstable frozen; urgency=high + + * libreadline 2.1-9. + * Predepend on libreadlineg2 >= 2.1-8, closes: #20572. + + -- Guy Maor Wed, 8 Apr 1998 01:07:10 -0700 + +bash (2.01.1-1) frozen unstable; urgency=low + + * libreadline 2.1-8. + * Upstream upgrade, closes: #13762, #14446, #18296. + * Fixed /etc/inputrc, closes: #19745, #19075, #13643, #18004, #17256, + #15345, #14672, #15213, #15345, #15638, #18004, #16797, #15638, #19241. + * Applied patch to read End, Delete, closes: #20053. + * Don't build libc5 packages on alpha & powerpc, closes: #13761, #15538, + #15829. + * Add sh(1) - symlink to bash(1), close: #15659. + * Fix unsafe requests in rbash(1), builtins(1), closes: #19086. + * bashbug uses tempfile, closes: #19781. + * fixed fc -l segfault, closes: #13726. + + -- Guy Maor Sat, 28 Mar 1998 19:34:15 -0800 + +bash (2.01-5) unstable; urgency=low + + * libreadline 2.1-7 + * libreadline tries INPUTRC if it's set, else _both_ /etc/inputrc and + ~/.inputrc + * A better /etc/inputrc. + + -- Guy Maor Thu, 25 Sep 1997 11:38:41 -0500 + +bash (2.01-4) unstable; urgency=low + + * libreadline 2.1-6 + * bash-builtin examples moved to correct place. + * libreadline tries /etc/inputrc if ~/.inputrc doesn't exist. + * set -a; set +a problem seems to be fixed (8390) + + -- Guy Maor Wed, 24 Sep 1997 14:36:02 -0500 + +bash (2.01-3) unstable; urgency=low + + * libreadline 2.1-5 + * Bash depended on wrong version of libreadlineg2. (#12150, #12316) + * Put current version in libreadlineg2 shlibs file. + * Honor TMPDIR by using tempnam(3) (#9201). + + -- Guy Maor Sun, 24 Aug 1997 23:31:19 -0500 + +bash (2.01-2) unstable; urgency=low + + * libreadline 2.1-4 + * Make bash predepend on libreadlineg2 (>=2.01-1) so as not to break + systems which installed James's releases. + * Fix references to shell runtime code in libreadline.so and libhistory.so. + * Fix declare -p dumping core on empty temp variable (#12017). + * make_quoted_replacement() checks for empty rl_filename_quote_characters + (12051). + * readline/readline.h - rl_dispatching should be extern (#11049). + * Added libreadline2g-dbg. + + -- Guy Maor Sat, 16 Aug 1997 13:38:37 -0500 + +bash (2.01-1) unstable; urgency=low + + * libreadline 2.1-3 + * Maintainer release of 2.01. (2.01 fixes 3815, 4783, 7782, 8439, 10416, + 10598, 10604, 11806). + * Cleaned and corrected rules, Makefiles, control files. (7580, 11406). + * Reimplemented SHELL compile time as runtime check. Backward compatible + with old bash (10916). + * Added rbash man page (8645). + * ldconfig run in postinst, compiled as libc5 (10176) + * :( set -a;set +a problem still there, but acts differently. + + -- Guy Maor Thu, 14 Aug 1997 15:35:23 -0500 + +bash (2.01-0.1) unstable; urgency=high + + * libreadline 2.1-2.2 + * libreadline2 now has a preinst script which ensures that ld.so.1 + knows about /lib/libc5-compat and /usr/lib/libc5-compat. Before this + change, trying to install with a libc (< 5.4.23-4) broke bash. + * libreadlineg2 no longer has version dependant shlibs file [#10742]. + + -- James Troup Mon, 23 Jun 1997 22:00:18 +0100 + +bash (2.01-0) unstable; urgency=medium + + * libreadline 2.1-2.1 + * Non-maintainer release + * New upstream version [#10416, #10598, #10604, #8390] + * Rebuilt for glibc; now provides libreadline2g{,-dev} and + libreadline2{,-altdev}. + * Not all of Guy's changes are implemented, noticeably a security + improvement in execute-cmds.c and his alteration of libreadline's + compile time dependance on -DSHELL to run time dependance. + + -- James Troup Thur, 19 June 1997 19:13:34 +0100 + +bash (2.0-3) unstable; urgency=medium + + * libreadline 2.1-2 + * #include in general.h needed for alpha build (#7658) + * Don't drop suid/sgid bits if invoked as sh (#7796) + * Applied patch to fix time in for loop (#7436) + * Split off bash-builtins with examples & necessary headers + * Juggled libreadline2 documentation around (#7275) + + -- Guy Maor Mon, 10 Mar 1997 12:45:06 -0600 + +bash (2.0-2) unstable; urgency=low + + * Added NEWS, COMPAT to /usr/doc/bash + + -- Guy Maor Fri, 7 Feb 1997 17:35:21 -0600 + +bash (2.0-1) unstable; urgency=low + + * Upstream upgrade. + * .bash_history created 600 by default. + * Security improvements when creating files in /tmp + * Reimplemented SHELL run-time check with backward 2.0 compatibility + + -- Guy Maor Wed, 29 Jan 1997 03:31:47 -0600 + +bash (1.14.7-2) frozen unstable; urgency=low + + * libhistory.so had wrong soname (fixes bug 5381). + + -- Guy Maor Sat, 16 Nov 1996 11:07:08 -0600 + +bash (1.14.7-1) frozen unstable; urgency=low + + * New upstream version converted to new source format. + libreadline2, libreadline2-dev produced from bash source. + * Made libreadline SHELL define into a runtime check with rl_shell, + history_shell flags, 4 hooks. + * echo checks write errors (fixes 818). + * default unreadable .bash_history in /etc/skel (fixes 1549). + + -- Guy Maor Sat, 9 Nov 1996 05:07:31 -0600 + +Local variables: +mode: debian-changelog +End: --- bash-2.03.orig/debian/bash.conffiles +++ bash-2.03/debian/bash.conffiles @@ -0,0 +1,4 @@ +/etc/bash.bashrc +/etc/skel/.bash_profile +/etc/skel/.bashrc +/etc/skel/.bash_logout --- bash-2.03.orig/debian/bash.preinst.c +++ bash-2.03/debian/bash.preinst.c @@ -0,0 +1,143 @@ +/* Copyright (c) 1999 Anthony Towns + * Copyright (c) 2000 Matthias Klose + * + * You may freely use, distribute, and modify this program. + */ + +// Don't rely on /bin/sh and popen! + +#include +#include +#include +#include +#include +#include +#include + +/* XXX: evil kludge, deal with arbitrary name lengths */ +#ifndef MAX_PATH +#define MAX_PATH 4096 +#endif + +int check_predepends(void) +{ + pid_t child; + + switch(child = fork()) { + case -1: + /* fork failed */ + return EXIT_FAILURE; + + case 0: + /* i'm the child */ + { + execl( "/usr/bin/dpkg", "/usr/bin/dpkg", + "--assert-support-predepends", NULL ); + _exit(127); + } + + default: + /* i'm the parent */ + { + int status; + pid_t pid; + pid = wait(&status); + if (pid == child) { + if (WIFEXITED(status) && WEXITSTATUS(status) == 0) { + return EXIT_SUCCESS; + } + } + } + } + return EXIT_FAILURE; +} + +char *check_diversion(void) +{ + pid_t child; + int pipedes[2]; + + if (pipe(pipedes)) + return NULL; + + + switch(child = fork()) { + case -1: + /* fork failed */ + close(pipedes[0]); + close(pipedes[1]); + return NULL; + + case 0: + /* i'm the child */ + { + if (dup2(pipedes[STDOUT_FILENO], STDOUT_FILENO) < 0) + _exit(127); + close(pipedes[STDIN_FILENO]); + close(pipedes[STDOUT_FILENO]); + execl( "/usr/sbin/dpkg-divert", "/usr/sbin/dpkg-divert", + "--list", "/bin/sh", NULL ); + _exit(127); + } + + default: + /* i'm the parent */ + { + static char line[1024]; + FILE *fd; + + close (pipedes[STDOUT_FILENO]); + fcntl (pipedes[STDIN_FILENO], F_SETFD, FD_CLOEXEC); + fd = fdopen (pipedes[STDIN_FILENO], "r"); + + while (fgets(line, 1024, fd) != NULL) { + line[strlen(line)-1] = '\0'; + break; + } + fclose(fd); + return line; + } + } + return NULL; +} + +const char *msg = + "As bash for Debian is destined to provide a working /bin/sh (pointing to\n" + "/bin/bash) your link will be overwritten by a default link.\n\n" + "If you don't want further upgrades to overwrite your customization,\n" + "please read /usr/share/doc/bash/README.Debian for a more permanent solution.\n\n" + "[Press RETURN to continue]"; + +int main(void) { + int targetlen; + char target[PATH_MAX+1], answer[1024]; + + if (check_predepends() != EXIT_SUCCESS) { + printf("\nPlease upgrade to a new version of dpkg\n\n"); + return EXIT_FAILURE; + } + targetlen = readlink("/bin/sh", target, PATH_MAX); + target[targetlen] = '\0'; + if (targetlen == -1) { + // error reading link. Will be overwritten. + puts("The bash upgrade discovered that something is wrong with your /bin/sh link."); + puts(msg); + fgets(answer, 1024, stdin); + return EXIT_SUCCESS; + } + if (strcmp(target, "bash") != 0 && strcmp(target, "/bin/bash") != 0) { + char *diversion = check_diversion(); + + if (diversion == NULL) + return EXIT_FAILURE; + // printf("diversion: /%s/\n", diversion); + if (strcmp(diversion, "") != 0) + // link is diverted + return EXIT_SUCCESS; + printf("The bash upgrade discovered that your /bin/sh link points to %s.\n", target); + puts(msg); + fgets(answer, 1024, stdin); + return EXIT_SUCCESS; + } + return EXIT_SUCCESS; +} --- bash-2.03.orig/debian/etc.bash.bashrc +++ bash-2.03/debian/etc.bash.bashrc @@ -0,0 +1,3 @@ +# System-wide .bashrc file for interactive bash(1) shells. + +shopt -s checkwinsize --- bash-2.03.orig/debian/control +++ bash-2.03/debian/control @@ -0,0 +1,43 @@ +Source: bash +Section: base +Priority: required +Maintainer: Matthias Klose +Standards-Version: 3.1.0 +Build-Depends: autoconf, patch, libncurses5-dev + +Package: bash +Architecture: any +Pre-Depends: ${shlibs:Pre-Depends} +Depends: base-files (>= 2.1.12) +Essential: yes +Section: base +Priority: required +Description: The GNU Bourne Again SHell + Bash is an sh-compatible command language interpreter that executes + commands read from the standard input or from a file. Bash also + incorporates useful features from the Korn and C shells (ksh and csh). + . + Bash is ultimately intended to be a conformant implementation of the + IEEE Posix Shell and Tools specification (IEEE Working Group 1003.2). + +Package: bash-builtins +Architecture: any +Depends: bash (= ${Source-Version}) +Section: utils +Priority: optional +Description: Bash loadable builtins - headers & examples + Bash 2 can dynamically load new builtin commands. Included are the + necessary headers to compile your own builtins and lots of examples. + +Package: bash-doc +Architecture: all +Section: doc +Priority: optional +Replaces: bash (<< 2.03-1) +Description: Documentation and examples for the The GNU Bourne Again SHell + Bash is an sh-compatible command language interpreter that executes + commands read from the standard input or from a file. Bash also + incorporates useful features from the Korn and C shells (ksh and csh). + . + This package contains the documentation in info format, all the + examples and the main changelog. --- bash-2.03.orig/debian/skel.bash_profile +++ bash-2.03/debian/skel.bash_profile @@ -0,0 +1,18 @@ +# ~/.bash_profile: executed by bash(1) for login shells. +# see /usr/share/doc/bash/examples/startup-files for examples + +umask 022 + +# the rest of this file is commented out. + +# include .bashrc if it exists + +#if [ -f ~/.bashrc ]; then +# source ~/.bashrc +#fi + +# set PATH so it includes user's private bin if it exists + +#if [ -d ~/bin ] ; then +# PATH="~/bin:${PATH}" +#fi --- bash-2.03.orig/debian/.cvsignore +++ bash-2.03/debian/.cvsignore @@ -0,0 +1,5 @@ +tmp* +substvars +files +rl-libc5.postinst +rl-libc6.postinst --- bash-2.03.orig/debian/bash-doc.postinst +++ bash-2.03/debian/bash-doc.postinst @@ -0,0 +1,11 @@ +#! /bin/sh -e + +install-info --quiet --description="GNU Bourne-Again SHell Features." \ + --section "General Commands" "General Commands" /usr/share/info/bash.info.gz + +if [ "$1" = "configure" ]; then + pkg=bash-doc + if [ -d /usr/doc -a ! -e /usr/doc/$pkg -a -d /usr/share/doc/$pkg ]; then + ln -sf ../share/doc/$pkg /usr/doc/$pkg + fi +fi --- bash-2.03.orig/debian/rl.shlibs +++ bash-2.03/debian/rl.shlibs @@ -0,0 +1,2 @@ +libreadline 2 libreadlineg2 (>= 2.1-12) +libhistory 2 libreadlineg2 (>= 2.1-12) --- bash-2.03.orig/debian/README.Debian +++ bash-2.03/debian/README.Debian @@ -0,0 +1,37 @@ +A kind of FAQ for bash on Debian/GNU\ {Linux,Hurd} +-------------------------------------------------- + +1. How can I make /bin/sh point to something else? + + Type + + dpkg-divert --add /bin/sh + + and then point it to whatever you want. Upgrades to bash won't upgrade + the /bin/sh symlink. To put /bin/sh under dpkg control again, type + + dpkg-divert --remove /bin/sh + + +2. How can I make bash 8-bit clean so I can type hi-bit characters + directly? + + Remove the comments from the indicated lines in /etc/inputrc. + It doesn't ship this way because otherwise the Meta bindings will not work. + +3. bash doesn't display prompts correctly. + + When using colors in prompts (or escape characters), then make sure + those characters are surrounded by \[ and \]. For more information + look at the man page bash(1) and search for PROMPTING. + +4. bash does not check $PATH if hash fails + + bash hashes the location of recently executed commands. When a command + is moved to a new location in the PATH, the command is still in the PATH + but the hash table still records the old location. + + For performance reasons bash does not remove the command from the hash + and relook it up in PATH. + + Use 'hash -r' manually or set a bash option: 'shopt -s checkhash'. --- bash-2.03.orig/debian/bash-doc.prerm +++ bash-2.03/debian/bash-doc.prerm @@ -0,0 +1,10 @@ +#! /bin/sh -e + +install-info --quiet --remove bash + +case "$1" in upgrade|remove) + pkg=bash-doc + if [ -L /usr/doc/$pkg ]; then + rm -f /usr/doc/$pkg + fi +esac --- bash-2.03.orig/debian/bash.postinst +++ bash-2.03/debian/bash.postinst @@ -0,0 +1,13 @@ +#! /bin/bash -e + +# the symlink is in the package now. So this should never happen ... +if [ ! -e /bin/sh ]; then + ln -s bash /bin/sh +fi + +if [ "$1" = "configure" ]; then + pkg=bash + if [ -d /usr/doc -a ! -e /usr/doc/$pkg -a -d /usr/share/doc/$pkg ]; then + ln -sf ../share/doc/$pkg /usr/doc/$pkg + fi +fi --- bash-2.03.orig/debian/bash.copyright +++ bash-2.03/debian/bash.copyright @@ -0,0 +1,29 @@ +This is Debian/GNU Linux's prepackaged version of the FSF's GNU Bash, +the Bourne Again SHell. + +This package was put together by me, Guy Maor , from +the GNU sources at ftp.gnu.org:/pub/gnu/bash/bash-2.03.tar.gz + +Bash is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Bash is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License with +your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with +the Debian GNU/Linux bash source package as the file COPYING. If not, +write to the Free Software Foundation, Inc., 59 Temple Place - Suite +330, Boston, MA 02111-1307, USA. + +The Free Software Foundation has exempted Bash from the requirement of +Paragraph 2c of the General Public License. This is to say, there is +no requirement for Bash to print a notice when it is started +interactively in the usual way. We made this exception because users +and standards expect shells not to print such messages. This +exception applies to any program that serves as a shell and that is +based primarily on Bash as opposed to other GNU software. --- bash-2.03.orig/debian/rld.postinst +++ bash-2.03/debian/rld.postinst @@ -0,0 +1,14 @@ +#! /bin/sh -e + +install-info --quiet --section "Development" "Development" \ + --description="GNU History Library" /usr/share/info/history.info.gz + +install-info --quiet --section "Development" "Development" \ + --description="GNU Readline Library" /usr/share/info/readline.info.gz + +if [ "$1" = "configure" ]; then + pkg="`basename $0`" + if [ -d /usr/doc -a ! -e /usr/doc/$pkg -a -d /usr/share/doc/$pkg ]; then + ln -sf ../share/doc/$pkg /usr/doc/$pkg + fi +fi --- bash-2.03.orig/debian/skel.bashrc +++ bash-2.03/debian/skel.bashrc @@ -0,0 +1,20 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files for examples + +# If running interactively, then: +if [ "$PS1" ]; then + + # enable color support of ls and also add handy aliases + + eval `dircolors` + alias ls='ls --color=auto ' + #alias ll='ls -l' + #alias la='ls -A' + #alias l='ls -CF' + #alias dir='ls --color=auto --format=vertical' + #alias vdir='ls --color=auto --format=long' + + # set a fancy prompt + + PS1='\u@\h:\w\$ ' +fi --- bash-2.03.orig/debian/bash.prerm +++ bash-2.03/debian/bash.prerm @@ -0,0 +1,8 @@ +#! /bin/bash -e + +case "$1" in upgrade|remove) + pkg=bash + if [ -L /usr/doc/$pkg ]; then + rm -f /usr/doc/$pkg + fi +esac --- bash-2.03.orig/debian/etc.inputrc +++ bash-2.03/debian/etc.inputrc @@ -0,0 +1,13 @@ +# /etc/inputrc - global inputrc for libreadline +# See readline(3readline) and `info readline' for more information. + +# Be 8 bit clean. +set input-meta on +set output-meta on + +# To allow the use of german 8bit-characters like the german umlauts, comment +# out the two lines below. However this makes the meta key not work as a meta +# key, which is annoying to those which don't need to type in 8-bit characters. + +#set meta-flag on +#set convert-meta off --- bash-2.03.orig/debian/etc.profile +++ bash-2.03/debian/etc.profile @@ -0,0 +1,13 @@ +# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) +# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). + +PATH='/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games' + +case x$BASH in + x) case x$USER in xroot) PS1='# ';; *) PS1='$ '; esac;; + *) PS1='\u@\h:\w \$ ' +esac + +export PATH PS1 + +umask 022 --- bash-2.03.orig/debian/rl-libc5.preinst +++ bash-2.03/debian/rl-libc5.preinst @@ -0,0 +1,13 @@ +#!/bin/sh + +# We *have* to have ld.so.1 know about the libc5-compat directories. +# Another way to do this could have been to Pre-Depend: libc5 (>= 5.4.23-4) + +set -e + +if ! grep -q '^/usr/lib/libc5-compat$' /etc/ld.so.conf; then + echo /usr/lib/libc5-compat >> /etc/ld.so.conf +fi +if ! grep -q '^/lib/libc5-compat$' /etc/ld.so.conf; then + echo /lib/libc5-compat >> /etc/ld.so.conf +fi --- bash-2.03.orig/debian/rl-libc5.shlibs +++ bash-2.03/debian/rl-libc5.shlibs @@ -0,0 +1,2 @@ +libreadline 2 libreadline2 (>= 2.1) +libhistory 2 libreadline2 (>= 2.1) --- bash-2.03.orig/debian/rl.conffiles +++ bash-2.03/debian/rl.conffiles @@ -0,0 +1 @@ +/etc/inputrc --- bash-2.03.orig/debian/rl.copyright +++ bash-2.03/debian/rl.copyright @@ -0,0 +1,23 @@ +This is Debian/GNU Linux's prepackaged version of the FSF's GNU +Readline library. + +This package was put together by me, Guy Maor , from +the GNU sources at ftp.cc.gatech.edu:/pub/gnu/bash-2.01.1.tar.gz. The +version of readline in bash has many bug fixes over the version +contained in readline-2.0.tar.gz. + +The GNU Readline Library is free software; you can redistribute it +and/or modify it under the terms of the GNU General Public License as +published by the Free Software Foundation; either version 2, or (at +your option) any later version. + +The GNU Readline Library is distributed in the hope that it will be +useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License with +your Debian GNU/Linux system, in /usr/doc/copyright/GPL, or with the +Debian GNU/Linux bash source package as the file COPYING. If not, +write to the Free Software Foundation, Inc., 59 Temple Place - Suite +330, Boston, MA 02111-1307, USA. --- bash-2.03.orig/debian/rl.postinst.c +++ bash-2.03/debian/rl.postinst.c @@ -0,0 +1,73 @@ +/* A C wrapper to ldconfig for libreadline2_2.1-2.1 and later (?) */ +/* Copyright (C) 1997, James Troup */ + +/* This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include +#include +#include + +int doc_link(void) +{ + struct stat buf; + int rv; + + /* [ -d /usr/doc ] */ + if (lstat("/usr/doc", &buf) == -1) + return 1; + if (!S_ISDIR(buf.st_mode)) + return 0; + + /* [ -d /usr/share/doc/ ] */ + if (stat("/usr/share/doc/" PKG_NAME, &buf) == -1) + return 1; + if (!S_ISDIR(buf.st_mode)) + return 0; + + /* [ ! -e /usr/doc/ ] */ + if (stat("/usr/doc/" PKG_NAME, &buf) == -1) { + if (errno != ENOENT) + return 1; + } + else + return 0; + + /* link it */ + unlink("/usr/doc/" PKG_NAME); + errno = 0; + rv = symlink("../share/doc/" PKG_NAME, "/usr/doc/" PKG_NAME); + return rv; +} + +int +main (int argc, char **argv) +{ + if (argv[1] && !strcmp(argv[1], "configure")) { + + if (doc_link()) { + fprintf(stderr, "Error: %s\n", strerror (errno)); + fprintf(stderr, "Symbolic link (/usr/doc --> /usr/share/doc) not created\n"); + } + execlp("ldconfig", "ldconfig", 0); + fprintf(stderr, "Error: exec ldconfig: %s\n", strerror (errno)); + fprintf(stderr, "Run ldconfig by hand, or bash might be unusable !\n"); + exit(1); + } + exit(0); +} --- bash-2.03.orig/debian/rld.prerm +++ bash-2.03/debian/rld.prerm @@ -0,0 +1,12 @@ +#! /bin/sh +set -e + +install-info --quiet --remove history +install-info --quiet --remove readline + +case "$1" in upgrade|remove) + pkg="`basename $0`" + if [ -L /usr/doc/$pkg ]; then + rm -f /usr/doc/$pkg + fi +esac --- bash-2.03.orig/debian/rlg.postinst +++ bash-2.03/debian/rlg.postinst @@ -0,0 +1,8 @@ +#! /bin/sh -e + +if [ "$1" = "configure" ]; then + pkg="`basename $0`" + if [ -d /usr/doc -a ! -e /usr/doc/$pkg -a -d /usr/share/doc/$pkg ]; then + ln -sf ../share/doc/$pkg /usr/doc/$pkg + fi +fi --- bash-2.03.orig/debian/rl.prerm +++ bash-2.03/debian/rl.prerm @@ -0,0 +1,9 @@ +#! /bin/sh +set -e + +case "$1" in upgrade|remove) + pkg="`basename $0`" + if [ -L /usr/doc/$pkg ]; then + rm -f /usr/doc/$pkg + fi +esac --- bash-2.03.orig/debian/rlg.prerm +++ bash-2.03/debian/rlg.prerm @@ -0,0 +1,8 @@ +#! /bin/sh -e + +case "$1" in upgrade|remove) + pkg="`basename $0`" + if [ -L /usr/doc/$pkg ]; then + rm -f /usr/doc/$pkg + fi +esac --- bash-2.03.orig/debian/bins.postinst +++ bash-2.03/debian/bins.postinst @@ -0,0 +1,8 @@ +#! /bin/sh -e + +if [ "$1" = "configure" ]; then + pkg="`basename $0 .postinst`" + if [ -d /usr/doc -a ! -e /usr/doc/$pkg -a -d /usr/share/doc/$pkg ]; then + ln -sf ../share/doc/$pkg /usr/doc/$pkg + fi +fi --- bash-2.03.orig/debian/bins.prerm +++ bash-2.03/debian/bins.prerm @@ -0,0 +1,8 @@ +#! /bin/sh -e + +case "$1" in upgrade|remove) + pkg="`basename $0 .prerm`" + if [ -L /usr/doc/$pkg ]; then + rm -f /usr/doc/$pkg + fi +esac --- bash-2.03.orig/debian/patches/rl-ctrl-char.dpatch +++ bash-2.03/debian/patches/rl-ctrl-char.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: CTRL_CHAR macro: Don't assume character is signed by default + +--- ./lib/readline/chardefs.h~ Thu Sep 25 16:59:00 1997 ++++ ./lib/readline/chardefs.h Thu Dec 23 11:18:17 1999 +@@ -51,7 +51,7 @@ + #define meta_character_bit 0x080 /* x0000000, must be on. */ + #define largest_char 255 /* Largest character value. */ + +-#define CTRL_CHAR(c) ((c) < control_character_threshold && (c) >= 0) ++#define CTRL_CHAR(c) ((c) < control_character_threshold && ((signed char)(c)) >= 0) + #define META_CHAR(c) ((c) > meta_character_threshold && (c) <= largest_char) + + #define CTRL(c) ((c) & control_character_mask) + --- bash-2.03.orig/debian/patches/conf-update.dpatch +++ bash-2.03/debian/patches/conf-update.dpatch @@ -0,0 +1,1910 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Updated config.{guess,sub} from /usr/share/automake. + +--- ./support/config.guess~ Tue Dec 29 15:10:39 1998 ++++ ./support/config.guess Mon Nov 8 07:46:34 1999 +@@ -1,6 +1,7 @@ + #! /bin/sh + # Attempt to guess a canonical system name. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 ++# Free Software Foundation, Inc. + # + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -23,6 +24,7 @@ + + # Written by Per Bothner . + # The master version of this file is at the FSF in /home/gd/gnu/lib. ++# Please send patches to the Autoconf mailing list . + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and +@@ -35,135 +37,37 @@ + # (but try to keep the structure clean). + # + ++# Use $HOST_CC if defined. $CC may point to a cross-compiler ++if test x"$CC_FOR_BUILD" = x; then ++ if test x"$HOST_CC" != x; then ++ CC_FOR_BUILD="$HOST_CC" ++ else ++ if test x"$CC" != x; then ++ CC_FOR_BUILD="$CC" ++ else ++ CC_FOR_BUILD=cc ++ fi ++ fi ++fi ++ ++ + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. + # (ghazi@noc.rutgers.edu 8/24/94.) + if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +-elif (test -f /usr/5bin/uname) >/dev/null 2>&1 ; then +- PATH=$PATH:/usr/5bin + fi + +-UNAME=`(uname) 2>/dev/null` || UNAME=unknown + UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown + UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +-RELEASE=`expr "$UNAME_RELEASE" : '[^0-9]*\([0-9]*\)'` # 4 +-case "$RELEASE" in +-"") RELEASE=0 ;; +-*) RELEASE=`expr "$RELEASE" + 0` ;; +-esac +-REL_LEVEL=`expr "$UNAME_RELEASE" : '[^0-9]*[0-9]*.\([0-9]*\)'` # 1 +-REL_SUBLEVEL=`expr "$UNAME_RELEASE" : '[^0-9]*[0-9]*.[0-9]*.\([0-9]*\)'` # 2 +- +-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15 +- +-# Some versions of i386 SVR4.2 make `uname' equivalent to `uname -n', which +-# is contrary to all other versions of uname +-if [ -n "$UNAME" ] && [ "$UNAME_S" != "$UNAME" ] && [ "$UNAME_S" = UNIX_SV ]; then +- UNAME=UNIX_SV +-fi ++dummy=dummy-$$ ++trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 + + # Note: order is significant - the case branches are not exclusive. + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +- # Begin cases added for Bash +- alpha:NetBSD:*:*) +- echo alpha-dec-netbsd${UNAME_RELEASE} +- exit 0 ;; +- alpha:OpenBSD:*:*) +- echo alpha-dec-openbsd${UNAME_RELEASE} +- exit 0 ;; +- i?86:NetBSD:*:*) +- echo ${UNAME_MACHINE}-pc-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` +- exit 0 ;; +- i?86:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-pc-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` +- exit 0 ;; +- i?86:FreeBSD:*:*) +- echo ${UNAME_MACHINE}-pc-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` +- exit 0 ;; +- sparc:NetBSD:*:*) +- echo sparc-unknown-netbsd${UNAME_RELEASE} +- exit 0 ;; +- sparc:OpenBSD:*:*) +- echo sparc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- vax:NetBSD:*:*) +- echo vax-dec-netbsd${UNAME_RELEASE} +- exit 0 ;; +- vax:OpenBSD:*:*) +- echo vax-dec-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:machten:*:*) +- echo mac68k-apple-machten${UNAME_RELEASE} +- exit 0 ;; +- concurrent*:*:*:*) +- if test "`(/bin/universe) 2>/dev/null`" = att ; then +- echo concurrent-concurrent-sysv3 +- else +- echo concurrent-concurrent-bsd +- fi +- exit 0 ;; +- ppc*:SunOS:5.*:*) +- echo ppc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- sparc:UNIX_SV:4.*:*) +- echo sparc-unknown-sysv${UNAME_RELEASE} +- exit 0 ;; +- mips:UNIX_SV:4.*:*) +- echo mips-mips-sysv${UNAME_RELEASE} +- exit 0 ;; +- mips:OSF*1:*:*) +- echo mips-mips-osf1 +- exit 0 ;; +- mips:4.4BSD:*:*) +- echo mips-mips-bsd4.4 +- exit 0 ;; +- MIServer-S:SMP_DC.OSx:*:dcosx) +- echo mips-pyramid-sysv4 +- exit 0 ;; +- news*:NEWS*:*:*) +- echo mips-sony-newsos${UNAME_RELEASE} +- exit 0 ;; +- i?86:NEXTSTEP:*:*) +- echo i386-next-nextstep${RELEASE} +- exit 0 ;; +- *680?0:NEXTSTEP:*:*) +- echo m68k-next-nextstep${RELEASE} +- exit 0 ;; +- *370:AIX:*:*) +- echo ibm370-ibm-aix +- exit 0 ;; +- ksr1:OSF*1:*:*) +- echo ksr1-ksr-osf1 +- exit 0 ;; +- esa:OSF*1:*:* | ESA:OSF*:*:*) +- echo esa-ibm-osf1 +- exit 0 ;; +- DNP*:DNIX:*:*) +- echo m68k-dnix-sysv +- exit 0 ;; +- *3b2*:*:*:*) +- echo we32k-att-sysv3 +- exit 0 ;; +- *:QNX:*:42*) +- echo i386-qssl-qnx`echo ${UNAME_VERSION}` +- exit 0 ;; +- BeBox:BeOS:*:*) +- echo powerpc-be-beos +- exit 0 ;; +- BeMac:BeOS:*:*) +- echo powerpc-apple-beos +- exit 0 ;; +- BePC:BeOS:*:*) +- echo i586-pc-beos +- exit 0 ;; +- SX-4:SUPER-UX:*:*) +- echo sx4-nec-superux${UNAME_RELEASE} +- exit 0 ;; +- # end cases added for Bash + alpha:OSF1:*:*) + if test $UNAME_RELEASE = "V4.0"; then + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +@@ -172,7 +76,7 @@ + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- cat <dummy.s ++ cat <$dummy.s + .globl main + .ent main + main: +@@ -189,9 +93,9 @@ + ret \$31,(\$26),1 + .end main + EOF +- ${CC-cc} dummy.s -o dummy 2>/dev/null ++ $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null + if test "$?" = 0 ; then +- ./dummy ++ ./$dummy + case "$?" in + 7) + UNAME_MACHINE="alpha" +@@ -210,8 +114,14 @@ + ;; + esac + fi +- rm -f dummy.s dummy +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]` ++ rm -f $dummy.s $dummy ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ exit 0 ;; ++ Alpha\ *:Windows_NT*:*) ++ # How do we know it's Interix rather than the generic POSIX subsystem? ++ # Should we change UNAME_MACHINE based on the output of uname instead ++ # of the specific Alpha model? ++ echo alpha-pc-interix + exit 0 ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 +@@ -220,10 +130,10 @@ + echo m68k-cbm-sysv4 + exit 0;; + amiga:NetBSD:*:*) +- echo m68k-cbm-netbsd${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-cbm-netbsd${UNAME_RELEASE} ++ exit 0 ;; + amiga:OpenBSD:*:*) +- echo m68k-cbm-openbsd${UNAME_RELEASE} ++ echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos +@@ -255,7 +165,7 @@ + SR2?01:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit 0;; +- Pyramid*:OSx*:*:*|MIS*:OSx*:*:*) ++ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 +@@ -263,9 +173,12 @@ + echo pyramid-pyramid-bsd + fi + exit 0 ;; +- NILE:*:*:dcosx) ++ NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit 0 ;; ++ sun4H:SunOS:5.*:*) ++ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit 0 ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; +@@ -287,7 +200,7 @@ + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit 0 ;; +- sun3*:SunOS:*:*|sun:SunOS:*:*) ++ sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit 0 ;; + sun*:*:4.2BSD:*) +@@ -309,19 +222,45 @@ + echo m68k-atari-netbsd${UNAME_RELEASE} + exit 0 ;; + atari*:OpenBSD:*:*) +- echo m68k-atari-openbsd${UNAME_RELEASE} ++ echo m68k-unknown-openbsd${UNAME_RELEASE} ++ exit 0 ;; ++ # The situation for MiNT is a little confusing. The machine name ++ # can be virtually everything (everything which is not ++ # "atarist" or "atariste" at least should have a processor ++ # > m68000). The system name ranges from "MiNT" over "FreeMiNT" ++ # to the lowercase version "mint" (or "freemint"). Finally ++ # the system name "TOS" denotes a system which is actually not ++ # MiNT. But MiNT is downward compatible to TOS, so this should ++ # be no problem. ++ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; ++ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit 0 ;; ++ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit 0 ;; ++ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit 0 ;; ++ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit 0 ;; ++ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit 0 ;; + sun3*:NetBSD:*:*) + echo m68k-sun-netbsd${UNAME_RELEASE} + exit 0 ;; + sun3*:OpenBSD:*:*) +- echo m68k-sun-openbsd${UNAME_RELEASE} ++ echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:NetBSD:*:*) + echo m68k-apple-netbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) +- echo m68k-apple-openbsd${UNAME_RELEASE} ++ echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} +@@ -329,15 +268,12 @@ + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; +- Power?Macintosh:Rhapsody:*:*) +- echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; +- *:Rhapsody:*:*) +- echo ${UNAME_MACHINE}-unknown-rhapsody${UNAME_RELEASE} +- exit 0 ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; ++ macppc:NetBSD:*:*) ++ echo powerpc-apple-netbsd${UNAME_RELEASE} ++ exit 0 ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit 0 ;; +@@ -347,12 +283,16 @@ + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit 0 ;; +- 2020:CLIX:*:*) ++ 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit 0 ;; + mips:*:*:UMIPS | mips:*:*:RISCos) +- sed 's/^ //' << EOF >dummy.c +- int main (argc, argv) int argc; char **argv; { ++ sed 's/^ //' << EOF >$dummy.c ++#ifdef __cplusplus ++ int main (int argc, char *argv[]) { ++#else ++ int main (argc, argv) int argc; char *argv[]; { ++#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); +@@ -367,10 +307,10 @@ + exit (-1); + } + EOF +- ${CC-cc} dummy.c -o dummy \ +- && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && rm dummy.c dummy && exit 0 +- rm -f dummy.c dummy ++ $CC_FOR_BUILD $dummy.c -o $dummy \ ++ && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ++ && rm $dummy.c $dummy && exit 0 ++ rm -f $dummy.c $dummy + echo mips-mips-riscos${UNAME_RELEASE} + exit 0 ;; + Night_Hawk:Power_UNIX:*:*) +@@ -386,17 +326,17 @@ + echo m88k-motorola-sysv3 + exit 0 ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` +- if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ + -o ${TARGET_BINARY_INTERFACE}x = x ] ; then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi +- else echo i586-dg-dgux${UNAME_RELEASE} +- fi ++ else echo i586-dg-dgux${UNAME_RELEASE} ++ fi + exit 0 ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +@@ -422,7 +362,7 @@ + exit 0 ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then +- sed 's/^ //' << EOF >dummy.c ++ sed 's/^ //' << EOF >$dummy.c + #include + + main() +@@ -433,8 +373,8 @@ + exit(0); + } + EOF +- ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 +- rm -f dummy.c dummy ++ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 ++ rm -f $dummy.c $dummy + echo rs6000-ibm-aix3.2.5 + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 +@@ -443,17 +383,14 @@ + fi + exit 0 ;; + *:AIX:*:4) +- if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then ++ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` ++ if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` +- elif grep bos410 /usr/include/stdio.h >/dev/null 2>&1; then +- IBM_REV=4.1 +- elif grep bos411 /usr/include/stdio.h >/dev/null 2>&1; then +- IBM_REV=4.1.1 + else + IBM_REV=4.${UNAME_RELEASE} + fi +@@ -482,19 +419,48 @@ + exit 0 ;; + 9000/[34678]??:HP-UX:*:*) + case "${UNAME_MACHINE}" in +- 9000/31? ) HP_ARCH=m68000 ;; +- 9000/[34]?? ) HP_ARCH=m68k ;; +- 9000/78? | 9000/80[24] | 9000/8[67]1 | 9000/8[78]9 | 9000/893 ) +- HP_ARCH=hppa2.0 ;; +- 9000/7?? | 9000/8?[13679] | 9000/892 ) +- HP_ARCH=hppa1.1 ;; +- 9000/[68]?? ) HP_ARCH=hppa1.0 ;; ++ 9000/31? ) HP_ARCH=m68000 ;; ++ 9000/[34]?? ) HP_ARCH=m68k ;; ++ 9000/[678][0-9][0-9]) ++ sed 's/^ //' << EOF >$dummy.c ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } ++EOF ++ ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` ++ rm -f $dummy.c $dummy + esac + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit 0 ;; + 3050*:HI-UX:*:*) +- sed 's/^ //' << EOF >dummy.c ++ sed 's/^ //' << EOF >$dummy.c + #include + int + main () +@@ -519,8 +485,8 @@ + exit (0); + } + EOF +- ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 +- rm -f dummy.c dummy ++ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 ++ rm -f $dummy.c $dummy + echo unknown-hitachi-hiuxwe2 + exit 0 ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) +@@ -529,6 +495,9 @@ + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit 0 ;; ++ *9??*:MPE/iX:*:*) ++ echo hppa1.0-hp-mpeix ++ exit 0 ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit 0 ;; +@@ -537,14 +506,17 @@ + exit 0 ;; + i?86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then +- echo ${UNAME_MACHINE}-pc-osf1mk ++ echo ${UNAME_MACHINE}-unknown-osf1mk + else +- echo ${UNAME_MACHINE}-pc-osf1 ++ echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit 0 ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit 0 ;; ++ hppa*:OpenBSD:*:*) ++ echo hppa-unknown-openbsd ++ exit 0 ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit 0 ;; +@@ -577,27 +549,42 @@ + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} + exit 0 ;; ++ CRAY*T3E:*:*:*) ++ echo alpha-cray-unicosmk${UNAME_RELEASE} ++ exit 0 ;; + CRAY-2:*:*:*) + echo cray2-cray-unicos + exit 0 ;; + F300:UNIX_System_V:*:*) +- FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit 0 ;; + F301:UNIX_System_V:*:*) +- echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` +- exit 0 ;; ++ echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` ++ exit 0 ;; + hp3[0-9][05]:NetBSD:*:*) + echo m68k-hp-netbsd${UNAME_RELEASE} + exit 0 ;; +- hp3[0-9][05]:OpenBSD:*:*) +- echo m68k-hp-openbsd${UNAME_RELEASE} ++ hp300:OpenBSD:*:*) ++ echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; +- i?86:BSD/386:*:* | *:BSD/OS:*:*) ++ i?86:BSD/386:*:* | i?86:BSD/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit 0 ;; ++ sparc*:BSD/OS:*:*) ++ echo sparc-unknown-bsdi${UNAME_RELEASE} ++ exit 0 ;; ++ *:BSD/OS:*:*) ++ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} ++ exit 0 ;; + *:FreeBSD:*:*) ++ if test -x /usr/bin/objformat; then ++ if test "elf" = "`/usr/bin/objformat`"; then ++ echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` ++ exit 0 ++ fi ++ fi + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:NetBSD:*:*) +@@ -607,13 +594,22 @@ + echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + exit 0 ;; + i*:CYGWIN*:*) +- echo i386-pc-cygwin32 ++ echo ${UNAME_MACHINE}-pc-cygwin + exit 0 ;; + i*:MINGW*:*) +- echo i386-pc-mingw32 ++ echo ${UNAME_MACHINE}-pc-mingw32 ++ exit 0 ;; ++ i*:Windows_NT*:* | Pentium*:Windows_NT*:*) ++ # How do we know it's Interix rather than the generic POSIX subsystem? ++ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we ++ # UNAME_MACHINE based on the output of uname instead of i386? ++ echo i386-pc-interix ++ exit 0 ;; ++ i*:UWIN*:*) ++ echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; + p*:CYGWIN*:*) +- echo powerpcle-unknown-cygwin32 ++ echo powerpcle-unknown-cygwin + exit 0 ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +@@ -622,25 +618,64 @@ + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit 0 ;; + *:Linux:*:*) ++ # uname on the ARM produces all sorts of strangeness, and we need to ++ # filter it out. ++ case "$UNAME_MACHINE" in ++ armv*) UNAME_MACHINE=$UNAME_MACHINE ;; ++ arm* | sa110*) UNAME_MACHINE="arm" ;; ++ esac ++ + # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. +- ld_help_string=`ld --help 2>&1` ++ # first see if it will tell us. cd to the root directory to prevent ++ # problems with other programs or directories called `ld' in the path. ++ ld_help_string=`cd /; ld --help 2>&1` + ld_supported_emulations=`echo $ld_help_string \ + | sed -ne '/supported emulations:/!d + s/[ ][ ]*/ /g + s/.*supported emulations: *// + s/ .*// + p'` +- case "$ld_supported_emulations" in ++ case "$ld_supported_emulations" in ++ *ia64) echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 ;; + i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; + i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; + sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; ++ armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; + m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; +- elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; ++ elf32ppc | elf32ppclinux) ++ # Determine Lib Version ++ cat >$dummy.c < ++#if defined(__GLIBC__) ++extern char __libc_version[]; ++extern char __libc_release[]; ++#endif ++main(argc, argv) ++ int argc; ++ char *argv[]; ++{ ++#if defined(__GLIBC__) ++ printf("%s %s\n", __libc_version, __libc_release); ++#else ++ printf("unkown\n"); ++#endif ++ return 0; ++} ++EOF ++ LIBC="" ++ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ++ if test "$?" = 0 ; then ++ ./$dummy | grep 1\.99 > /dev/null ++ if test "$?" = 0 ; then ++ LIBC="libc1" ++ fi ++ fi ++ rm -f $dummy.c $dummy ++ echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;; + esac + + if test "${UNAME_MACHINE}" = "alpha" ; then +- sed 's/^ //' <dummy.s ++ sed 's/^ //' <$dummy.s + .globl main + .ent main + main: +@@ -658,9 +693,9 @@ + .end main + EOF + LIBC="" +- ${CC-cc} dummy.s -o dummy 2>/dev/null ++ $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null + if test "$?" = 0 ; then +- ./dummy ++ ./$dummy + case "$?" in + 7) + UNAME_MACHINE="alpha" +@@ -679,20 +714,21 @@ + ;; + esac + +- objdump --private-headers dummy | \ ++ objdump --private-headers $dummy | \ + grep ld.so.1 > /dev/null + if test "$?" = 0 ; then + LIBC="libc1" + fi + fi +- rm -f dummy.s dummy ++ rm -f $dummy.s $dummy + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 + elif test "${UNAME_MACHINE}" = "mips" ; then +- cat >dummy.c <$dummy.c </dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 +- rm -f dummy.c dummy ++ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 ++ rm -f $dummy.c $dummy + else + # Either a pre-BFD a.out linker (linux-gnuoldld) + # or one that does not give us useful --help. +@@ -722,12 +758,13 @@ + ;; + esac + # Determine whether the default compiler is a.out or elf +- cat >dummy.c <$dummy.c < +-main(argc, argv) +- int argc; +- char *argv[]; +-{ ++#ifdef __cplusplus ++ int main (int argc, char *argv[]) { ++#else ++ int main (argc, argv) int argc; char *argv[]; { ++#endif + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 +@@ -744,34 +781,37 @@ + return 0; + } + EOF +- ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 +- rm -f dummy.c dummy ++ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 ++ rm -f $dummy.c $dummy + fi ;; + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions + # are messed up and put the nodename in both sysname and nodename. + i?86:DYNIX/ptx:4*:*) + echo i386-sequent-sysv4 + exit 0 ;; +-# added by chet for bash based on usenet posting from and +-# documentation on SCO's web site -- UnixWare 7 (SVR5) +- i?86:UnixWare:5*:*) +- echo ${UNAME_MACHINE}-pc-sysv5uw${UNAME_VERSION} +- exit 0 ;; + i?86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit 0 ;; +- i?86:*:4.*:* | i?86:SYSTEM_V:4.*:* | i?86:UNIX_SV:4.*:*) ++ i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + fi + exit 0 ;; ++ i?86:*:5:7*) ++ UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` ++ (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 ++ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586 ++ (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686 ++ (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585 ++ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE} ++ exit 0 ;; + i?86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 ++ (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ ++ && UNAME_MACHINE=i686 ++ (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ ++ && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit 0 ;; + pc:*:*:*) +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp +- exit 0 ;; ++ exit 0 ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit 0 ;; +@@ -819,16 +863,16 @@ + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4 && exit 0 ;; +- mc68030:UNIX_System_V:4.*:*) +- echo m68k-atari-sysv4 +- exit 0 ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && echo i486-ncr-sysv4 && exit 0 ;; + m68*:LynxOS:2.*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; +- i?86:LynxOS:2.*:*) +- echo i386-pc-lynxos${UNAME_RELEASE} ++ mc68030:UNIX_System_V:4.*:*) ++ echo m68k-atari-sysv4 ++ exit 0 ;; ++ i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*) ++ echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} +@@ -836,13 +880,13 @@ + rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; +- *:LynxOS:*:*) +- echo ${UNAME_MACHINE}-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit 0 ;; +- RM*:SINIX-*:*:* | RM*:ReliantUNIX-*:*:*) ++ RM*:ReliantUNIX-*:*:*) ++ echo mips-sni-sysv4 ++ exit 0 ;; ++ RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; + *:SINIX-*:*:*) +@@ -854,9 +898,9 @@ + fi + exit 0 ;; + PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit 0 ;; ++ # says ++ echo i586-unisys-sysv4 ++ exit 0 ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm +@@ -865,30 +909,47 @@ + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 +- exit 0 ;; ++ exit 0 ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit 0 ;; + news*:NEWS-OS:*:6*) + echo mips-sony-newsos6 + exit 0 ;; +- R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*) ++ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi ++ exit 0 ;; ++ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. ++ echo powerpc-be-beos + exit 0 ;; +- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 ++ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. ++ echo powerpc-apple-beos ++ exit 0 ;; ++ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. ++ echo i586-pc-beos ++ exit 0 ;; ++ SX-4:SUPER-UX:*:*) ++ echo sx4-nec-superux${UNAME_RELEASE} ++ exit 0 ;; ++ SX-5:SUPER-UX:*:*) ++ echo sx5-nec-superux${UNAME_RELEASE} ++ exit 0 ;; ++ Power*:Rhapsody:*:*) ++ echo powerpc-apple-rhapsody${UNAME_RELEASE} ++ exit 0 ;; ++ *:Rhapsody:*:*) ++ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 + #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + +-cat >dummy.c <$dummy.c < + # include +@@ -913,11 +974,7 @@ + #endif + + #if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix\n"); exit (0); +-#endif +- +-#if defined (hp9000) && !defined (hpux) +- printf ("m68k-hp-bsd\n"); exit (0); ++ printf ("arm-acorn-riscix"); exit (0); + #endif + + #if defined (hp300) && !defined (hpux) +@@ -930,7 +987,10 @@ + #endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; +- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); ++ if (version < 4) ++ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); ++ else ++ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); + #endif + +@@ -986,119 +1046,12 @@ + printf ("i860-alliant-bsd\n"); exit (0); + #endif + +-/* Begin cases added for Bash */ +-#if defined (tahoe) +- printf ("tahoe-cci-bsd\n"); exit (0); +-#endif +- +-#if defined (nec_ews) +-# if defined (SYSTYPE_SYSV) +- printf ("ews4800-nec-sysv4\n"); exit 0; +-# else +- printf ("ews4800-nec-bsd\n"); exit (0); +-# endif +-#endif +- +-#if defined (sony) +-# if defined (SYSTYPE_SYSV) +- printf ("mips-sony-sysv4\n"); exit 0; +-# else +- printf ("mips-sony-bsd\n"); exit (0); +-# endif +-#endif +- +-#if defined (ardent) +- printf ("titan-ardent-bsd\n"); exit (0); +-#endif +- +-#if defined (stardent) +- printf ("stardent-stardent-sysv\n"); exit (0); +-#endif +- +-#if defined (ibm032) +- printf ("ibmrt-ibm-bsd4.3\n"); exit (0); +-#endif +- +-#if defined (sequent) && defined (i386) +- printf ("i386-sequent-bsd\n"); exit (0); +-#endif +- +-#if defined (qnx) && defined (i386) +- printf ("i386-pc-qnx\n"); exit (0); +-#endif +- +-#if defined (gould) +- printf ("gould-gould-bsd\n"); exit (0); +-#endif +- +-#if defined (unixpc) +- printf ("unixpc-att-sysv\n"); exit (0); +-#endif +- +-#if defined (att386) +- printf ("i386-att-sysv3\n"); exit (0); +-#endif +- +-#if defined (__m88k) && defined (__UMAXV__) +- printf ("m88k-encore-sysv3\n"); exit (0); +-#endif +- +-#if defined (drs6000) +- printf ("drs6000-icl-sysv4.2\n"); exit (0); +-#endif +- +-#if defined (clipper) +- printf ("clipper-orion-bsd\n"); exit (0); +-#endif +- +-#if defined (is68k) +- printf ("m68k-isi-bsd\n"); exit (0); +-#endif +- +-#if defined (luna88k) +- printf ("luna88k-omron-bsd\n"); exit (0); +-#endif +- +-#if defined (butterfly) && defined (BFLY1) +- printf ("butterfly-bbn-mach\n"); exit (0); +-#endif +- +-#if defined (tower32) +- printf ("tower32-ncr-sysv4\n"); exit (0); +-#endif +- +-#if defined (MagicStation) +- printf ("magicstation-unknown-bsd\n"); exit (0); +-#endif +- +-#if defined (scs) +- printf ("symmetric-scs-bsd4.2\n"); exit (0); +-#endif +- +-#if defined (tandem) +- printf ("tandem-tandem-sysv\n"); exit (0); +-#endif +- +-#if defined (cadmus) +- printf ("cadmus-pcs-sysv\n"); exit (0); +-#endif +- +-#if defined (masscomp) +- printf ("masscomp-masscomp-sysv3\n"); exit (0); +-#endif +- +-#if defined (hbullx20) +- printf ("hbullx20-bull-sysv3\n"); exit (0); +-#endif +- +-/* End cases added for Bash */ +- + exit (1); + } + EOF + +-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0 +-rm -f dummy.c dummy ++$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 ++rm -f $dummy.c $dummy + + # Apollos put the system type in the environment. + +@@ -1129,21 +1082,6 @@ + exit 0 ;; + esac + fi +- +-# Begin cases added for Bash +-case "$UNAME" in +-uts) echo uts-amdahl-sysv${UNAME_RELEASE}; exit 0 ;; +-esac +- +-if [ -d /usr/amiga ]; then +- echo m68k-cbm-sysv${UNAME_RELEASE}; exit 0; +-fi +- +-if [ -f /bin/fxc.info ]; then +- echo fxc-alliant-concentrix +- exit 0 +-fi +-# end cases added for Bash + + #echo '(Unable to guess system type)' 1>&2 + +--- ./support/config.sub~ Thu Dec 31 15:37:04 1998 ++++ ./support/config.sub Mon Nov 8 07:46:34 1999 +@@ -1,6 +1,6 @@ + #! /bin/sh + # Configuration validation subroutine script, version 1.1. +-# Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. ++# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc. + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software + # can handle that machine. It does not imply ALL GNU software can. +@@ -94,10 +94,20 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple ) ++ -apple) + os= + basic_machine=$1 + ;; ++ -sim | -cisco | -oki | -wec | -winbond) ++ os= ++ basic_machine=$1 ++ ;; ++ -scout) ++ ;; ++ -wrs) ++ os=vxworks ++ basic_machine=$1 ++ ;; + -hiux*) + os=-hiuxwe2 + ;; +@@ -121,6 +131,9 @@ + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -udk*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -149,19 +162,27 @@ + case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. +- tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \ +- | arme[lb] | pyramid \ +- | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \ +- | hppa2.0 | alpha | we32k | ns16k | clipper | i370 | sh \ +- | powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \ +- | pdp11 | mips64el | mips64orion | mips64orionel \ +- | sparc | sparclet | sparclite | sparc64) ++ tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ ++ | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ ++ | 580 | i960 | h8300 \ ++ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ ++ | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ ++ | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ ++ | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ ++ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ ++ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ ++ | mips64vr5000 | miprs64vr5000el | mcore \ ++ | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ ++ | thumb | d10v) + basic_machine=$basic_machine-unknown + ;; ++ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65) ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +- i[3456]86) ++ i[34567]86) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. +@@ -170,30 +191,45 @@ + exit 1 + ;; + # Recognize the basic CPU types with company name. +- vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \ +- | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \ +- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \ +- | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \ +- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \ +- | alpha-* | alphaev5-* | alphaev56-* | alphapca56-* | alphaev6-* \ +- | we32k-* | cydra-* | ns16k-* \ +- | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \ +- | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \ +- | mips64el-* | mips64orion-* | mips64orionel-* | f301-* \ +- | butterfly-bbn* \ +- | cadmus-* | ews*-nec | ibmrt-ibm* | masscomp-masscomp \ +- | tandem-* | symmetric-* | drs6000-icl | *-*ardent | gould-gould \ +- | concurrent-* | ksr1-* | esa-ibm | fxc-alliant | *370-amdahl \ +- | *-convex | sx4*-nec) ++ # FIXME: clean up the formatting here. ++ vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ ++ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ ++ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ ++ | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ ++ | xmp-* | ymp-* \ ++ | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \ ++ | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \ ++ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ ++ | clipper-* | orion-* \ ++ | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ ++ | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ ++ | mips64el-* | mips64orion-* | mips64orionel-* \ ++ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ ++ | mipstx39-* | mipstx39el-* | mcore-* \ ++ | f301-* | armv*-* | t3e-* \ ++ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ ++ | thumb-* | v850-* | d30v-* | tic30-* | c30-* ) + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. ++ 386bsd) ++ basic_machine=i386-unknown ++ os=-bsd ++ ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; ++ a29khif) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ adobe68k) ++ basic_machine=m68010-adobe ++ os=-scout ++ ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; +@@ -209,16 +245,11 @@ + os=-sysv + ;; + amiga | amiga-*) +-# basic_machine=m68k-cbm +- basic_machine=m68k-unknown +- ;; +- amigaos) +- basic_machine=m68k-unknown +- os=-amigaos ++ basic_machine=m68k-cbm + ;; +- amigados) ++ amigaos | amigados) + basic_machine=m68k-cbm +- os=-amigados ++ os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-cbm +@@ -228,6 +259,10 @@ + basic_machine=m68k-apollo + os=-sysv + ;; ++ apollo68bsd) ++ basic_machine=m68k-apollo ++ os=-bsd ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -293,9 +328,6 @@ + basic_machine=m68k-bull + os=-sysv3 + ;; +- hbullx20-bull) +- basic_machine=m68k-bull +- ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon +@@ -304,9 +336,13 @@ + basic_machine=elxsi-elxsi + os=-bsd + ;; +- encore | umax | mmax | multimax) ++ encore | umax | mmax) + basic_machine=ns32k-encore + ;; ++ es1800 | OSE68k | ose68k | ose | OSE) ++ basic_machine=m68k-ericsson ++ os=-ose ++ ;; + fx2800) + basic_machine=i860-alliant + ;; +@@ -325,6 +361,14 @@ + basic_machine=h8300-hitachi + os=-hms + ;; ++ h8300xray) ++ basic_machine=h8300-hitachi ++ os=-xray ++ ;; ++ h8500hms) ++ basic_machine=h8500-hitachi ++ os=-hms ++ ;; + harris) + basic_machine=m88k-harris + os=-sysv3 +@@ -340,13 +384,30 @@ + basic_machine=m68k-hp + os=-hpux + ;; ++ hp3k9[0-9][0-9] | hp9[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; +- hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) ++ hp9k6[0-9][0-9] | hp6[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k7[0-79][0-9] | hp7[0-79][0-9]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k78[0-9] | hp78[0-9]) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) +@@ -355,30 +416,51 @@ + hppa-next) + os=-nextstep3 + ;; +- ibm032-*) +- basic_machine=ibmrt-ibm ++ hppaosf) ++ basic_machine=hppa1.1-hp ++ os=-osf ++ ;; ++ hppro) ++ basic_machine=hppa1.1-hp ++ os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + os=-mvs + ;; + # I'm not sure what "Sysv32" means. Should this be sysv3.2? +- i[3456]86v32) ++ i[34567]86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; +- i[3456]86v4*) ++ i[34567]86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; +- i[3456]86v) ++ i[34567]86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; +- i[3456]86sol2) ++ i[34567]86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; ++ i386mach) ++ basic_machine=i386-mach ++ os=-mach ++ ;; ++ i386-vsta | vsta) ++ basic_machine=i386-unknown ++ os=-vsta ++ ;; ++ i386-go32 | go32) ++ basic_machine=i386-unknown ++ os=-go32 ++ ;; ++ i386-mingw32 | mingw32) ++ basic_machine=i386-unknown ++ os=-mingw32 ++ ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in +@@ -393,12 +475,9 @@ + basic_machine=m68k-isi + os=-sysv + ;; +- luna88k-omron* | m88k-omron*) ++ m88k-omron*) + basic_machine=m88k-omron + ;; +- magicstation*) +- basic_machine=magicstation-unknown +- ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv +@@ -410,13 +489,17 @@ + miniframe) + basic_machine=m68000-convergent + ;; ++ *mint | *MiNT) ++ basic_machine=m68k-atari ++ os=-mint ++ ;; + mipsel*-linux*) + basic_machine=mipsel-unknown +- os=-linux ++ os=-linux-gnu + ;; + mips*-linux*) + basic_machine=mips-unknown +- os=-linux ++ os=-linux-gnu + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` +@@ -424,10 +507,26 @@ + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; ++ monitor) ++ basic_machine=m68k-rom68k ++ os=-coff ++ ;; ++ msdos) ++ basic_machine=i386-unknown ++ os=-msdos ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; ++ netbsd386) ++ basic_machine=i386-unknown ++ os=-netbsd ++ ;; ++ netwinder) ++ basic_machine=armv4l-corel ++ os=-linux ++ ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos +@@ -440,6 +539,10 @@ + basic_machine=mips-sony + os=-newsos + ;; ++ necv70) ++ basic_machine=v70-nec ++ os=-sysv ++ ;; + next | m*-next ) + basic_machine=m68k-next + case $os in +@@ -465,16 +568,24 @@ + basic_machine=i960-intel + os=-nindy + ;; ++ mon960) ++ basic_machine=i960-intel ++ os=-mon960 ++ ;; + np1) + basic_machine=np1-gould + ;; +- osr5 | sco5) # SCO Open Server +- basic_machine=i386-pc +- os=-sco3.2v5 +- ;; +- odt | odt3 | odt4) # SCO Open Desktop +- basic_machine=i386-pc +- os=-sco3.2v4 ++ op50n-* | op60c-*) ++ basic_machine=hppa1.1-oki ++ os=-proelf ++ ;; ++ OSE68000 | ose68000) ++ basic_machine=m68000-ericsson ++ os=-ose ++ ;; ++ os68k) ++ basic_machine=m68k-none ++ os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi +@@ -493,25 +604,23 @@ + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; +- pentium | p5) +- basic_machine=i586-intel ++ pentium | p5 | k5 | k6 | nexen) ++ basic_machine=i586-pc ++ ;; ++ pentiumpro | p6 | 6x86) ++ basic_machine=i686-pc + ;; +- pentiumpro | p6) +- basic_machine=i686-intel ++ pentiumii | pentium2) ++ basic_machine=i786-pc + ;; +- pentium-* | p5-*) ++ pentium-* | p5-* | k5-* | k6-* | nexen-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; +- pentiumpro-* | p6-*) ++ pentiumpro-* | p6-* | 6x86-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; +- k5) +- # We don't have specific support for AMD's K5 yet, so just call it a Pentium +- basic_machine=i586-amd +- ;; +- nexen) +- # We don't have specific support for Nexgen yet, so just call it a Pentium +- basic_machine=i586-nexgen ++ pentiumii-* | pentium2-*) ++ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould +@@ -531,12 +640,20 @@ + ps2) + basic_machine=i386-ibm + ;; ++ rom68k) ++ basic_machine=m68k-rom68k ++ os=-coff ++ ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; ++ sa29200) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; + sequent) + basic_machine=i386-sequent + ;; +@@ -544,6 +661,10 @@ + basic_machine=sh-hitachi + os=-hms + ;; ++ sparclite-wrs) ++ basic_machine=sparclite-wrs ++ os=-vxworks ++ ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 +@@ -551,6 +672,13 @@ + spur) + basic_machine=spur-unknown + ;; ++ st2000) ++ basic_machine=m68k-tandem ++ ;; ++ stratus) ++ basic_machine=i860-stratus ++ os=-sysv4 ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -595,6 +723,16 @@ + basic_machine=i386-sequent + os=-dynix + ;; ++ t3e) ++ basic_machine=t3e-cray ++ os=-unicos ++ ;; ++ tx39) ++ basic_machine=mipstx39-unknown ++ ;; ++ tx39el) ++ basic_machine=mipstx39el-unknown ++ ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; +@@ -606,13 +744,9 @@ + basic_machine=a29k-nyu + os=-sym1 + ;; +- uw2 | unixware | unixware2) +- basic_machine=i386-pc +- os=-sysv4.2uw2.1 +- ;; +- uw7 | unixware7) +- basic_machine=i386-pc +- os=-sysv5uw7 ++ v810 | necv810) ++ basic_machine=v810-nec ++ os=-none + ;; + vaxv) + basic_machine=vax-dec +@@ -623,8 +757,8 @@ + os=-vms + ;; + vpp*|vx|vx-*) +- basic_machine=f301-fujitsu +- ;; ++ basic_machine=f301-fujitsu ++ ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks +@@ -637,6 +771,14 @@ + basic_machine=a29k-wrs + os=-vxworks + ;; ++ w65*) ++ basic_machine=w65-wdc ++ os=-none ++ ;; ++ w89k-*) ++ basic_machine=hppa1.1-winbond ++ os=-proelf ++ ;; + xmp) + basic_machine=xmp-cray + os=-unicos +@@ -644,6 +786,10 @@ + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ z8k-*-coff) ++ basic_machine=z8k-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -651,8 +797,17 @@ + + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. ++ w89k) ++ basic_machine=hppa1.1-winbond ++ ;; ++ op50n) ++ basic_machine=hppa1.1-oki ++ ;; ++ op60c) ++ basic_machine=hppa1.1-oki ++ ;; + mips) +- if test "x$os" = "x-linux" ; then ++ if [ x$os = x-linux-gnu ]; then + basic_machine=mips-unknown + else + basic_machine=mips-mips +@@ -673,7 +828,7 @@ + we32k) + basic_machine=we32k-att + ;; +- sparc) ++ sparc | sparcv9) + basic_machine=sparc-sun + ;; + cydra) +@@ -685,6 +840,16 @@ + orion105) + basic_machine=clipper-highlevel + ;; ++ mac | mpw | mac-mpw) ++ basic_machine=m68k-apple ++ ;; ++ pmac | pmac-mpw) ++ basic_machine=powerpc-apple ++ ;; ++ c4x*) ++ basic_machine=c4x-none ++ os=-coff ++ ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 +@@ -708,8 +873,8 @@ + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` +@@ -717,14 +882,11 @@ + -solaris) + os=-solaris2 + ;; +- svr4*) ++ -svr4*) + os=-sysv4 + ;; +- -unixware | -uw | -unixware2* | -uw2*) +- os=-sysv4.2uw2.1 +- ;; +- -unixware7* | -uw7*) +- os=-sysv5uw7 ++ -unixware*) ++ os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` +@@ -736,18 +898,26 @@ + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ +- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \ ++ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ++ | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ +- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ ++ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -linux-gnu* | -uxpv* | -qnx* | -powerux* | -beos* | -rhapsody* \ +- | -superux* ) ++ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; ++ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ ++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ ++ | -macos* | -mpw* | -magic* | -mon960* | -lnews*) ++ ;; ++ -mac*) ++ os=`echo $os | sed -e 's|mac|macos|'` ++ ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; +@@ -772,6 +942,9 @@ + -acis*) + os=-aos + ;; ++ -386bsd) ++ os=-bsd ++ ;; + -ctix* | -uts*) + os=-sysv + ;; +@@ -800,15 +973,21 @@ + -sysvr4) + os=-sysv4 + ;; +- -sysvr5) +- os=-sysv5 +- ;; +- # This must come after -sysvr[45]. ++ # This must come after -sysvr4. + -sysv*) + ;; ++ -ose*) ++ os=-ose ++ ;; ++ -es1800*) ++ os=-ose ++ ;; + -xenix) + os=-xenix + ;; ++ -*mint | -*MiNT) ++ os=-mint ++ ;; + -none) + ;; + *) +@@ -834,6 +1013,9 @@ + *-acorn) + os=-riscix1.2 + ;; ++ arm*-corel) ++ os=-linux ++ ;; + arm*-semi) + os=-aout + ;; +@@ -855,6 +1037,15 @@ + # default. + # os=-sunos4 + ;; ++ m68*-cisco) ++ os=-aout ++ ;; ++ mips*-cisco) ++ os=-elf ++ ;; ++ mips*-*) ++ os=-elf ++ ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; +@@ -867,6 +1058,15 @@ + *-ibm) + os=-aix + ;; ++ *-wec) ++ os=-proelf ++ ;; ++ *-winbond) ++ os=-proelf ++ ;; ++ *-oki) ++ os=-proelf ++ ;; + *-hp) + os=-hpux + ;; +@@ -930,6 +1130,18 @@ + f301-fujitsu) + os=-uxpv + ;; ++ *-rom68k) ++ os=-coff ++ ;; ++ *-*bug) ++ os=-coff ++ ;; ++ *-apple) ++ os=-macos ++ ;; ++ *-atari*) ++ os=-mint ++ ;; + *) + os=-none + ;; +@@ -948,15 +1160,18 @@ + -sunos*) + vendor=sun + ;; +- -lynxos*) +- vendor=lynx +- ;; + -aix*) + vendor=ibm + ;; ++ -beos*) ++ vendor=be ++ ;; + -hpux*) + vendor=hp + ;; ++ -mpeix*) ++ vendor=hp ++ ;; + -hiux*) + vendor=hitachi + ;; +@@ -983,6 +1198,15 @@ + ;; + -aux*) + vendor=apple ++ ;; ++ -hms*) ++ vendor=hitachi ++ ;; ++ -mpw* | -macos*) ++ vendor=apple ++ ;; ++ -*mint | -*MiNT) ++ vendor=atari + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` --- bash-2.03.orig/debian/patches/job-control-segfault.dpatch +++ bash-2.03/debian/patches/job-control-segfault.dpatch @@ -0,0 +1,167 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# When job control is enabled, a variable is being assigned with +# redirection(either `` or $()), and a trap'd signal is caught during +# the redirection, bash would segfault on the command after the +# assignment. + +# Thanks to Eric Weigel for this patch, and +# Adam Heath for discovering it. + +diff -ur bash-2.03/jobs.c bash-2.03-emw/jobs.c +--- bash-2.03/jobs.c Thu Dec 10 14:01:15 1998 ++++ bash-2.03-emw/jobs.c Sat Jan 22 05:47:32 2000 +@@ -99,6 +99,7 @@ + #include "jobs.h" + #include "flags.h" + #include "error.h" ++#include "subst.h" + + #include "builtins/builtext.h" + #include "builtins/common.h" +@@ -2452,6 +2453,7 @@ + unwind_protect_int (interrupt_immediately); + unwind_protect_int (jobs_list_frozen); + unwind_protect_pointer (the_pipeline); ++ unwind_protect_pointer (subst_varlist); + + /* We have to add the commands this way because they will be run + in reverse order of adding. We don't want maybe_set_sigchld_trap () +@@ -2459,6 +2461,7 @@ + add_unwind_protect ((Function *)xfree, trap_command); + add_unwind_protect ((Function *)maybe_set_sigchld_trap, trap_command); + ++ subst_varlist = (WORD_LIST*)NULL; + the_pipeline = (PROCESS *)NULL; + restore_default_signal (SIGCHLD); + jobs_list_frozen = 1; +diff -ur bash-2.03/subst.c bash-2.03-emw/subst.c +--- bash-2.03/subst.c Wed Jan 20 12:13:52 1999 ++++ bash-2.03-emw/subst.c Sat Jan 22 06:15:49 2000 +@@ -5457,7 +5457,7 @@ + #define PREPEND_LIST(nlist, elist) \ + do { nlist->next = elist; elist = nlist; } while (0) + +-static WORD_LIST *varlist = (WORD_LIST *)NULL; ++WORD_LIST *subst_varlist = (WORD_LIST *)NULL; + + /* Separate out any initial variable assignments from TLIST. If set -k has + been executed, remove all assignment statements from TLIST. Initial +@@ -5472,10 +5472,10 @@ + if (!tlist) + return ((WORD_LIST *)NULL); + +- if (varlist) +- dispose_words (varlist); /* Clean up after previous error */ ++ if (subst_varlist) ++ dispose_words (subst_varlist); /* Clean up after previous error */ + +- varlist = (WORD_LIST *)NULL; ++ subst_varlist = (WORD_LIST *)NULL; + vp = lp = tlist; + + /* Separate out variable assignments at the start of the command. +@@ -5495,7 +5495,7 @@ + TLIST point to the remaining words. */ + if (lp != tlist) + { +- varlist = tlist; ++ subst_varlist = tlist; + /* ASSERT(vp->next == lp); */ + vp->next = (WORD_LIST *)NULL; /* terminate variable list */ + tlist = lp; /* remainder of word list */ +@@ -5526,9 +5526,9 @@ + if (lp->word->flags & W_ASSIGNMENT) + { + /* Found an assignment statement, add this word to end of +- varlist (vp). */ +- if (!varlist) +- varlist = vp = lp; ++ subst_varlist (vp). */ ++ if (!subst_varlist) ++ subst_varlist = vp = lp; + else + { + vp->next = lp; +@@ -5872,11 +5872,11 @@ + new_list = separate_out_assignments (new_list); + if (new_list == 0) + { +- if (varlist) ++ if (subst_varlist) + { + /* All the words were variable assignments, so they are placed + into the shell's environment. */ +- for (temp_list = varlist; temp_list; temp_list = temp_list->next) ++ for (temp_list = subst_varlist; temp_list; temp_list = temp_list->next) + { + this_command_name = (char *)NULL; /* no arithmetic errors */ + tint = do_assignment (temp_list->word->word); +@@ -5888,8 +5888,8 @@ + jump_to_top_level (FORCE_EOF); + } + } +- dispose_words (varlist); +- varlist = (WORD_LIST *)NULL; ++ dispose_words (subst_varlist); ++ subst_varlist = (WORD_LIST *)NULL; + } + return ((WORD_LIST *)NULL); + } +@@ -5922,7 +5922,7 @@ + new_list = dequote_list (new_list); + } + +- if ((eflags & WEXP_VARASSIGN) && varlist) ++ if ((eflags & WEXP_VARASSIGN) && subst_varlist) + { + Function *assign_func; + +@@ -5931,7 +5931,7 @@ + environment. */ + assign_func = new_list ? assign_in_env : do_assignment; + +- for (temp_list = varlist; temp_list; temp_list = temp_list->next) ++ for (temp_list = subst_varlist; temp_list; temp_list = temp_list->next) + { + this_command_name = (char *)NULL; + tint = (*assign_func) (temp_list->word->word); +@@ -5945,8 +5945,8 @@ + } + } + +- dispose_words (varlist); +- varlist = (WORD_LIST *)NULL; ++ dispose_words (subst_varlist); ++ subst_varlist = (WORD_LIST *)NULL; + } + + #if 0 +diff -ur bash-2.03/subst.h bash-2.03-emw/subst.h +--- bash-2.03/subst.h Fri Sep 12 16:54:32 1997 ++++ bash-2.03-emw/subst.h Sat Jan 22 05:45:16 2000 +@@ -23,6 +23,8 @@ + + #include "stdc.h" + ++WORD_LIST *subst_varlist; ++ + /* Cons a new string from STRING starting at START and ending at END, + not including END. */ + extern char *substring __P((char *, int, int)); + --- bash-2.03.orig/debian/patches/system-bashrc.dpatch +++ bash-2.03/debian/patches/system-bashrc.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Enable System-wide .bashrc file for interactive shells. +# DP: Enable System-wide .bash_logout file for interactive shells. + +--- ./config-top.h~ Sun Dec 19 18:57:57 1999 ++++ ./config-top.h Sun Dec 19 19:10:22 1999 +@@ -49,7 +49,7 @@ + #define SPROMPT "> " + + /* System-wide .bashrc file for interactive shells. */ +-/* #define SYS_BASHRC "/etc/bash.bashrc" */ ++#define SYS_BASHRC "/etc/bash.bashrc" + + /* System-wide .bash_logout for login shells. */ +-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ ++#define SYS_BASH_LOGOUT "/etc/bash.bash_logout" --- bash-2.03.orig/debian/patches/template.dpatch +++ bash-2.03/debian/patches/template.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: --- bash-2.03.orig/debian/patches/secure-build.dpatch +++ bash-2.03/debian/patches/secure-build.dpatch @@ -0,0 +1,126 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: From: Topi Miettinen +# DP: build bash without using guessable file names in /tmp. + +From: Topi Miettinen +Sender: tom@pluto.nic.fi +To: 36027@bugs.debian.org +Subject: Bug#36027: Suggested patch to fix #36027 +Date: Tue, 14 Dec 1999 22:05:53 +0200 + +The following patch attempts to fix the security problem. + +-Topi + +diff -ru ./aclocal.m4.orig ./aclocal.m4 +--- ./aclocal.m4.orig Wed Dec 30 18:06:41 1998 ++++ ./aclocal.m4 Tue Dec 14 21:59:06 1999 +@@ -316,13 +316,19 @@ + main() + { + DIR *dir; +-int fd; +-unlink("/tmp/not_a_directory"); +-fd = open("/tmp/not_a_directory", O_WRONLY|O_CREAT, 0666); ++int fd, err; ++ ++err = mkdir("/tmp/bash-aclocal", 0700); ++if (err == -1) { ++ perror("mkdir"); ++ exit (1); ++} ++fd = open("/tmp/bash-aclocal/not_a_directory", O_WRONLY|O_CREAT, 0666); + write(fd, "\n", 1); + close(fd); +-dir = opendir("/tmp/not_a_directory"); +-unlink("/tmp/not_a_directory"); ++dir = opendir("/tmp/bash-aclocal/not_a_directory"); ++unlink("/tmp/bash-aclocal/not_a_directory"); ++rmdir("/tmp/bash-aclocal"); + exit (dir == 0); + }], bash_cv_opendir_not_robust=yes,bash_cv_opendir_not_robust=no, + [AC_MSG_WARN(cannot check opendir if cross compiling -- defaulting to no) +@@ -845,7 +851,7 @@ + /* Add more tests in here as appropriate. */ + main() + { +-int fd; ++int fd, err; + + #if defined (HAVE_MKFIFO) + exit (0); +@@ -859,11 +865,17 @@ + exit (1); + #endif + +-fd = mknod ("/tmp/sh-np-autoconf", 0666 | S_IFIFO, 0); ++err = mkdir ("/tmp/bash-aclocal", 0700); ++if (err == -1) { ++ perror ("mkdir"); ++ exit (1); ++} ++fd = mknod ("/tmp/bash-aclocal/sh-np-autoconf", 0666 | S_IFIFO, 0); + if (fd == -1) + exit (1); + close(fd); +-unlink ("/tmp/sh-np-autoconf"); ++unlink ("/tmp/bash-aclocal/sh-np-autoconf"); ++rmdir ("/tmp/bash-aclocal"); + exit(0); + }], bash_cv_sys_named_pipes=present, bash_cv_sys_named_pipes=missing, + [AC_MSG_WARN(cannot check for named pipes if cross-compiling -- +defaulting to missing) + + +diff -ru support/rlvers.sh.orig support/rlvers.sh +--- ./support/rlvers.sh.orig Mon Dec 6 03:58:51 1999 ++++ ./support/rlvers.sh Tue Dec 14 22:32:33 1999 +@@ -6,7 +6,7 @@ + + PROGNAME=`basename $0` + +-trap 'rm -f /tmp/rlvers /tmp/rlvers.?' 0 1 2 3 6 15 ++trap 'rm -rf /tmp/rlvers' 0 1 2 3 6 15 + + # defaults + CC=cc +@@ -41,7 +41,8 @@ + echo "${PROGNAME}: attempting program compilation" + fi + +-cat > /tmp/rlvers.c << EOF ++mkdir -m 0700 /tmp/rlvers ++cat > /tmp/rlvers/rlvers.c << EOF + #include + extern char *rl_library_version; + +@@ -52,9 +53,9 @@ + } + EOF + +-if eval ${CC} -L${RL_LIBDIR} -o /tmp/rlvers /tmp/rlvers.c -lreadline -lcurses; ++if eval ${CC} -L${RL_LIBDIR} -o /tmp/rlvers/rlvers /tmp/rlvers/rlvers.c -lreadline -lcurses; + then +- v=`/tmp/rlvers` ++ v=`/tmp/rlvers/rlvers` + else + if [ -n "$verbose" ] ; then + echo "${PROGNAME}: compilation failed: status $?" + + --- bash-2.03.orig/debian/patches/man-vx-opts.dpatch +++ bash-2.03/debian/patches/man-vx-opts.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: document -v / -x options + +--- ./doc/bash.1~ Wed Jan 20 22:48:04 1999 ++++ ./doc/bash.1 Sun Nov 14 13:26:59 1999 +@@ -104,6 +104,12 @@ + This option allows the positional parameters to be set + when invoking an interactive shell. + .TP ++.B \-v ++Print shell input lines as they are read. ++.TP ++.B \-x ++Print commands and their arguments as they are executed. ++.TP + .B \-D + A list of all double-quoted strings preceded by \fB$\fP + is printed on the standard ouput. --- bash-2.03.orig/debian/patches/rlvers +++ bash-2.03/debian/patches/rlvers @@ -0,0 +1,11 @@ +--- ./support/rlvers.sh~ Thu May 21 18:43:21 1998 ++++ ./support/rlvers.sh Sat Nov 20 14:23:44 1999 +@@ -52,7 +52,7 @@ + } + EOF + +-if eval ${CC} -L${RL_LIBDIR} -o /tmp/rlvers /tmp/rlvers.c -lreadline -ltermcap -lcurses; ++if eval ${CC} -L${RL_LIBDIR} -o /tmp/rlvers /tmp/rlvers.c -lreadline -lcurses; + then + v=`/tmp/rlvers` + else --- bash-2.03.orig/debian/patches/bashbug-editor.dpatch +++ bash-2.03/debian/patches/bashbug-editor.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: use EDITOR environment variable or else the editor command. + +--- ./support/bashbug.sh~ Tue Mar 17 20:21:00 1998 ++++ ./support/bashbug.sh Sun Nov 14 13:49:26 1999 +@@ -49,7 +49,7 @@ + + BUGADDR="${1-$BUGBASH}" + +-: ${EDITOR=emacs} ++: ${EDITOR=editor} + + : ${USER=${LOGNAME-`whoami`}} + --- bash-2.03.orig/debian/patches/applied-upstream.dpatch +++ bash-2.03/debian/patches/applied-upstream.dpatch @@ -0,0 +1,52 @@ +#! /bin/sh -e + +echo "These patches are applied upstream!" +exit 0 + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +--- bash-2.02.1.orig/lib/readline/rlconf.h ++++ bash-2.02.1/lib/readline/rlconf.h +@@ -56,8 +57,6 @@ + + /* Define this if you want code that allows readline to be used in an + X `callback' style. */ +-#if !defined (SHELL) + # define READLINE_CALLBACKS +-#endif + + #endif /* _RLCONF_H_ */ + +--- bash-2.02.1.orig/bashhist.c ++++ bash-2.02.1/bashhist.c +@@ -289,7 +289,7 @@ + /* If the filename was supplied, then create it if necessary. */ + if (stat (filename, &buf) == -1 && errno == ENOENT) + { +- fd = open (filename, O_WRONLY|O_CREAT, 0666); ++ fd = open (filename, O_WRONLY|O_CREAT, 0600); + if (fd < 0) + { + builtin_error ("%s: cannot create: %s", filename, strerror (errno)); +@@ -324,7 +324,7 @@ + if (stat (hf, &buf) == -1) + { + int file; +- file = open (hf, O_CREAT | O_TRUNC | O_WRONLY, 0666); ++ file = open (hf, O_CREAT | O_TRUNC | O_WRONLY, 0600); + if (file != -1) + close (file); + } --- bash-2.03.orig/debian/patches/dont-report-sigpipe.dpatch +++ bash-2.03/debian/patches/dont-report-sigpipe.dpatch @@ -0,0 +1,35 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Define DONT_REPORT_SIGPIPE: We don't want to see `Broken pipe' messages +# DP: when a job like `cat jobs.c | exit 1' is executed. Fixes part of #7047, +# DP: #10259, #10433 and #10494. Comment from the upstream author: "The default +# DP: bash behavior with respect to the exit status of a pipeline will not +# DP: change. Changing it as suggested in the discussion of #10494 would render +# DP: bash incompatible with every other shell out there.". + +--- ./config-top.h~ Sun Dec 19 18:57:57 1999 ++++ ./config-top.h Sun Dec 19 19:09:15 1999 +@@ -29,7 +29,7 @@ + + /* Define DONT_REPORT_SIGPIPE if you don't want to see `Broken pipe' messages + when a job like `cat jobs.c | exit 1' is executed. */ +-/* #define DONT_REPORT_SIGPIPE */ ++#define DONT_REPORT_SIGPIPE + + /* The default value of the PATH variable. */ + #ifndef DEFAULT_PATH_VALUE --- bash-2.03.orig/debian/patches/deb-build.dpatch +++ bash-2.03/debian/patches/deb-build.dpatch @@ -0,0 +1,109 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Debian specific patches that allow libreadline to be built +# DP: as a static _and_ a shared library. + +--- ./Makefile.in~ Thu Feb 18 18:07:38 1999 ++++ ./Makefile.in Thu Nov 11 14:09:04 1999 +@@ -129,7 +129,7 @@ + SHLIB_LIB = -lsh + SHLIB_LIBNAME = libsh.a + SHLIB_LIBRARY = ${SH_LIBDIR}/${SHLIB_LIBNAME} +-SHLIB_LDFLAGS = -L${SH_LIBDIR} ++SHLIB_LDFLAGS = -L${deb_builddir}${SH_LIBDIR} + SHLIB_DEP = ${SHLIB_LIBRARY} + + # we assume for now that readline source is being shipped with bash +@@ -140,7 +140,7 @@ + + READLINE_LIB = @READLINE_LIB@ + READLINE_LIBRARY = $(RL_LIBDIR)/libreadline.a +-READLINE_LDFLAGS = -L${RL_LIBDIR} ++READLINE_LDFLAGS = -L${deb_builddir}${RL_LIBDIR} + READLINE_DEP = @READLINE_DEP@ + + # The source, object and documentation of the GNU Readline library. +@@ -186,7 +186,7 @@ + + HISTORY_LIB = @HISTORY_LIB@ + HISTORY_LIBRARY = $(HIST_LIBDIR)/libhistory.a +-HISTORY_LDFLAGS = -L$(HIST_LIBDIR) ++HISTORY_LDFLAGS = -L${deb_builddir}$(HIST_LIBDIR) + HISTORY_DEP = @HISTORY_DEP@ + + # The source, object and documentation of the history library. +@@ -205,7 +205,7 @@ + + TERMCAP_LIB = @TERMCAP_LIB@ + TERMCAP_LIBRARY = $(TERM_LIBDIR)/libtermcap.a +-TERMCAP_LDFLAGS = -L$(TERM_LIBDIR) ++TERMCAP_LDFLAGS = -L${deb_builddir}$(TERM_LIBDIR) + TERMCAP_DEP = @TERMCAP_DEP@ + + TERMCAP_SOURCE = $(TERM_LIBSRC)/termcap.c $(TERM_LIBSRC)/tparam.c +@@ -217,7 +217,7 @@ + + GLOB_LIB = -lglob + GLOB_LIBRARY = $(GLOB_LIBDIR)/libglob.a +-GLOB_LDFLAGS = -L$(GLOB_LIBDIR) ++GLOB_LDFLAGS = -L${deb_builddir}$(GLOB_LIBDIR) + GLOB_DEP = $(GLOB_LIBRARY) + + GLOB_SOURCE = $(GLOB_LIBSRC)/glob.c $(GLOB_LIBSRC)/fnmatch.c \ +@@ -231,7 +231,7 @@ + + TILDE_LIB = -ltilde + TILDE_LIBRARY = $(TILDE_LIBDIR)/libtilde.a +-TILDE_LDFLAGS = -L$(TILDE_LIBDIR) ++TILDE_LDFLAGS = -L${deb_builddir}$(TILDE_LIBDIR) + TILDE_DEP = $(TILDE_LIBRARY) + + TILDE_SOURCE = $(TILDE_LIBSRC)/tilde.c $(TILDE_LIBSRC)/tilde.h +@@ -253,7 +253,7 @@ + + MALLOC_LIB = -lmalloc + MALLOC_LIBRARY = $(ALLOC_LIBDIR)/libmalloc.a +-MALLOC_LDFLAGS = -L$(ALLOC_LIBDIR) ++MALLOC_LDFLAGS = -L${deb_builddir}$(ALLOC_LIBDIR) + MALLOC_DEP = $(MALLOC_LIBRARY) + + ALLOC_HEADERS = $(ALLOC_LIBSRC)/getpagesize.h +@@ -358,7 +358,7 @@ + + BUILTINS_LIBRARY = $(DEFDIR)/libbuiltins.a + BUILTINS_LIB = -lbuiltins +-BUILTINS_LDFLAGS = -L$(DEFDIR) ++BUILTINS_LDFLAGS = -L${deb_builddir}$(DEFDIR) + BUILTINS_DEP = $(BUILTINS_LIBRARY) + + # Documentation for the shell. +@@ -441,12 +441,12 @@ + $(READLINE_LIBRARY): config.h $(READLINE_SOURCE) + @echo making $@ in ${RL_LIBDIR} + @( { test "${RL_LIBDIR}" = "${libdir}" && exit 0; } || \ +- cd ${RL_LIBDIR} && $(MAKE) $(MFLAGS) libreadline.a) || exit 1 ++ cd ${RL_LIBDIR} && $(MAKE) $(MFLAGS) all) || exit 1 + + $(HISTORY_LIBRARY): config.h $(HISTORY_SOURCE) + @echo making $@ in ${HIST_LIBDIR} + @( { test "${HIST_LIBDIR}" = "${libdir}" && exit 0; } || \ +- cd ${HIST_LIBDIR} && $(MAKE) $(MFLAGS) libhistory.a) || exit 1 ++ cd ${HIST_LIBDIR} && $(MAKE) $(MFLAGS) all) || exit 1 + + $(GLOB_LIBRARY): config.h $(GLOB_SOURCE) + @echo making $@ in ${GLOB_LIBDIR} --- bash-2.03.orig/debian/patches/mailcheck.dpatch +++ bash-2.03/debian/patches/mailcheck.dpatch @@ -0,0 +1,192 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: From: Miquel van Smoorenburg +# DP: A patch that adds support for Maildir type mailboxes. + +--- ./mailcheck.c.orig Wed Feb 4 21:30:33 1998 ++++ ./mailcheck.c Sun Nov 14 15:35:07 1999 +@@ -21,8 +21,10 @@ + #include "config.h" + + #include ++#include + #include "bashtypes.h" + #include "posixstat.h" ++#include "posixdir.h" + #ifndef _MINIX + # include + #endif +@@ -37,6 +39,8 @@ + #include "mailcheck.h" + #include + ++#include "mailstat.c" ++ + #ifndef NOW + #define NOW ((time_t)time ((time_t *)0)) + #endif +@@ -131,7 +135,7 @@ + struct stat finfo; + + file = mailfiles[i]->name; +- if (stat (file, &finfo) == 0) ++ if (mailstat (file, &finfo) == 0) + { + mailfiles[i]->access_time = finfo.st_atime; + mailfiles[i]->mod_time = finfo.st_mtime; +@@ -155,7 +159,7 @@ + i = find_mail_file (filename); + if (i >= 0) + { +- if (stat (filename, &finfo) == 0) ++ if (mailstat (filename, &finfo) == 0) + { + mailfiles[i]->mod_time = finfo.st_mtime; + mailfiles[i]->access_time = finfo.st_atime; +@@ -221,7 +225,7 @@ + file = mailfiles[i]->name; + mtime = mailfiles[i]->mod_time; + +- if ((stat (file, &finfo) == 0) && (finfo.st_size > 0)) ++ if ((mailstat (file, &finfo) == 0) && (finfo.st_size > 0)) + return (mtime != finfo.st_mtime); + + return (0); +@@ -239,7 +243,7 @@ + file = mailfiles[i]->name; + atime = mailfiles[i]->access_time; + +- if ((stat (file, &finfo) == 0) && (finfo.st_size > 0)) ++ if ((mailstat (file, &finfo) == 0) && (finfo.st_size > 0)) + return (atime != finfo.st_atime); + + return (0); +@@ -257,7 +261,7 @@ + file = mailfiles[i]->name; + size = mailfiles[i]->file_size; + +- return ((stat (file, &finfo) == 0) && (finfo.st_size > size)); ++ return ((mailstat (file, &finfo) == 0) && (finfo.st_size > size)); + } + + /* Take an element from $MAILPATH and return the portion from + + +diff -ruN bash-2.01.1.b4/mailstat.c bash-2.01.1/mailstat.c +--- bash-2.01.1.b4/mailstat.c Thu Jan 1 01:00:00 1970 ++++ bash-2.01.1/mailstat.c Wed Jun 2 12:05:04 1999 +@@ -0,0 +1,98 @@ ++/* ++ * Stat a file. If it's a maildir, check all messages ++ * in the maildir and present the grand total as a file. ++ * The fields in the 'struct stat' are from the mail directory. ++ * The following fields are emulated: ++ * ++ * st_nlink always 1 ++ * st_size total number of bytes in all files ++ * st_blocks total number of messages ++ * st_atime access time of newest file in maildir ++ * st_mtime modify time of newest file in maildir ++ * st_mode S_IFDIR changed to S_IFREG ++ * ++ * This is good enough for most mail-checking applications. ++ */ ++int ++mailstat(char *path, struct stat *st) ++{ ++ DIR *dd; ++ struct dirent *fn; ++ struct stat st_ret, st_tmp; ++ static struct stat st_new_last, st_ret_last; ++ char dir[PATH_MAX * 2]; ++ char file[PATH_MAX * 2]; ++ int i, l; ++ time_t atime = 0, mtime = 0; ++ ++ /* First see if it's a directory. */ ++ if ((i = stat(path, st)) != 0 || !S_ISDIR(st->st_mode)) ++ return i; ++ if (strlen(path) > sizeof(dir) - 5) { ++ errno = ENAMETOOLONG; ++ return -1; ++ } ++ ++ st_ret = *st; ++ st_ret.st_nlink = 1; ++ st_ret.st_size = 0; ++ st_ret.st_blocks = 0; ++ st_ret.st_mode &= ~S_IFDIR; ++ st_ret.st_mode |= S_IFREG; ++ ++ /* See if cur/ is present */ ++ sprintf(dir, "%s/cur", path); ++ if (stat(dir, &st_tmp) || !S_ISDIR(st_tmp.st_mode)) return 0; ++ st_ret.st_atime = st_tmp.st_atime; ++ ++ /* See if tmp/ is present */ ++ sprintf(dir, "%s/tmp", path); ++ if (stat(dir, &st_tmp) || !S_ISDIR(st_tmp.st_mode)) return 0; ++ st_ret.st_mtime = st_tmp.st_mtime; ++ ++ /* And new/ */ ++ sprintf(dir, "%s/new", path); ++ if (stat(dir, &st_tmp) || !S_ISDIR(st_tmp.st_mode)) return 0; ++ st_ret.st_mtime = st_tmp.st_mtime; ++ ++ /* Optimization - if new/ didn't change, nothing else did. */ ++ if (st_tmp.st_dev == st_new_last.st_dev && ++ st_tmp.st_ino == st_new_last.st_ino && ++ st_tmp.st_atime == st_new_last.st_atime && ++ st_tmp.st_mtime == st_new_last.st_mtime) { ++ *st = st_ret_last; ++ return 0; ++ } ++ st_new_last = st_tmp; ++ ++ /* Loop over new/ and cur/ */ ++ for (i = 0; i < 2; i++) { ++ sprintf(dir, "%s/%s", path, i ? "cur" : "new"); ++ sprintf(file, "%s/", dir); ++ l = strlen(file); ++ if ((dd = opendir(dir)) == NULL) ++ return 0; ++ while ((fn = readdir(dd)) != NULL) { ++ if (fn->d_name[0] == '.' || ++ strlen(fn->d_name) + l >= sizeof(file)) ++ continue; ++ strcpy(file + l, fn->d_name); ++ if (stat(file, &st_tmp) != 0) ++ continue; ++ st_ret.st_size += st_tmp.st_size; ++ st_ret.st_blocks++; ++ if (st_tmp.st_atime != st_tmp.st_mtime && ++ st_tmp.st_atime > atime) ++ atime = st_tmp.st_atime; ++ if (st_tmp.st_mtime > mtime) ++ mtime = st_tmp.st_mtime; ++ } ++ closedir(dd); ++ } ++ ++ if (atime) st_ret.st_atime = atime; ++ if (mtime) st_ret.st_mtime = mtime; ++ ++ *st = st_ret_last = st_ret; ++ return 0; ++} + --- bash-2.03.orig/debian/patches/builtin-echo.dpatch +++ bash-2.03/debian/patches/builtin-echo.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: XXX patch for builtin echo + +--- bash-2.02.1.orig/builtins/echo.def ++++ bash-2.02.1/builtins/echo.def +@@ -163,5 +163,10 @@ + if (display_return) + putchar ('\n'); + fflush (stdout); ++ if (ferror(stdout)) ++ { ++ clearerr(stdout); ++ return (EXECUTION_FAILURE); ++ } + return (EXECUTION_SUCCESS); + } + + --- bash-2.03.orig/debian/patches/rl-inputrc.dpatch +++ bash-2.03/debian/patches/rl-inputrc.dpatch @@ -0,0 +1,115 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Support for /etc/inputrc in addition to ~/inputrc + +--- ./lib/readline/doc/rluser.texinfo.orig Thu Dec 31 18:34:48 1998 ++++ ./lib/readline/doc/rluser.texinfo Thu Nov 11 20:46:24 1999 +@@ -288,7 +288,8 @@ + @ifclear BashFeatures + file is taken from the value of the environment variable @code{INPUTRC}. If + @end ifclear +-that variable is unset, the default is @file{~/.inputrc}. ++that variable is unset, Readline will read both @file{/etc/inputrc} and ++@file{~/.inputrc}. + + When a program which uses the Readline library starts up, the + init file is read, and the key bindings are set. + +--- ./doc/readline.3.orig Thu Dec 31 16:16:52 1998 ++++ ./doc/readline.3 Thu Nov 11 15:56:27 1999 +@@ -109,8 +109,8 @@ + file (the \fIinputrc\fP file). + The name of this file is taken from the value of the + .B INPUTRC +-environment variable. If that variable is unset, the default is +-.IR ~/.inputrc . ++environment variable. If that variable is unset, readline will read both ++.IR /etc/inputrc " and " ~/.inputrc . + When a program which uses the readline library starts up, the + init file is read, and the key bindings and variables are set. + There are only a few basic constructs allowed in the +@@ -1170,6 +1170,9 @@ + .TP + .FN ~/.inputrc + Individual \fBreadline\fP initialization file ++.TP ++.FN /etc/inputrc ++System \fBreadline\fP initialization file + .PD + .SH AUTHORS + Brian Fox, Free Software Foundation (primary author) + +--- ./lib/readline/bind.c.orig Tue Feb 2 19:26:20 1999 ++++ ./lib/readline/bind.c Thu Nov 11 20:46:24 1999 +@@ -628,6 +628,9 @@ + /* The last key bindings file read. */ + static char *last_readline_init_file = (char *)NULL; + ++/* Flag to read system init file */ ++static int read_system_init_file = 0; ++ + /* The file we're currently reading key bindings from. */ + static char *current_readline_init_file; + static int current_readline_init_include_level; +@@ -698,7 +701,7 @@ + to the first non-null filename from this list: + 1. the filename used for the previous call + 2. the value of the shell variable `INPUTRC' +- 3. ~/.inputrc ++ 3. /etc/inputrc and ~/.inputrc + If the file existed and could be opened and read, 0 is returned, + otherwise errno is returned. */ + int +@@ -709,14 +712,23 @@ + if (filename == 0) + { + filename = last_readline_init_file; +- if (filename == 0) ++ if (filename == 0) { + filename = get_env_value ("INPUTRC"); +- if (filename == 0) ++ read_system_init_file = 0; ++ } ++ if (filename == 0) { + filename = DEFAULT_INPUTRC; ++ read_system_init_file = 1; ++ } + } + +- if (*filename == 0) ++ if (*filename == 0) { + filename = DEFAULT_INPUTRC; ++ read_system_init_file = 1; ++ } ++ ++ if (read_system_init_file) ++ _rl_read_init_file (SYSTEM_INPUTRC, 0); + + return (_rl_read_init_file (filename, 0)); + } + +--- ./lib/readline/rlconf.h ++++ ./lib/readline/rlconf.h +@@ -43,6 +43,7 @@ + + /* The final, last-ditch effort file name for an init file. */ + #define DEFAULT_INPUTRC "~/.inputrc" ++#define SYSTEM_INPUTRC "/etc/inputrc" + + /* If defined, expand tabs to spaces. */ + #define DISPLAY_TABS --- bash-2.03.orig/debian/patches/deb-defpath.dpatch +++ bash-2.03/debian/patches/deb-defpath.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Set the default path to comply with Debian policy + +--- bash-2.02.1.orig/config-top.h ++++ bash-2.02.1/config-top.h +@@ -34,7 +34,7 @@ + /* The default value of the PATH variable. */ + #ifndef DEFAULT_PATH_VALUE + #define DEFAULT_PATH_VALUE \ +- "/usr/gnu/bin:/usr/local/bin:/usr/ucb:/bin:/usr/bin:." ++ "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + #endif + + /* The value for PATH when invoking `command -p'. This is only used when --- bash-2.03.orig/debian/patches/jobs-segfault.dpatch +++ bash-2.03/debian/patches/jobs-segfault.dpatch @@ -0,0 +1,54 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: + +Date: Sat, 27 Mar 1999 10:37:31 +0100 +From: =?iso-8859-1?Q?J=F6rgen_Tegn=E9r?= +To: submit@bugs.debian.org +Subject: Bash sometimes dumps core when 'jobs' is used +Mime-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Mailer: Mutt 0.91.2 + +Package: bash +Version: 2.01.1-3.1 + +Invoking jobs with an incorrect jobspec makes bash dump core in the +function describe_pid() due to a segmentation fault (according to gdb). +It does not happen if there is no active backgrounded jobs. +There is no error message. + +For example: +teg@burken /tmp # find / -name some_file_that_takes_time_to_find -print 2> /dev +/null & +teg@burken /tmp # jobs %25 + +After the jobs command and if there are not 25 active jobs, bash crashes and th +e login prompt is back. 25 is not a magic number, just an example. + +--- ./builtins/common.c~ Wed Feb 4 20:56:31 1998 ++++ ./builtins/common.c Fri Mar 26 23:21:28 1999 +@@ -462,6 +462,8 @@ + if (digit (*word) && all_digits (word)) + { + job = atoi (word); ++ if (job >= job_slots) ++ return NO_JOB; + return (job - 1); + } + --- bash-2.03.orig/debian/patches/examples.dpatch +++ bash-2.03/debian/patches/examples.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: document readline header location on Debian systems + +diff -u ./examples/loadables/README.orig ./examples/loadables/README +--- ./examples/loadables/README.orig Thu May 7 20:31:34 1998 ++++ ./examples/loadables/README Thu Nov 11 20:32:57 1999 +@@ -31,3 +31,6 @@ + the canonical example. There is no real `builtin writers' programming + guide'. The file template.c provides a template to use for creating + new loadable builtins. ++ ++On Debian GNU/Linux systems, the bash headers are in /usr/include/bash. ++The appropriate options are already set in the example Makefile. + --- bash-2.03.orig/debian/patches/rl-deb-build.dpatch +++ bash-2.03/debian/patches/rl-deb-build.dpatch @@ -0,0 +1,85 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Debian specific patches that allow libreadline to be built +# DP: as a static _and_ a shared library. + +--- ./lib/readline/Makefile.in~ Thu Feb 18 18:12:41 1999 ++++ ./lib/readline/Makefile.in Thu Nov 11 13:35:06 1999 +@@ -5,7 +5,8 @@ + ############################################################################# + + srcdir = @srcdir@ +-VPATH = .:@srcdir@ ++vpath %.c $(srcdir) ++vpath %.h $(srcdir) + topdir = @top_srcdir@ + BUILD_DIR = @BUILD_DIR@ + +@@ -32,12 +33,16 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + +-DEFS = @DEFS@ ++ifndef NOFPIC ++PICFLAGS = -fPIC ++endif ++ ++DEFS = @DEFS@ -D_REENTRANT + LOCAL_DEFS = @LOCAL_DEFS@ + + INCLUDES = -I. -I$(BUILD_DIR) -I$(topdir) -I$(topdir)/lib + +-CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(APP_CFLAGS) $(CPPFLAGS) ${INCLUDES} $(LOCAL_CFLAGS) $(CFLAGS) ++CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(APP_CFLAGS) $(CPPFLAGS) ${INCLUDES} $(LOCAL_CFLAGS) $(CFLAGS) $(PICFLAGS) + + .c.o: + ${RM} $@ +@@ -86,7 +91,22 @@ + + ########################################################################## + +-all: libreadline.a libhistory.a ++all: libreadline.so libhistory.so staticlibs ++ ++staticlibs: ++ test -d static || mkdir static ++ $(MAKE) -C static -f $(BUILD_DIR)/lib/readline/Makefile \ ++ srcdir=$(srcdir) NOFPIC=1 libreadline.a libhistory.a ++ ++libreadline.so: $(OBJECTS) ++ $(RM) -f $@ ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libreadline.so.$(SOVERSION) \ ++ -o libreadline.so $(OBJECTS) -lncurses ++ ++libhistory.so: history.o ++ $(RM) -f $@ ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libhistory.so.$(SOVERSION) \ ++ -o libhistory.so $(HISTOBJ) xmalloc.o + + libreadline.a: $(OBJECTS) + $(RM) $@ +@@ -117,7 +137,8 @@ + $(CTAGS) $(CSOURCES) $(HSOURCES) + + clean: force +- $(RM) $(OBJECTS) *.a ++ -$(RM) $(OBJECTS) *.a *.so ++ -$(RM) -r static + -( cd doc && $(MAKE) $(MFLAGS) $@ ) + + mostlyclean: clean --- bash-2.03.orig/debian/patches/rl-examples.dpatch +++ bash-2.03/debian/patches/rl-examples.dpatch @@ -0,0 +1,73 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Modified readline examples to properly build with Debian setup. + +--- ./lib/readline/examples/fileman.c.orig Wed Jan 29 18:03:11 1997 ++++ ./lib/readline/examples/fileman.c Thu Nov 11 20:31:41 1999 +@@ -5,7 +5,7 @@ + * Remove the next line if you're compiling this against an installed + * libreadline.a + */ +-#define READLINE_LIBRARY ++/* #define READLINE_LIBRARY */ + + #ifdef HAVE_CONFIG_H + #include + +--- ./lib/readline/examples/rl.c.orig Wed Jun 3 19:38:31 1998 ++++ ./lib/readline/examples/rl.c Thu Nov 11 20:31:41 1999 +@@ -17,9 +17,9 @@ + + #include + #include +-#include "posixstat.h" +-#include "readline.h" +-#include "history.h" ++#include ++#include ++#include + + extern int optind; + extern char *optarg; + +--- ./lib/readline/examples/rltest.c.orig Thu Aug 21 20:04:06 1997 ++++ ./lib/readline/examples/rltest.c Thu Nov 11 20:31:41 1999 +@@ -16,8 +16,8 @@ + + #include + #include +-#include "readline.h" +-#include "history.h" ++#include ++#include + + extern HIST_ENTRY **history_list (); + +--- ./lib/readline/examples/Makefile.orig Fri Nov 26 23:13:35 1999 ++++ ./lib/readline/examples/Makefile Fri Nov 26 23:15:19 1999 +@@ -1,8 +1,8 @@ + # This is the Makefile for the examples subdirectory of readline. -*- text -*- + # + EXECUTABLES = fileman rltest rl +-CFLAGS = -g -I../.. -I.. +-LDFLAGS = -g -L.. ++CFLAGS = -g ++LDFLAGS = -g + + .c.o: + $(CC) $(CFLAGS) -c $< --- bash-2.03.orig/debian/patches/rl-2.0-compat.dpatch +++ bash-2.03/debian/patches/rl-2.0-compat.dpatch @@ -0,0 +1,61 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: + +--- bash-2.02.1.orig/lib/readline/readline.c ++++ bash-2.02.1/lib/readline/readline.c +@@ -179,6 +179,11 @@ + + extern char *xmalloc (), *xrealloc (); + ++/* for backwards compatibility with version 2.0 */ ++int (*char_is_quoted_hook)() = 0; ++char *(*double_quote_hook)() = 0; ++char *rl_vi_comment_begin = 0; ++ + /* **************************************************************** */ + /* */ + /* Line editing input utility */ + +--- bash-2.02.1.orig/lib/readline/history.c ++++ bash-2.02.1/lib/readline/history.c +@@ -88,6 +88,13 @@ + /* The logical `base' of the history array. It defaults to 1. */ + int history_base = 1; + ++/* turn on shell mode */ ++int history_shell = 0; ++char* (*history_get_string_value_hook)() = 0; ++ ++/* for backwards compatibility with 2.0 */ ++char* (*single_quote_hook)(); ++ + /* Return the current HISTORY_STATE of the history. */ + HISTORY_STATE * + history_get_history_state () +@@ -125,6 +132,9 @@ + using_history () + { + history_offset = history_length; ++ if (! history_get_string_value_hook) ++ history_shell = 0; /* so won't try to call with older ++ versions of bash */ + } + + /* Return the number of bytes that the primary history entries are using. + --- bash-2.03.orig/debian/patches/rl-del-backspace-policy.dpatch +++ bash-2.03/debian/patches/rl-del-backspace-policy.dpatch @@ -0,0 +1,63 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Patches to handle Debian Backspace/Delete keyboard policy ??? + +--- ./lib/readline/terminal.c~ ++++ ./lib/readline/terminal.c +@@ -138,7 +138,10 @@ + static char *term_ks, *term_ke; + + /* The key sequences sent by the Home and End keys, if any. */ +-static char *term_kh, *term_kH; ++static char *term_kh, *term_kend; ++ ++/* The key sequence sent by the Delete key, if any. */ ++static char *term_kD; + + /* Variables that hold the screen dimensions, used by the display code. */ + int screenwidth, screenheight, screenchars; +@@ -252,7 +255,8 @@ + "im", &term_im, + "kd", &term_kd, + "kh", &term_kh, /* home */ +- "kH", &term_kH, /* end */ ++ "@7", &term_kend, /* end */ ++ "kD", &term_kD, /* delete */ + "kl", &term_kl, + "kr", &term_kr, + "ku", &term_ku, +@@ -388,7 +392,8 @@ + _rl_bind_if_unbound (term_kl, rl_backward); + + _rl_bind_if_unbound (term_kh, rl_beg_of_line); /* Home */ +- _rl_bind_if_unbound (term_kH, rl_end_of_line); /* End */ ++ _rl_bind_if_unbound (term_kend, rl_end_of_line); /* End */ ++ _rl_bind_if_unbound (term_kD, rl_delete); /* Delete */ + + #if defined (VI_MODE) + _rl_keymap = vi_movement_keymap; +@@ -398,7 +403,8 @@ + _rl_bind_if_unbound (term_kl, rl_backward); + + _rl_bind_if_unbound (term_kh, rl_beg_of_line); /* Home */ +- _rl_bind_if_unbound (term_kH, rl_end_of_line); /* End */ ++ _rl_bind_if_unbound (term_kend, rl_end_of_line); /* End */ ++ _rl_bind_if_unbound (term_kD, rl_delete); /* Delete */ + #endif /* VI_MODE */ + + _rl_keymap = xkeymap; --- bash-2.03.orig/debian/patches/rl-not-applied.dpatch +++ bash-2.03/debian/patches/rl-not-applied.dpatch @@ -0,0 +1,144 @@ +#! /bin/sh -e + +echo "PATCHES WHICH ARE REPLACED UPSTREAM" +exit 1 + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +--- bash-2.02.1.orig/lib/readline/tilde.c ++++ bash-2.02.1/lib/readline/tilde.c +@@ -47,9 +47,7 @@ + + #include "tilde.h" + +-#ifdef SHELL + #include "shell.h" +-#endif + + #if !defined (HAVE_GETPW_DECLS) + extern struct passwd *getpwuid (), *getpwnam (); +@@ -111,6 +109,8 @@ + `:' and `=~'. */ + char **tilde_additional_suffixes = default_suffixes; + ++extern int rl_shell; ++ + /* Find the start of a tilde expansion in STRING, and return the index of + the tilde which starts the expansion. Place the length of the text + which identified this tilde starter in LEN, excluding the tilde itself. */ +@@ -171,14 +171,7 @@ + return (i); + } + +-#if !defined (SHELL) +-static char * +-get_string_value (varname) +- char *varname; +-{ +- return ((char *)getenv (varname)); +-} +-#endif ++extern char *get_env_value (); + + /* Return a new string which is the result of tilde expanding STRING. */ + char * +@@ -287,21 +280,13 @@ + static char * + get_home_dir () + { +- char *home_dir; +- +-#ifdef SHELL +- home_dir = (char *)NULL; +- if (current_user.home_dir == 0) +- get_current_user_info (); +- home_dir = current_user.home_dir; +-#else ++ /* this function will work whether rl_shell is set or not */ ++ char *home_dir = "/"; + struct passwd *entry; + +- home_dir = (char *)NULL; + entry = getpwuid (getuid ()); + if (entry) + home_dir = entry->pw_dir; +-#endif + return (home_dir); + } + +@@ -328,7 +313,7 @@ + if (filename[1] == '\0' || filename[1] == '/') + { + /* Prefix $HOME to the rest of the string. */ +- expansion = get_string_value ("HOME"); ++ expansion = get_env_value ("HOME"); + + /* If there is no HOME variable, look up the directory in + the password database. */ + +--- bash-2.02.1.orig/lib/readline/readline.c ++++ bash-2.02.1/lib/readline/readline.c +@@ -179,6 +179,9 @@ + + extern char *xmalloc (), *xrealloc (); + ++void (*set_lines_and_columns_hook)() = 0; ++char* (*rl_get_string_value_hook)() = 0; ++ + /* **************************************************************** */ + /* */ + /* Line editing input utility */ +@@ -704,6 +713,11 @@ + static void + readline_initialize_everything () + { ++ /* turn off rl_shell if not all the hooks were set (for older Debian ++ bash's) */ ++ if (!set_lines_and_columns_hook || !rl_get_string_value_hook) ++ rl_shell = 0; ++ + #if defined (__EMX__) + if (environ == 0) + _emx_build_environ (); + + +--- bash-2.02.1.orig/lib/readline/complete.c ++++ bash-2.02.1/lib/readline/complete.c +@@ -251,6 +251,8 @@ + /* If non-zero, inhibit completion (temporarily). */ + int rl_inhibit_completion; + ++extern int rl_shell; ++ + /* Variables local to this file. */ + + /* Local variable states what happened during the last completion attempt. */ +@@ -1026,11 +1028,10 @@ + rl_filename_quoting_desired; + + if (should_quote) +-#if defined (SHELL) +- should_quote = should_quote && (!qc || !*qc || *qc == '"' || *qc == '\''); +-#else /* !SHELL */ +- should_quote = should_quote && (!qc || !*qc); +-#endif /* !SHELL */ ++ should_quote = should_quote && ++ (rl_shell ? ++ (!qc || !*qc || *qc == '"' || *qc == '\'') : ++ (!qc || !*qc)); + + if (should_quote) + { --- bash-2.03.orig/debian/patches/rl-paren-matching.dpatch +++ bash-2.03/debian/patches/rl-paren-matching.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Turn on parens matching + +--- ./lib/readline/rlconf.h~ ++++ ./lib/readline/rlconf.h +@@ -32,7 +32,7 @@ + + /* If defined, readline shows opening parens and braces when closing + paren or brace entered. */ +-/* #define PAREN_MATCHING */ ++#define PAREN_MATCHING + + /* This definition is needed by readline.c, rltty.c, and signals.c. */ + /* If on, then readline handles signals in a way that doesn't screw. */ + --- bash-2.03.orig/debian/patches/manpages.dpatch +++ bash-2.03/debian/patches/manpages.dpatch @@ -0,0 +1,76 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: manpage tweaks for rbash(1) and builtins(1) + +diff -u ./doc/bash.1.orig ./doc/bash.1 +--- ./doc/bash.1.orig Wed Jan 20 22:48:04 1999 ++++ ./doc/bash.1 Thu Nov 11 15:58:20 1999 +@@ -10,6 +10,7 @@ + .\" + .\" bash_builtins, strip all but Built-Ins section + .if \n(zZ=1 .ig zZ ++.if \n(zY=1 .ig zY + .TH BASH 1 "1999 Jan 20" GNU + .\" + .\" There's some problem with having a `@' +@@ -7265,6 +7266,8 @@ + .\" bash_builtins + .if \n(zZ=1 .ig zZ + .SH "RESTRICTED SHELL" ++.\" start of rbash man ++.zY + .PP + If + .B bash +@@ -7334,6 +7337,8 @@ + .B rbash + turns off any restrictions in the shell spawned to execute the + script. ++.\" end of rbash man ++.if \n(zY=1 .ig zY + .SH "SEE ALSO" + .PD 0 + .TP +@@ -7451,3 +7456,4 @@ + .PP + Array variables may not (yet) be exported. + .zZ ++.zY +diff -u ./doc/builtins.1.orig ./doc/builtins.1 +--- ./doc/builtins.1.orig Fri Apr 12 17:20:01 1996 ++++ ./doc/builtins.1 Thu Nov 11 16:01:05 1999 +@@ -10,6 +10,6 @@ + ulimit, umask, unalias, unset, until, wait, while \- bash built-in commands, see \fBbash\fR(1) + .SH BASH BUILTIN COMMANDS + .nr zZ 1 +-.so bash.1 ++.so /usr/share/man/man1/bash.1 + .SH SEE ALSO + bash(1), sh(1) +diff -u ./doc/rbash.1.orig ./doc/rbash.1 +--- ./doc/rbash.1.orig Thu Nov 11 15:56:27 1999 ++++ ./doc/rbash.1 Thu Nov 11 16:00:35 1999 +@@ -0,0 +1,8 @@ ++.TH RBASH 1 "1996 March 20" GNU ++.SH NAME ++rbash \- restricted bash, see \fBbash\fR(1) ++.SH RESTRICTED SHELL ++.nr zY 1 ++.so /usr/share/man/man1/bash.1 ++.SH SEE ALSO ++bash(1) --- bash-2.03.orig/debian/patches/rl-shell-unknown-bug.dpatch +++ bash-2.03/debian/patches/rl-shell-unknown-bug.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Fix what ??? + +--- bash-2.02.1.orig/lib/readline/shell.c ++++ bash-2.02.1/lib/readline/shell.c +@@ -70,7 +70,7 @@ + register int c; + char *result, *r, *s; + +- result = (char *)xmalloc (3 + (3 * strlen (string))); ++ result = (char *)xmalloc (3 + (4 * strlen (string))); + r = result; + *r++ = '\''; + + --- bash-2.03.orig/debian/patches/privmode.dpatch +++ bash-2.03/debian/patches/privmode.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: XXX missing description +# DP: +# DP: Comment from Chet Ramey : +# DP: +# DP: Nope. This will allow setuid scripts if not called as `sh' and not +# DP: called with the -p option. I won't install this. + + +--- bash-2.02.1.orig/shell.c ++++ bash-2.02.1/shell.c +@@ -378,7 +378,7 @@ + if (dump_translatable_strings) + read_but_dont_execute = 1; + +- if (running_setuid && privileged_mode == 0) ++ if (running_setuid && privileged_mode == 0 && act_like_sh == 0) + disable_priv_mode (); + + /* Need to get the argument to a -c option processed in the --- bash-2.03.orig/debian/patches/random.dpatch +++ bash-2.03/debian/patches/random.dpatch @@ -0,0 +1,73 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: use the system random functions + +--- bash-2.02.1.orig/variables.c ++++ bash-2.02.1/variables.c +@@ -906,6 +906,7 @@ + return (var); + } + ++#if 0 + /* The random number seed. You can change this by setting RANDOM. */ + static unsigned long rseed = 1; + static unsigned long last_random_value; +@@ -931,6 +932,22 @@ + last_random_value = 0; + } + ++#else ++ ++static int ++brand () ++{ ++ return random(); ++} ++ ++static void ++sbrand (int seed) ++{ ++ srandom(seed); ++} ++ ++#endif ++ + static SHELL_VAR * + assign_random (self, value) + SHELL_VAR *self; +@@ -947,6 +964,7 @@ + int rv; + char *p; + ++#if 0 + /* Reset for command and process substitution. */ + if (subshell_environment) + sbrand (rseed + (int)(getpid() + NOW)); +@@ -956,6 +974,12 @@ + while (rv == (int)last_random_value); + + last_random_value = rv; ++#else ++ if (subshell_environment) ++ sbrand ((int)(getpid() + NOW)); ++ rv = brand(); ++#endif ++ + p = itos ((int)rv); + + FREE (var->value); --- bash-2.03.orig/debian/patches/various.dpatch +++ bash-2.03/debian/patches/various.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: a header include change + +--- bash-2.02.1.orig/general.h ++++ bash-2.02.1/general.h +@@ -21,6 +21,7 @@ + #if !defined (_GENERAL_H_) + #define _GENERAL_H_ + ++#include + #include "stdc.h" + + #include "bashtypes.h" --- bash-2.03.orig/debian/patches/tempnam.dpatch +++ bash-2.03/debian/patches/tempnam.dpatch @@ -0,0 +1,218 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: use tempnam function to generate names for temporary file. +# DP: + +--- ./builtins/fc.def.orig Wed Feb 17 20:46:30 1999 ++++ ./builtins/fc.def Thu Nov 11 20:25:33 1999 +@@ -161,7 +161,7 @@ + REPL *rlist, *rl; + char *ename, *command, *newcom, *line; + HIST_ENTRY **hlist; +- char fn[64]; ++ char *fn = 0; + + numbering = 1; + reverse = listing = execute = 0; +@@ -326,15 +326,29 @@ + stream = stdout; + else + { ++ int fd; + numbering = 0; +- /* XXX - this is raceable */ +- sprintf (fn, "/tmp/bash%d", (int)time ((time_t *) 0) + (int)getpid ()); ++ fn = tempnam(0, "bash"); ++ if (!fn) ++ { ++ builtin_error ("unable to generate a unique filename"); ++ return (EXECUTION_FAILURE); ++ } ++ ++ fd = open (fn, O_CREAT | O_EXCL | O_WRONLY, 0600); ++ if (fd < 0) ++ { ++ builtin_error ("cannot open temp file %s", fn); ++ free (fn); ++ return (EXECUTION_FAILURE); ++ } + +- stream = fopen (fn, "w"); ++ stream = fdopen (fd, "w"); + + if (stream == 0) + { + builtin_error ("cannot open temp file %s", fn); ++ free (fn); + return (EXECUTION_FAILURE); + } + } +@@ -350,7 +364,10 @@ + } + + if (listing) ++ { ++ free (fn); + return (EXECUTION_SUCCESS); ++ } + + fclose (stream); + +@@ -369,6 +386,10 @@ + if (retval != EXECUTION_SUCCESS) + { + unlink (fn); ++ free (fn); ++#ifdef DEBFIX ++ free (command); ++#endif + return (EXECUTION_FAILURE); + } + +@@ -389,6 +410,10 @@ + + run_unwind_frame ("fc builtin"); + ++ free (fn); ++#ifdef DEBFIX ++ free (command); ++#endif + return (retval); + } + +--- bash-2.02.1.orig/support/bashbug.sh ++++ bash-2.02.1/support/bashbug.sh +@@ -21,7 +21,7 @@ + PATH=/bin:/usr/bin:/usr/local/bin:$PATH + export PATH + +-TEMP=/tmp/bbug.$$ ++TEMP=$(tempfile --prefix bbug --mode 600) || exit 1 + + # Figure out how to echo a string without a trailing newline + N=`echo 'hi there\c'` + +--- bash-2.02.1.orig/subst.c ++++ bash-2.02.1/subst.c +@@ -2749,8 +2749,8 @@ + { + char *tname; + +- tname = mktemp (savestring ("/tmp/sh-np-XXXXXX")); +- if (mkfifo (tname, 0600) < 0) ++ tname = tempnam(0, "sh-np"); ++ if (!tname || mkfifo (tname, 0600) < 0) + { + free (tname); + return ((char *)NULL); + +# DP: From: Topi Miettinen +# DP: Subject: bash doesn't use $TMPDIR [PATCH] +# DP: Date: Tue, 13 Apr 1999 00:10:16 +0300 +# DP: +# DP: $ ls -ld /tmp +# DP: ls: /tmp: No such file or directory +# DP: $ bash -c 'echo <word) + r = write_here_document (fd, redirectee); + +- close (fd); + if (r) + { ++ close (fd); + unlink (filename); + errno = r; + return (-1); + } + +- /* XXX - this is raceable */ ++ /* To avoid races we close the first fd after opening the second. */ + /* Make the document really temporary. Also make it the input. */ +- fd = open (filename, O_RDONLY, 0600); ++ fd2 = open (filename, O_RDONLY, 0600); + +- if (fd < 0) ++ if (fd2 < 0) + { + r = errno; + unlink (filename); ++ close(fd); + errno = r; + return -1; + } + ++ close (fd); + if (unlink (filename) < 0) + { + r = errno; +- close (fd); ++ close (fd2); + errno = r; + return (-1); + } + +- return (fd); ++ return (fd2); + } + + /* Open FILENAME with FLAGS in noclobber mode, hopefully avoiding most + --- bash-2.03.orig/debian/patches/todo.dpatch +++ bash-2.03/debian/patches/todo.dpatch @@ -0,0 +1,84 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: XXX patches which need inspection + +XXX why apply this one? + +--- bash-2.02.1.orig/builtins/common.c ++++ bash-2.02.1/builtins/common.c +@@ -716,6 +716,7 @@ + /* */ + /* **************************************************************** */ + ++#if !defined (READLINE) + /* Return a new string which is the single-quoted version of STRING. + Used by alias and trap, among others. */ + char * +@@ -746,6 +747,7 @@ + + return (result); + } ++#endif /* !READLINE */ + + /* Quote STRING using double quotes. Return a new string. */ + char * + +--- bash-2.02.1.orig/Makefile.in ++++ bash-2.02.1/Makefile.in +@@ -262,7 +262,7 @@ + BASHPOSIX_SUPPORT = $(BASHPOSIX_LIB)/posixstat.h $(BASHPOSIX_LIB)/ansi_stdlib.h \ + $(BASHPOSIX_LIB)/memalloc.h $(BASHPOSIX_LIB)/stdc.h + +-LIBRARIES = $(READLINE_LIB) $(HISTORY_LIB) $(TERMCAP_LIB) $(GLOB_LIB) \ ++LIBRARIES = $(READLINE_LIB) $(TERMCAP_LIB) $(GLOB_LIB) \ + $(TILDE_LIB) $(MALLOC_LIB) $(SHLIB_LIB) $(LOCAL_LIBS) + + LIBDEP = $(READLINE_DEP) $(TERMCAP_DEP) $(GLOB_DEP) $(HISTORY_DEP) \ + +--- bash-2.02.1.orig/bashline.c ++++ bash-2.02.1/bashline.c +@@ -154,6 +154,13 @@ + #define COMPLETE_BSQUOTE 3 + static int completion_quoting_style = COMPLETE_BSQUOTE; + ++/* bash mode for readline and history */ ++extern int rl_shell; ++extern int history_shell; ++extern void (*set_lines_and_columns_hook)(); ++extern char* (*rl_get_string_value_hook)(); ++extern char* (*history_get_string_value_hook)(); ++ + /* Change the readline VI-mode keymaps into or out of Posix.2 compliance. + Called when the shell is put into or out of `posix' mode. */ + void +@@ -191,6 +198,15 @@ + { + if (bash_readline_initialized) + return; ++ ++ /* Turn on special modes for bash. This is normally a compile-time ++ check, but was turned into a run-time check to make bash work ++ well with a dynamically linked libreadline2 under Debian ++ GNU/Linux. */ ++ set_lines_and_columns_hook = set_lines_and_columns; ++ history_get_string_value_hook = rl_get_string_value_hook = get_string_value; ++ rl_shell = 1; ++ history_shell = 1; + + rl_terminal_name = get_string_value ("TERM"); + rl_instream = stdin; --- bash-2.03.orig/debian/patches/rl-todo.dpatch +++ bash-2.03/debian/patches/rl-todo.dpatch @@ -0,0 +1,332 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: readline patches which need inspection + +--- bash-2.02.1.orig/lib/readline/histfile.c ++++ bash-2.02.1/lib/readline/histfile.c +@@ -73,7 +73,7 @@ + #include "histlib.h" + + /* Functions imported from shell.c */ +-extern char *get_env_value (); ++extern char *history_get_env_value (); + + extern char *xmalloc (), *xrealloc (); + +@@ -92,7 +92,7 @@ + if (return_val) + return (return_val); + +- home = get_env_value ("HOME"); ++ home = history_get_env_value ("HOME"); + + if (home == 0) + { +--- bash-2.02.1.orig/lib/readline/terminal.c ++++ bash-2.02.1/lib/readline/terminal.c +@@ -74,7 +74,7 @@ + extern void _rl_bind_if_unbound (); + + /* Functions imported from shell.c */ +-extern void set_lines_and_columns (); ++extern void rl_set_lines_and_columns (); + extern char *get_env_value (); + + /* **************************************************************** */ +@@ -211,7 +214,7 @@ + /* If we're being compiled as part of bash, set the environment + variables $LINES and $COLUMNS to new values. Otherwise, just + do a pair of putenv () or setenv () calls. */ +- set_lines_and_columns (screenheight, screenwidth); ++ rl_set_lines_and_columns (screenheight, screenwidth); + + if (!_rl_term_autowrap) + screenwidth--; +--- bash-2.02.1.orig/lib/readline/rltty.c ++++ bash-2.02.1/lib/readline/rltty.c +@@ -37,9 +37,9 @@ + + #include "rldefs.h" + +-#if !defined (SHELL) && defined (GWINSZ_IN_SYS_IOCTL) ++#if defined (GWINSZ_IN_SYS_IOCTL) + # include +-#endif /* !SHELL && GWINSZ_IN_SYS_IOCTL */ ++#endif /* GWINSZ_IN_SYS_IOCTL */ + + #include "rltty.h" + #include "readline.h" +@@ -53,6 +53,8 @@ + + extern int _rl_enable_keypad, _rl_enable_meta; + ++extern int rl_shell; ++ + extern void _rl_control_keypad (); + + #if defined (__GO32__) +@@ -144,7 +146,7 @@ + static int ksrflow; + #endif + +-#if !defined (SHELL) && defined (TIOCGWINSZ) ++#if defined (TIOCGWINSZ) + /* Dummy call to force a backgrounded readline to stop before it tries + to get the tty settings. */ + static void +@@ -153,12 +155,10 @@ + { + struct winsize w; + +- if (ioctl (tty, TIOCGWINSZ, &w) == 0) ++ if (!rl_shell && ioctl (tty, TIOCGWINSZ, &w) == 0) + (void) ioctl (tty, TIOCSWINSZ, &w); + } +-#else /* SHELL || !TIOCGWINSZ */ +-# define set_winsize(tty) +-#endif /* SHELL || !TIOCGWINSZ */ ++#endif /* TIOCGWINSZ */ + + #if defined (NEW_TTY_DRIVER) + +--- bash-2.02.1.orig/lib/readline/display.c ++++ bash-2.02.1/lib/readline/display.c +@@ -307,6 +307,20 @@ + } + } + ++static void ++_rl_extend_buffers (int max_size) ++{ ++ if (max_size >= line_size) ++ { ++ while (max_size >= line_size) ++ { ++ line_size *= 2; ++ } ++ visible_line = xrealloc (visible_line, line_size); ++ invisible_line = xrealloc (invisible_line, line_size); ++ } ++} ++ + /* Basic redisplay algorithm. */ + void + rl_redisplay () +@@ -373,6 +387,8 @@ + + if (local_len > 0) + { ++ _rl_extend_buffers(out + local_len); ++ line = invisible_line; + strncpy (line + out, local_prompt, local_len); + out += local_len; + } +@@ -399,6 +415,8 @@ + } + + pmtlen = strlen (prompt_this_line); ++ _rl_extend_buffers(out + pmtlen); ++ line = invisible_line; + strncpy (line + out, prompt_this_line, pmtlen); + out += pmtlen; + line[out] = '\0'; +@@ -440,13 +458,8 @@ + { + c = (unsigned char)rl_line_buffer[in]; + +- if (out + 8 >= line_size) /* XXX - 8 for \t */ +- { +- line_size *= 2; +- visible_line = xrealloc (visible_line, line_size); +- invisible_line = xrealloc (invisible_line, line_size); +- line = invisible_line; +- } ++ _rl_extend_buffers(out + 8); /* XXX - 8 for \t */ ++ line = invisible_line; + + if (in == rl_point) + { +--- bash-2.02.1.orig/lib/readline/signals.c ++++ bash-2.02.1/lib/readline/signals.c +@@ -61,6 +61,8 @@ + extern void _rl_init_argument (); + extern void rl_deprep_terminal (), rl_prep_terminal (); + ++extern int rl_shell; ++ + #if !defined (RETSIGTYPE) + # if defined (VOID_SIGHANDLER) + # define RETSIGTYPE void +@@ -87,13 +89,9 @@ + /* */ + /* **************************************************************** */ + +-/* If we're not being compiled as part of bash, initialize handlers for +- and catch the job control signals (SIGTTIN, SIGTTOU, SIGTSTP) and +- SIGTERM. */ +-#if !defined (SHELL) ++/* always on, but we only handle it when rl_shell == 0 */ + # define HANDLE_JOB_SIGNALS + # define HANDLE_SIGTERM +-#endif /* !SHELL */ + + #if defined (HAVE_POSIX_SIGNALS) + typedef struct sigaction sighandler_cxt; +@@ -106,11 +104,11 @@ + static sighandler_cxt old_int, old_alrm; + + #if defined (HANDLE_JOB_SIGNALS) +-static sighandler_cxt old_tstp, old_ttou, old_ttin; ++static sighandler_cxt rl_old_tstp, rl_old_ttou, rl_old_ttin; + #endif /* HANDLE_JOB_SIGNALS */ + + #if defined (HANDLE_SIGTERM) +-static sighandler_cxt old_term; ++static sighandler_cxt rl_old_term; + #endif + + #if defined (SIGWINCH) +@@ -289,19 +287,20 @@ + rl_sigaction (SIGALRM, &old_alrm, &dummy); + #endif /* HAVE_POSIX_SIGNALS */ + ++ if (!rl_shell) { + #if defined (HANDLE_JOB_SIGNALS) + + #if defined (SIGTSTP) +- oh = rl_set_sighandler (SIGTSTP, rl_signal_handler, &old_tstp); ++ oh = rl_set_sighandler (SIGTSTP, rl_signal_handler, &rl_old_tstp); + if (oh == (SigHandler *)SIG_IGN) +- rl_sigaction (SIGTSTP, &old_tstp, &dummy); ++ rl_sigaction (SIGTSTP, &rl_old_tstp, &dummy); + #else + oh = (SigHandler *)NULL; + #endif /* SIGTSTP */ + + #if defined (SIGTTOU) +- rl_set_sighandler (SIGTTOU, rl_signal_handler, &old_ttou); +- rl_set_sighandler (SIGTTIN, rl_signal_handler, &old_ttin); ++ rl_set_sighandler (SIGTTOU, rl_signal_handler, &rl_old_ttou); ++ rl_set_sighandler (SIGTTIN, rl_signal_handler, &rl_old_ttin); + + if (oh == (SigHandler *)SIG_IGN) + { +@@ -314,8 +313,9 @@ + + #if defined (HANDLE_SIGTERM) + /* Handle SIGTERM if we're not being compiled as part of bash. */ +- rl_set_sighandler (SIGTERM, rl_signal_handler, &old_term); ++ rl_set_sighandler (SIGTERM, rl_signal_handler, &rl_old_term); + #endif /* HANDLE_SIGTERM */ ++ } /* if (!rl_shell) */ + + #if defined (SIGWINCH) + rl_set_sighandler (SIGWINCH, rl_handle_sigwinch, &old_winch); +@@ -336,22 +336,24 @@ + rl_sigaction (SIGINT, &old_int, &dummy); + rl_sigaction (SIGALRM, &old_alrm, &dummy); + ++ if (!rl_shell) { + #if defined (HANDLE_JOB_SIGNALS) + + #if defined (SIGTSTP) +- rl_sigaction (SIGTSTP, &old_tstp, &dummy); ++ rl_sigaction (SIGTSTP, &rl_old_tstp, &dummy); + #endif + + #if defined (SIGTTOU) +- rl_sigaction (SIGTTOU, &old_ttou, &dummy); +- rl_sigaction (SIGTTIN, &old_ttin, &dummy); ++ rl_sigaction (SIGTTOU, &rl_old_ttou, &dummy); ++ rl_sigaction (SIGTTIN, &rl_old_ttin, &dummy); + #endif /* SIGTTOU */ + + #endif /* HANDLE_JOB_SIGNALS */ + + #if defined (HANDLE_SIGTERM) +- rl_sigaction (SIGTERM, &old_term, &dummy); ++ rl_sigaction (SIGTERM, &rl_old_term, &dummy); + #endif /* HANDLE_SIGTERM */ ++ } /* if (!rl_shell) */ + + #if defined (SIGWINCH) + sigemptyset (&dummy.sa_mask); +--- bash-2.02.1.orig/lib/readline/shell.c ++++ bash-2.02.1/lib/readline/shell.c +@@ -47,7 +47,7 @@ + + extern char *xmalloc (), *xrealloc (); + +-#if !defined (SHELL) ++extern int history_shell; + + #ifdef savestring + #undef savestring +@@ -95,7 +95,7 @@ + /* Set the environment variables LINES and COLUMNS to lines and cols, + respectively. */ + void +-set_lines_and_columns (lines, cols) ++rl_set_lines_and_columns (lines, cols) + int lines, cols; + { + char *b; +@@ -119,20 +119,13 @@ + #endif /* !HAVE_PUTENV */ + } + +-char * +-get_env_value (varname) +- char *varname; +-{ +- return ((char *)getenv (varname)); +-} +- +-#else /* SHELL */ +-extern char *get_string_value (); ++extern char* (*history_get_string_value_hook)(); + + char * +-get_env_value (varname) ++history_get_env_value (varname) + char *varname; + { +- return get_string_value (varname); +-} +-#endif /* SHELL */ ++ return (history_shell ? ++ (history_get_string_value_hook)(varname) : ++ ((char *)getenv (varname))); ++} +--- bash-2.02.1.orig/lib/readline/shellrl.c ++++ bash-2.02.1/lib/readline/shellrl.c +@@ -0,0 +1,13 @@ ++#include ++ ++extern int rl_shell; ++extern char* (*rl_get_string_value_hook)(); ++ ++char * ++get_env_value (varname) ++ char *varname; ++{ ++ return (rl_shell ? ++ (rl_get_string_value_hook)(varname) : ++ ((char *)getenv (varname))); ++} + --- bash-2.03.orig/patch-stamp +++ bash-2.03/patch-stamp @@ -0,0 +1,101 @@ + +Patches applied in this version: + +builtin-echo: + XXX patch for builtin echo + +bashbug-editor: + use EDITOR environment variable or else the editor command. + +conf-update: + Updated config.{guess,sub} from /usr/share/automake. + +deb-build: + Debian specific patches that allow libreadline to be built + as a static _and_ a shared library. + +deb-defpath: + Set the default path to comply with Debian policy + +dont-report-sigpipe: + Define DONT_REPORT_SIGPIPE: We don't want to see `Broken pipe' messages + when a job like `cat jobs.c | exit 1' is executed. Fixes part of #7047, + #10259, #10433 and #10494. Comment from the upstream author: "The default + bash behavior with respect to the exit status of a pipeline will not + change. Changing it as suggested in the discussion of #10494 would render + bash incompatible with every other shell out there.". + +examples: + document readline header location on Debian systems + +jobs-segfault: + + +mailcheck: + From: Miquel van Smoorenburg + A patch that adds support for Maildir type mailboxes. + +manpages: + manpage tweaks for rbash(1) and builtins(1) + +man-vx-opts: + document -v / -x options + +privmode: + XXX missing description + + Comment from Chet Ramey : + + Nope. This will allow setuid scripts if not called as `sh' and not + called with the -p option. I won't install this. + +random: + use the system random functions + +system-bashrc: + Enable System-wide .bashrc file for interactive shells. + Enable System-wide .bash_logout file for interactive shells. + +tempnam: + use tempnam function to generate names for temporary file. + + From: Topi Miettinen + Subject: bash doesn't use $TMPDIR [PATCH] + Date: Tue, 13 Apr 1999 00:10:16 +0300 + + $ ls -ld /tmp + ls: /tmp: No such file or directory + $ bash -c 'echo < + build bash without using guessable file names in /tmp. --- bash-2.03.orig/_distribution +++ bash-2.03/_distribution @@ -0,0 +1 @@ +2.03 --- bash-2.03.orig/_patchlevel +++ bash-2.03/_patchlevel @@ -0,0 +1 @@ +0