openpkg/bash.patch@6b18bb69901e (annotated)
openpkg/bash.patch
Tue, 28 Aug 2012 18:36:35 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 28 Aug 2012 18:36:35 +0200
- changeset 579
- 6b18bb69901e
- parent 428
- f880f219c566
- permissions
- -rw-r--r--
Correct the paths of patched scripts, refine password generation,
mitigate fdatasync(2) detection problems, correct dependencies, remove
outdated autoconf components, correct conf file paths and attributes,
complete and correct log file rotation handing, and note warnings
useful for diagnosing builds.
| michael@13 | 1 | This patch documents two implemented and classical command |
| michael@13 | 2 | line options "-v" and "-x". It is derived from Debian GNU/Linux. |
| michael@13 | 3 | |
| michael@13 | 4 | Index: doc/bash.1 |
| michael@428 | 5 | --- doc/bash.1.orig 2011-01-16 21:31:39.000000000 +0100 |
| michael@428 | 6 | +++ doc/bash.1 2011-02-21 18:56:01.000000000 +0100 |
| michael@428 | 7 | @@ -117,6 +117,12 @@ |
| michael@13 | 8 | This option allows the positional parameters to be set |
| michael@13 | 9 | when invoking an interactive shell. |
| michael@13 | 10 | .TP |
| michael@13 | 11 | +.B \-v |
| michael@13 | 12 | +Print shell input lines as they are read. |
| michael@13 | 13 | +.TP |
| michael@13 | 14 | +.B \-x |
| michael@13 | 15 | +Print commands and their arguments as they are executed. |
| michael@13 | 16 | +.TP |
| michael@13 | 17 | .B \-D |
| michael@13 | 18 | A list of all double-quoted strings preceded by \fB$\fP |
| michael@333 | 19 | is printed on the standard output. |
| michael@13 | 20 | |
| michael@13 | 21 | ----------------------------------------------------------------------------- |
| michael@13 | 22 | |
| michael@13 | 23 | Port to HP-UX 11i and similar less smart platforms. |
| michael@13 | 24 | |
| michael@13 | 25 | Index: configure |
| michael@428 | 26 | --- configure.orig 2011-02-07 23:03:22.000000000 +0100 |
| michael@428 | 27 | +++ configure 2011-02-21 18:56:01.000000000 +0100 |
| michael@428 | 28 | @@ -2202,6 +2202,7 @@ |
| michael@13 | 29 | *-beos*) opt_bash_malloc=no ;; # they say it's suitable |
| michael@13 | 30 | *-cygwin*) opt_bash_malloc=no ;; # Cygnus's CYGWIN environment |
| michael@13 | 31 | *-opennt*|*-interix*) opt_bash_malloc=no ;; # Interix, now owned by Microsoft |
| michael@13 | 32 | +*-hpux*) opt_bash_malloc=no ;; # HP HP-UX |
| michael@13 | 33 | esac |
| michael@13 | 34 | |
| michael@13 | 35 | # memory scrambling on free() |
| michael@428 | 36 | @@ -2270,7 +2271,7 @@ |
| michael@13 | 37 | |
| michael@13 | 38 | else |
| michael@13 | 39 | MALLOC_LIB= |
| michael@13 | 40 | - MALLOC_LIBRARY= |
| michael@13 | 41 | + MALLOC_LIBRARY=dummy |
| michael@13 | 42 | MALLOC_LDFLAGS= |
| michael@13 | 43 | MALLOC_DEP= |
| michael@13 | 44 | fi |
| michael@13 | 45 | Index: syntax.h |
| michael@428 | 46 | --- syntax.h.orig 2009-01-04 20:32:42.000000000 +0100 |
| michael@428 | 47 | +++ syntax.h 2011-02-21 18:56:01.000000000 +0100 |
| michael@13 | 48 | @@ -21,6 +21,8 @@ |
| michael@13 | 49 | #ifndef _SYNTAX_H_ |
| michael@13 | 50 | #define _SYNTAX_H_ |
| michael@13 | 51 | |
| michael@13 | 52 | +#include "config.h" |
| michael@13 | 53 | + |
| michael@13 | 54 | /* Defines for use by mksyntax.c */ |
| michael@13 | 55 | |
| michael@13 | 56 | #define slashify_in_quotes "\\`$\"\n" |
| michael@13 | 57 | |
| michael@13 | 58 | ----------------------------------------------------------------------------- |
| michael@13 | 59 | |
| michael@13 | 60 | This adds the OpenPKG packaging brand. |
| michael@13 | 61 | |
| michael@13 | 62 | Index: version.c |
| michael@428 | 63 | --- version.c.orig 2011-01-28 17:32:36.000000000 +0100 |
| michael@428 | 64 | +++ version.c 2011-02-21 18:56:01.000000000 +0100 |
| michael@428 | 65 | @@ -83,7 +83,7 @@ |
| michael@13 | 66 | show_shell_version (extended) |
| michael@13 | 67 | int extended; |
| michael@13 | 68 | { |
| michael@428 | 69 | - printf (_("GNU bash, version %s (%s)\n"), shell_version_string (), MACHTYPE); |
| michael@428 | 70 | + printf (_("GNU bash, version %s (%s) [@l_openpkg_release@]\n"), shell_version_string (), MACHTYPE); |
| michael@13 | 71 | if (extended) |
| michael@428 | 72 | { |
| michael@428 | 73 | printf ("%s\n", _(bash_copyright)); |
| michael@13 | 74 | |
| michael@13 | 75 | ----------------------------------------------------------------------------- |
| michael@13 | 76 | |
| michael@428 | 77 | Ensure that Autoconf and friends are not run. |
| michael@13 | 78 | |
| michael@428 | 79 | Index: Makefile.in |
| michael@428 | 80 | --- Makefile.in.orig 2010-12-01 01:22:42.000000000 +0100 |
| michael@428 | 81 | +++ Makefile.in 2011-02-21 18:56:01.000000000 +0100 |
| michael@428 | 82 | @@ -711,7 +711,6 @@ |
| michael@13 | 83 | |
| michael@428 | 84 | # comment out for distribution |
| michael@428 | 85 | $(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in |
| michael@428 | 86 | - cd $(srcdir) && autoconf |
| michael@13 | 87 | |
| michael@428 | 88 | # for chet |
| michael@428 | 89 | reconfig: force |
| michael@13 | 90 | |
| michael@13 | 91 | ----------------------------------------------------------------------------- |
| michael@13 | 92 | |
| michael@570 | 93 | Fix Bash getcwd(3) runtime issue seen on Solaris where size argument |
| michael@428 | 94 | of 0 does not malloc buffer as expected by Bash code. |
| michael@13 | 95 | |
| michael@428 | 96 | Index: builtins/common.c |
| michael@428 | 97 | --- builtins/common.c.orig 2011-01-05 23:51:26.000000000 +0100 |
| michael@428 | 98 | +++ builtins/common.c 2011-02-21 18:56:01.000000000 +0100 |
| michael@428 | 99 | @@ -553,10 +553,11 @@ |
| michael@13 | 100 | |
| michael@428 | 101 | if (the_current_working_directory == 0) |
| michael@428 | 102 | { |
| michael@428 | 103 | + char *t = xmalloc(PATH_MAX); |
| michael@428 | 104 | #if defined (GETCWD_BROKEN) |
| michael@428 | 105 | - the_current_working_directory = getcwd (0, PATH_MAX); |
| michael@428 | 106 | + the_current_working_directory = getcwd (t, PATH_MAX); |
| michael@428 | 107 | #else |
| michael@428 | 108 | - the_current_working_directory = getcwd (0, 0); |
| michael@428 | 109 | + the_current_working_directory = getcwd (t, PATH_MAX); |
| michael@428 | 110 | #endif |
| michael@428 | 111 | if (the_current_working_directory == 0) |
| michael@428 | 112 | { |
| michael@428 | 113 | |
| michael@428 | 114 | ----------------------------------------------------------------------------- |
| michael@428 | 115 | |
| michael@428 | 116 | Fix building under Linux. |
| michael@428 | 117 | |
| michael@428 | 118 | Index: externs.h |
| michael@428 | 119 | --- externs.h.orig 2010-11-30 02:59:20.000000000 +0100 |
| michael@428 | 120 | +++ externs.h 2011-02-21 18:56:01.000000000 +0100 |
| michael@428 | 121 | @@ -25,6 +25,7 @@ |
| michael@428 | 122 | # define _EXTERNS_H_ |
| michael@13 | 123 | |
| michael@428 | 124 | #include "stdc.h" |
| michael@428 | 125 | +#include <stdio.h> |
| michael@428 | 126 | |
| michael@428 | 127 | /* Functions from expr.c. */ |
| michael@428 | 128 | extern intmax_t evalexp __P((char *, int *)); |
| michael@428 | 129 |
