openpkg-packages/bash/bash.patch

This patch documents two implemented and classical command
line options "-v" and "-x". It is derived from Debian GNU/Linux.

Index: doc/bash.1
--- doc/bash.1.orig	2009-12-30 19:01:31 +0100
+++ doc/bash.1	2010-01-01 10:43:41 +0100
@@ -115,6 +115,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 output.

-----------------------------------------------------------------------------

Port to HP-UX 11i and similar less smart platforms.

Index: configure
--- configure.orig	2009-12-29 14:34:51 +0100
+++ configure	2010-01-01 10:43:41 +0100
@@ -2204,6 +2204,7 @@
 *-beos*)	opt_bash_malloc=no ;;	# they say it's suitable
 *-cygwin*)	opt_bash_malloc=no ;;	# Cygnus's CYGWIN environment
 *-opennt*|*-interix*)	opt_bash_malloc=no ;;	# Interix, now owned by Microsoft
+*-hpux*)	opt_bash_malloc=no ;;	# HP HP-UX
 esac
 
 # memory scrambling on free()
@@ -2351,7 +2352,7 @@
 
 else
 	MALLOC_LIB=
-	MALLOC_LIBRARY=
+	MALLOC_LIBRARY=dummy
 	MALLOC_LDFLAGS=
 	MALLOC_DEP=
 fi
Index: syntax.h
--- syntax.h.orig	2009-01-04 20:32:42 +0100
+++ syntax.h	2010-01-01 10:43:41 +0100
@@ -21,6 +21,8 @@
 #ifndef _SYNTAX_H_
 #define _SYNTAX_H_
 
+#include "config.h"
+
 /* Defines for use by mksyntax.c */
 
 #define slashify_in_quotes "\\`$\"\n"

-----------------------------------------------------------------------------

This adds the OpenPKG packaging brand.

Index: version.c
--- version.c.orig	2009-01-04 20:32:46 +0100
+++ version.c	2010-01-01 10:43:41 +0100
@@ -83,7 +83,7 @@
 show_shell_version (extended)
      int extended;
 {
-  printf (_("GNU bash, version %s (%s)\n"), shell_version_string (), MACHTYPE);
+  printf (_("GNU bash, version %s (%s) [@l_openpkg_release@]\n"), shell_version_string (), MACHTYPE);
   if (extended)
     {
       printf ("%s\n", _(bash_copyright));

-----------------------------------------------------------------------------

Ensure that Autoconf and friends are not run.

Index: Makefile.in
--- Makefile.in.orig	2009-12-30 19:05:40 +0100
+++ Makefile.in	2010-01-01 10:43:41 +0100
@@ -708,7 +708,6 @@
 
 # comment out for distribution
 $(srcdir)/configure:	$(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
-	cd $(srcdir) && autoconf
 
 # for chet
 reconfig: force

-----------------------------------------------------------------------------

Fix Bash getcwd(3) run-time issue seen on Solaris where size argument
of 0 does not malloc buffer as expected by Bash code.

Index: builtins/common.c
--- builtins/common.c.orig	2009-04-24 19:52:22 +0200
+++ builtins/common.c	2010-01-01 10:43:41 +0100
@@ -553,10 +553,11 @@
 
   if (the_current_working_directory == 0)
     {
+      char *t = xmalloc(PATH_MAX);
 #if defined (GETCWD_BROKEN)
-      the_current_working_directory = getcwd (0, PATH_MAX);
+      the_current_working_directory = getcwd (t, PATH_MAX);
 #else
-      the_current_working_directory = getcwd (0, 0);
+      the_current_working_directory = getcwd (t, PATH_MAX);
 #endif
       if (the_current_working_directory == 0)
 	{

-----------------------------------------------------------------------------

Fix building under Linux.

Index: externs.h
--- externs.h.orig	2009-12-22 21:56:47 +0100
+++ externs.h	2010-01-01 10:43:41 +0100
@@ -25,6 +25,7 @@
 #  define _EXTERNS_H_
 
 #include "stdc.h"
+#include <stdio.h>
 
 /* Functions from expr.c. */
 extern intmax_t evalexp __P((char *, int *));