🚀 go-pugleaf

>	gnu.bash.bug $B$K0JA0$3$&$$$&$b$N$,N.$l$F$$$^$7$?!#(B
	
	$BA0$N5-;v$K=q$$$?$h$&$K$3$N(Bpatch$B$O$A$g$C$H2u$l$F$$$k$H$3$m$,(B
	$B$"$k$N$G!"D>$7$?$b$N$rEj9F$7$^$9!#(B

	% patch -p1 < THIS-PATCH

	$B$G$G$-$k$H;W$$$^$9!#(B

	$B$"!"$?$V$s!"(Bcygnus$B$N(Bgcc for solaris2.0$B$,I,MW$G$9!#(B
-----------
ss@astec.co.jp/Sakashita SHIU
ASTEC,Inc./BR Ichigaya 6 Minami-cho Shinjuku-ku Tokyo 162 JAPAN
TEL 03-5261-5971/FAX 03-5261-5978
	
########################################################
diff -c -r bash-1.12/Makefile bash-1.12-solaris2/Makefile
*** bash-1.12/Makefile	Sun Jan 19 04:43:12 1992
--- bash-1.12-solaris2/Makefile	Wed Nov  4 18:39:26 1992
***************
*** 10,25 ****
  #
  # If you haven't read README, now might be a good time.
  
! DESTDIR = /usr/gnu/bin
  MAKE    = make
  RM      = rm -f
  SHELL   = /bin/sh
! GAWK     = awk
  # GAWK     = gawk
  
  CPPNAME = /lib/cpp
! CPP     = $(CPPNAME) `$(CPPMAGIC) $(GETCPPSYMS) $(CPPNAME)` -P
! # CPP     = $(CC) -E
  
  CPP_MAKEFILE = cpp-Makefile
  
--- 10,25 ----
  #
  # If you haven't read README, now might be a good time.
  
! DESTDIR = /usr/local/bin
  MAKE    = make
  RM      = rm -f
  SHELL   = /bin/sh
! GAWK     = nawk
  # GAWK     = gawk
  
  CPPNAME = /lib/cpp
! #CPP     = $(CPPNAME) `$(CPPMAGIC) $(GETCPPSYMS) $(CPPNAME)` -P
! CPP     = $(CC) -E
  
  CPP_MAKEFILE = cpp-Makefile
  
Common subdirectories: bash-1.12/builtins and bash-1.12-solaris2/builtins
diff -c -r bash-1.12/cpp-Makefile bash-1.12-solaris2/cpp-Makefile
*** bash-1.12/cpp-Makefile	Sun Jan 26 11:16:31 1992
--- bash-1.12-solaris2/cpp-Makefile	Wed Nov  4 18:43:40 1992
***************
*** 91,97 ****
  #    if defined (isc386)
  CC = gcc -traditional -posix -I/usr/include $(GCC_EXTRAS)
  #    else
! CC = gcc -traditional -I/usr/include $(GCC_EXTRAS)
  #    endif /* isc386 */
  #  else /* HAVE_FIXED_INCLUDES */
  #    if defined (isc386)
--- 91,97 ----
  #    if defined (isc386)
  CC = gcc -traditional -posix -I/usr/include $(GCC_EXTRAS)
  #    else
! CC = gcc $(GCC_EXTRAS)
  #    endif /* isc386 */
  #  else /* HAVE_FIXED_INCLUDES */
  #    if defined (isc386)
***************
*** 648,655 ****
  
  version.o:	version.h version.c
  
! shell.o:	shell.h flags.h shell.c posixstat.h filecntl.h endian.h \
! 		parser.h
  		$(CC) $(CFG_FLAGS) $(CFLAGS) $(CPPFLAGS) -c shell.c
  
  endian.h:	endian.aux
--- 648,654 ----
  
  version.o:	version.h version.c
  
! shell.o:	shell.h flags.h shell.c posixstat.h filecntl.h endian.h parser.h
  		$(CC) $(CFG_FLAGS) $(CFLAGS) $(CPPFLAGS) -c shell.c
  
  endian.h:	endian.aux
***************
*** 811,817 ****
  /**/# directory to hold the results of compilatation.  The directory is
  /**/# named MACHINE-OS.
  architecture: $(MACHINE)-$(OS)/$(PROGRAM)
! 
  $(MACHINE)-$(OS):
  	-mkdir $(MACHINE)-$(OS)
  
--- 810,816 ----
  /**/# directory to hold the results of compilatation.  The directory is
  /**/# named MACHINE-OS.
  architecture: $(MACHINE)-$(OS)/$(PROGRAM)
! #if 0
  $(MACHINE)-$(OS):
  	-mkdir $(MACHINE)-$(OS)
  
***************
*** 820,822 ****
--- 819,822 ----
  	mv sysdefs.h $(MACHINE)-$(OS)
  	mv $(SDIR)getcppsyms $(MACHINE)-$(OS)
  	$(MAKE) $(MFLAGS) clean
+ #endif  /* 0 */
Common subdirectories: bash-1.12/documentation and bash-1.12-solaris2/documentation
Common subdirectories: bash-1.12/examples and bash-1.12-solaris2/examples
diff -c -r bash-1.12/jobs.c bash-1.12-solaris2/jobs.c
*** bash-1.12/jobs.c	Sat Jan 18 06:36:11 1992
--- bash-1.12-solaris2/jobs.c	Wed Nov  4 18:37:05 1992
***************
*** 104,110 ****
--- 104,116 ----
  extern int errno;
  extern int interactive, asynchronous_notification;
  extern char *shell_name;
+ 
+ #if defined(__svr4__) && defined(sun)
+ #define sys_siglist _sys_siglist
+ #else
  extern char *sys_siglist[];
+ #endif
+ 
  
  /* The array of known jobs. */
  JOB **jobs = (JOB **)NULL;
Common subdirectories: bash-1.12/lib and bash-1.12-solaris2/lib
diff -c -r bash-1.12/machines.h bash-1.12-solaris2/machines.h
*** bash-1.12/machines.h	Sat Jan 18 06:42:24 1992
--- bash-1.12-solaris2/machines.h	Wed Nov  4 18:37:06 1992
***************
*** 58,64 ****
  /* We aren't currently using GNU Malloc on Suns because of a bug in Sun's
     YP which bites us when Sun free ()'s an already free ()'ed address.
     When Sun fixes their YP, we can start using our winning malloc again. */
! #  undef USE_GNU_MALLOC
  
  /* Most Sun systems have signal handler functions that are void. */
  #  define VOID_SIGHANDLER
--- 58,66 ----
  /* We aren't currently using GNU Malloc on Suns because of a bug in Sun's
     YP which bites us when Sun free ()'s an already free ()'ed address.
     When Sun fixes their YP, we can start using our winning malloc again. */
! #  ifndef __svr4__
! #    undef USE_GNU_MALLOC
! #  endif
  
  /* Most Sun systems have signal handler functions that are void. */
  #  define VOID_SIGHANDLER
***************
*** 75,88 ****
  #  if defined (i386)
  #    define Sun386i
  #  endif
! #if defined (HAVE_SHARED_LIBS)
! #  define M_OS SunOS4
! #  define SunOS4_SYSDEP_CFLAGS -DBSD_GETPGRP
  #else
! #  if !defined (sparc)
! #     undef VOID_SIGHANDLER
  #  endif
! #  define M_OS SunOS3
  #endif
  #endif /* sun */
  
--- 77,96 ----
  #  if defined (i386)
  #    define Sun386i
  #  endif
! 
! #if defined (__svr4__)
! #  define M_OS Solaris
  #else
! #  if defined (HAVE_SHARED_LIBS)
! #    define M_OS SunOS4
! #    define SunOS4_SYSDEP_CFLAGS -DBSD_GETPGRP
! #  else
! #    if !defined (sparc)
! #       undef VOID_SIGHANDLER
! #    endif
! #    define M_OS SunOS3
  #  endif
! 
  #endif
  #endif /* sun */
  
***************
*** 91,97 ****
  /*	    Sun2	    */
  /*			    */
  /* ************************ */
! #if defined (sun2)
  #define M_MACHINE "sun2"
  #define HAVE_SYS_SIGLIST
  #define HAVE_SETLINEBUF
--- 99,105 ----
  /*	    Sun2	    */
  /*			    */
  /* ************************ */
! #if defined (sun2)		/* SunOS only */
  #define M_MACHINE "sun2"
  #define HAVE_SYS_SIGLIST
  #define HAVE_SETLINEBUF
***************
*** 104,110 ****
  /*	    Sun3	    */
  /*			    */
  /* ************************ */
! #if defined (sun3)
  #define M_MACHINE "sun3"
  #if defined (SunOS4_SYSDEP_CFLAGS)
  #  define SYSDEP_CFLAGS SunOS4_SYSDEP_CFLAGS
--- 112,118 ----
  /*	    Sun3	    */
  /*			    */
  /* ************************ */
! #if defined (sun3)		/* SunOS only */
  #define M_MACHINE "sun3"
  #if defined (SunOS4_SYSDEP_CFLAGS)
  #  define SYSDEP_CFLAGS SunOS4_SYSDEP_CFLAGS
***************
*** 122,134 ****
  /* ************************ */
  #if defined (sun4)
  #define M_MACHINE "sparc"
! #if defined (SunOS4_SYSDEP_CFLAGS)
! #  define SYSDEP_CFLAGS SunOS4_SYSDEP_CFLAGS
! #endif /* SunOS4 */
! #define HAVE_SYS_SIGLIST
! #define HAVE_SETLINEBUF
! #define HAVE_VFPRINTF
! #define HAVE_GETGROUPS
  #endif /* sparc */
  
  /* ************************ */
--- 130,153 ----
  /* ************************ */
  #if defined (sun4)
  #define M_MACHINE "sparc"
! 
! #if defined (__svr4__)		/* do the Solaris thing */
! #  define HAVE_SYS_SIGLIST
! #  define HAVE_VFPRINTF
! #  define VOID_SIGNAL_HANDLER
! #  define HAVE_GETGROUPS
! #  define SYSDEP_CFLAGS -DUSG -DUSGr4 -D_POSIX_VERSION -D_POSIX_JOB_CONTROL
! #  undef HAVE_GETWD
! #else                           /* do the SunOS thing*/
! #  if defined (SunOS4_SYSDEP_CFLAGS)
! #    define SYSDEP_CFLAGS SunOS4_SYSDEP_CFLAGS
! #  endif /* SunOS4 */
! #  define HAVE_SYS_SIGLIST
! #  define HAVE_SETLINEBUF
! #  define HAVE_VFPRINTF
! #  define HAVE_GETGROUPS
! #endif
! 
  #endif /* sparc */
  
  /* ************************ */
diff -c -r bash-1.12/shell.c bash-1.12-solaris2/shell.c
*** bash-1.12/shell.c	Tue Jan 21 14:52:37 1992
--- bash-1.12-solaris2/shell.c	Wed Nov  4 18:37:06 1992
***************
*** 31,38 ****
    Initial author: Brian Fox
  */
  
- #include <stdio.h>
  #include <sys/types.h>
  #include <signal.h>
  #include <errno.h>
  #include <sys/file.h>
--- 31,38 ----
    Initial author: Brian Fox
  */
  
  #include <sys/types.h>
+ #include <stdio.h>
  #include <signal.h>
  #include <errno.h>
  #include <sys/file.h>
Common subdirectories: bash-1.12/support and bash-1.12-solaris2/support
Common subdirectories: bash-1.12/test-suite and bash-1.12-solaris2/test-suite
diff -c -r bash-1.12/builtins/Makefile bash-1.12-solaris2/builtins/Makefile
*** bash-1.12/builtins/Makefile	Fri Nov  8 04:46:32 1991
--- bash-1.12-solaris2/builtins/Makefile	Wed Nov  4 18:41:04 1992
***************
*** 53,59 ****
  
  libbuiltins.a: $(MKBUILTINS) $(OFILES)
  	$(RM) $@
! 	$(AR) clq $@ $(OFILES)
  	-if [ -f "$(RANLIB)" ]; then $(RANLIB) $@; fi
  
  builtext.h builtins.c: $(MKBUILTINS) $(DEFS)
--- 53,59 ----
  
  libbuiltins.a: $(MKBUILTINS) $(OFILES)
  	$(RM) $@
! 	$(AR) cq $@ $(OFILES)
  	-if [ -f "$(RANLIB)" ]; then $(RANLIB) $@; fi
  
  builtext.h builtins.c: $(MKBUILTINS) $(DEFS)
Common subdirectories: bash-1.12/examples/functions and bash-1.12-solaris2/examples/functions
Common subdirectories: bash-1.12/examples/scripts and bash-1.12-solaris2/examples/scripts
Common subdirectories: bash-1.12/examples/startup-files and bash-1.12-solaris2/examples/startup-files
Common subdirectories: bash-1.12/lib/glob and bash-1.12-solaris2/lib/glob
Common subdirectories: bash-1.12/lib/malloc and bash-1.12-solaris2/lib/malloc
Common subdirectories: bash-1.12/lib/readline and bash-1.12-solaris2/lib/readline
diff -c -r bash-1.12/lib/glob/Makefile bash-1.12-solaris2/lib/glob/Makefile
*** bash-1.12/lib/glob/Makefile	Sun Nov 17 07:29:42 1991
--- bash-1.12-solaris2/lib/glob/Makefile	Wed Nov  4 18:40:44 1992
***************
*** 12,18 ****
  
  libglob.a: $(OBJECTS)
  	$(RM) -f $@
! 	$(AR) clq $@ $(OBJECTS)
  	-if [ -f "$(RANLIB)" ]; then $(RANLIB) $@; fi
  
  tilde-test: tilde.c
--- 12,18 ----
  
  libglob.a: $(OBJECTS)
  	$(RM) -f $@
! 	$(AR) cq $@ $(OBJECTS)
  	-if [ -f "$(RANLIB)" ]; then $(RANLIB) $@; fi
  
  tilde-test: tilde.c
diff -c -r bash-1.12/lib/malloc/malloc.c bash-1.12-solaris2/lib/malloc/malloc.c
*** bash-1.12/lib/malloc/malloc.c	Thu Oct 31 03:31:08 1991
--- bash-1.12-solaris2/lib/malloc/malloc.c	Wed Nov  4 18:39:25 1992
***************
*** 675,681 ****
    return aligned;
  }
  
! #if !(defined (HPUX) || defined (Multimax) || defined (Multimax32k))
  /* This runs into trouble with getpagesize on HPUX, and Multimax machines.
     Patching out seems cleaner than the ugly fix needed.  */
  char *
--- 675,681 ----
    return aligned;
  }
  
! #if !(defined(__svr4__) || defined (HPUX) || defined (Multimax) || defined (Multimax32k))
  /* This runs into trouble with getpagesize on HPUX, and Multimax machines.
     Patching out seems cleaner than the ugly fix needed.  */
  char *
Only in bash-1.12-solaris2/lib/malloc: xmalloc.o
diff -c -r bash-1.12/lib/readline/Makefile bash-1.12-solaris2/lib/readline/Makefile
*** bash-1.12/lib/readline/Makefile	Mon Nov  4 03:45:05 1991
--- bash-1.12-solaris2/lib/readline/Makefile	Wed Nov  4 18:40:35 1992
***************
*** 76,82 ****
  
  libreadline.a:	$(OBJECTS)
  	$(RM) -f $@
! 	$(AR) clq $@ $(OBJECTS)
  	-if [ -f "$(RANLIB)" ]; then $(RANLIB) libreadline.a; fi
  
  readline: readline.h chardefs.h $(OBJECTS)
--- 76,82 ----
  
  libreadline.a:	$(OBJECTS)
  	$(RM) -f $@
! 	$(AR) cq $@ $(OBJECTS)
  	-if [ -f "$(RANLIB)" ]; then $(RANLIB) libreadline.a; fi
  
  readline: readline.h chardefs.h $(OBJECTS)
Common subdirectories: bash-1.12/lib/readline/doc and bash-1.12-solaris2/lib/readline/doc
Common subdirectories: bash-1.12/lib/readline/examples and bash-1.12-solaris2/lib/readline/examples


-- 
-----------
ss@astec.co.jp/Sakashita SHIU
ASTEC,Inc./BR Ichigaya 6 Minami-cho Shinjuku-ku Tokyo 162 JAPAN
TEL 03-5261-5971/FAX 03-5261-5978