%n bash %v 1.14.7 %c * %l * %b * %d * %f * %t bash-1.14.7.tgz %w Gnu %% %setup patch -u -p1 <<'ENDPATCH' diff -ru2N bash-1.14.7/Makefile bash-MCC/Makefile --- bash-1.14.7/Makefile Sun Jun 11 19:41:48 1995 +++ bash-MCC/Makefile Sat Aug 31 07:43:53 1996 @@ -11,7 +11,7 @@ # Include some boilerplate Gnu makefile definitions. -prefix = /usr/local +prefix = /usr exec_prefix = $(prefix) -bindir = $(exec_prefix)/bin +bindir = /bin srcdir = . VPATH = $(srcdir) diff -ru2N bash-1.14.7/config.h bash-MCC/config.h --- bash-1.14.7/config.h Sun Feb 26 05:51:59 1995 +++ bash-MCC/config.h Sat Aug 31 07:43:53 1996 @@ -91,13 +91,13 @@ /* The default value of the PATH variable. */ #define DEFAULT_PATH_VALUE \ - "/usr/gnu/bin:/usr/local/bin:/usr/ucb:/bin:/usr/bin:." + "/usr/local/bin:/opt/bin:/usr/bin/X11:/bin:/usr/bin:." /* The value for PATH when invoking `command -p'. This is only used when the Posix.2 confstr () function, or CS_PATH define are not present. */ #define STANDARD_UTILS_PATH \ - "/bin:/usr/bin:/usr/ucb:/usr/sbin:/sbin:/etc:/usr/etc:/usr/lib" + "/bin:/usr/bin:/usr/bin/X11:/opt/bin:/sbin:/usr/sbin:/opt/sbin" /* Put system-specific default mail directories here. */ -#if defined (__bsdi__) || defined (__FreeBSD__) || defined (__NetBSD__) +#if defined (__bsdi__) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__linux__) # define DEFAULT_MAIL_PATH "/var/mail/" #endif @@ -145,9 +145,9 @@ restricted by being run with the name "rbash", or by setting the -r flag. */ -/* #define RESTRICTED_SHELL */ +#define RESTRICTED_SHELL /* Define DISABLED_BUILTINS if you want "builtin foo" to always run the shell builtin "foo", even if it has been disabled with "enable -n foo". */ -/* #define DISABLED_BUILTINS */ +#define DISABLED_BUILTINS /* Define PROCESS_SUBSTITUTION if you want the K*rn shell-like process @@ -177,5 +177,5 @@ /* Default primary and secondary prompt strings. */ -#define PPROMPT "bash\\$ " +#define PPROMPT "\\$ " #define SPROMPT "> " diff -ru2N bash-1.14.7/cpp-Makefile bash-MCC/cpp-Makefile --- bash-1.14.7/cpp-Makefile Sun Jun 11 19:44:05 1995 +++ bash-MCC/cpp-Makefile Sat Aug 31 07:43:53 1996 @@ -65,9 +65,9 @@ /* Include some boilerplate Gnu makefile definitions. */ -prefix = /usr/local +prefix = /usr exec_prefix = $(prefix) bindir = $(exec_prefix)/bin -libdir = $(exec_prefix)/lib +libdir = /lib manroot = $(prefix)/man @@ -152,5 +152,5 @@ INSTALL = $(SUPPORT_SRC)install.sh -INSTALL_PROGRAM = $(INSTALL) -c +INSTALL_PROGRAM = install -s -m 555 INSTALL_DATA = $(INSTALL) -c -m 644 @@ -301,5 +301,5 @@ /**/# other information besides optimization and debugging might be /**/# passed to cc. A different name should have been used. -CFLAGS = -O -g +CFLAGS = -O6 -fomit-frame-pointer SYSTEM_FLAGS = $(LINEBUF) $(VPRINTF) $(UNISTD) $(STDLIB) $(LIMITSH) \ @@ -415,5 +415,5 @@ you simply have the library and header files installed, then undefine HAVE_READLINE_SOURCE. */ -#define HAVE_READLINE_SOURCE +#undef HAVE_READLINE_SOURCE #if defined (HAVE_READLINE_SOURCE) @@ -477,5 +477,5 @@ the library and header files installed, then you can undefine HAVE_HISTORY_SOURCE. */ -#define HAVE_HISTORY_SOURCE +#undef HAVE_HISTORY_SOURCE #if defined (READLINE) && !defined (HISTORY) @@ -1011,5 +1011,5 @@ .NOEXPORT: -.made: $(Program) bashbug +.made: $(Program) cp .machine .made @@ -1441,8 +1441,4 @@ fi $(INSTALL_PROGRAM) $(Program) $(bindir)/$(Program) - -if [ -f $(bindir)/bashbug ]; \ - then mv $(bindir)/bashbug $(bindir)/bashbug.old; \ - fi - $(INSTALL_PROGRAM) bashbug $(bindir)/bashbug ( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) mandir=$(mandir) \ man3dir=$(man3dir) infodir=$(infodir) $@ ) diff -ru2N bash-1.14.7/documentation/Makefile bash-MCC/documentation/Makefile --- bash-1.14.7/documentation/Makefile Sun Jun 11 19:45:55 1995 +++ bash-MCC/documentation/Makefile Sat Aug 31 07:43:54 1996 @@ -3,5 +3,5 @@ RM = rm -f -INSTALL_DATA = ../support/install.sh -c -m 644 +INSTALL_DATA = install -m 444 # unused @@ -50,5 +50,5 @@ ${NROFF} -man $< > $@ -all: ps info dvi text +all: text ps: bash.ps readline.ps article.ps @@ -97,5 +97,5 @@ $(INSTALL_DATA) bash.1 $(mandir) $(INSTALL_DATA) readline.3 $(man3dir) - $(INSTALL_DATA) features.info $(infodir)/bash.info + gzip -9f /usr/man/man1/bash.1 /usr/man/man3/readline.3 uninstall: diff -ru2N bash-1.14.7/machines.h bash-MCC/machines.h --- bash-1.14.7/machines.h Mon Dec 18 19:13:22 1995 +++ bash-MCC/machines.h Sat Aug 31 07:43:54 1996 @@ -881,4 +881,6 @@ # if !defined (done386) && (defined (__linux__) || defined (linux)) # define done386 +# define HAVE_STRCASECMP +# define USE_TERMCAP_EMULATION # define M_MACHINE "i386" # define M_OS "Linux" diff -ru2N bash-1.14.7/parse.y bash-MCC/parse.y --- bash-1.14.7/parse.y Mon Aug 26 16:15:55 1996 +++ bash-MCC/parse.y Sun Oct 13 04:05:03 1996 @@ -802,5 +802,5 @@ #if defined (READLINE) char *current_readline_prompt = (char *)NULL; -char *current_readline_line = (char *)NULL; +unsigned char *current_readline_line = (unsigned char *)NULL; int current_readline_line_index = 0; diff -ru2N bash-1.14.7/shell.c bash-MCC/shell.c --- bash-1.14.7/shell.c Thu Apr 6 21:45:00 1995 +++ bash-MCC/shell.c Sat Aug 31 07:43:54 1996 @@ -248,4 +248,6 @@ int top_level_arg_index, read_from_stdin; FILE *default_input; + extern int libreadline_shell; + libreadline_shell = 1; /* There is a bug in the NeXT 2.1 rlogind that causes opens ENDPATCH make * make install * ln -f /bin/sh /tmp/sh.old * rm -f /bin/sh * ln -f /bin/bash /bin/sh * rm -f /bin/bash.old /tmp/sh.old * rmdir /usr/info %%