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	2019-01-02 15:14:30.000000000 +0100
+++ doc/bash.1	2019-01-07 20:08:18.484696000 +0100
@@ -122,6 +122,12 @@
 when invoking an interactive shell or when reading input
 through a pipe.
 .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.

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

This adds the OpenPKG packaging brand.

Index: version.c
--- version.c.orig	2019-01-02 15:39:37.000000000 +0100
+++ version.c	2019-01-07 20:08:18.484964000 +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	2018-05-25 14:47:09.000000000 +0200
+++ Makefile.in	2019-01-07 20:08:18.485395000 +0100
@@ -775,7 +775,6 @@
 
 # comment out for distribution
 $(srcdir)/configure:	$(srcdir)/configure.ac $(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	2018-07-12 22:51:23.000000000 +0200
+++ builtins/common.c	2019-01-07 20:08:18.485639000 +0100
@@ -569,10 +569,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	2018-12-08 17:15:54.000000000 +0100
+++ externs.h	2019-01-07 20:08:18.485852000 +0100
@@ -25,6 +25,7 @@
 #  define _EXTERNS_H_
 
 #include "stdc.h"
+#include <stdio.h>
 
 /* Functions from expr.c. */
 #define EXP_EXPANDED	0x01

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

Fix building with disabled NLS.

Index: locale.c
--- locale.c.orig	2020-02-24 21:08:43.000000000 +0100
+++ locale.c	2022-01-01 12:13:02.457102000 +0100
@@ -91,7 +91,7 @@
 #if defined (HANDLE_MULTIBYTE)
   locale_shiftstates = mblen ((char *)NULL, 0);
 #else
-  local_shiftstates = 0;
+  locale_shiftstates = 0;
 #endif
 }
 
@@ -117,7 +117,7 @@
 #    if defined (HANDLE_MULTIBYTE)
       locale_shiftstates = mblen ((char *)NULL, 0);
 #    else
-      local_shiftstates = 0;
+      locale_shiftstates = 0;
 #    endif
 
       u32reset ();
@@ -226,7 +226,7 @@
 #  if defined (HANDLE_MULTIBYTE)
       locale_shiftstates = mblen ((char *)NULL, 0);
 #  else
-      local_shiftstates = 0;
+      locale_shiftstates = 0;
 #  endif
       u32reset ();
       return r;
@@ -250,7 +250,7 @@
 #if defined (HANDLE_MULTIBYTE)
 	  locale_shiftstates = mblen ((char *)NULL, 0);
 #else
-	  local_shiftstates = 0;
+	  locale_shiftstates = 0;
 #endif
 	  u32reset ();
 	}
@@ -391,7 +391,7 @@
 #  if defined (HANDLE_MULTIBYTE)
   locale_shiftstates = mblen ((char *)NULL, 0);
 #  else
-  local_shiftstates = 0;
+  locale_shiftstates = 0;
 #  endif
   u32reset ();
 #endif

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

Fix static/non-static conflict.

Index: lib/glob/glob.c
--- lib/glob/glob.c.orig	2020-10-30 19:49:00.000000000 +0100
+++ lib/glob/glob.c	2022-01-01 12:18:32.796180000 +0100
@@ -122,7 +122,7 @@
 #else
 #  define dequote_pathname udequote_pathname
 #endif
-static void dequote_pathname PARAMS((char *));
+void dequote_pathname PARAMS((char *));
 static int glob_testdir PARAMS((char *, int));
 static char **glob_dir_to_array PARAMS((char *, char **, int));
 
@@ -496,7 +496,7 @@
   free (orig_wpathname);
 }
 
-static void
+void
 dequote_pathname (pathname)
      char *pathname;
 {