openpkg/bash.patch

Thu, 04 Oct 2012 20:30:05 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 04 Oct 2012 20:30:05 +0200
changeset 715
c10fb90893b9
parent 428
f880f219c566
permissions
-rw-r--r--

Correct out of date build configuration, porting to Solaris 11 network
link infrastructure and new libpcap logic. This additionally allows for
device drivers in subdirectories of /dev. Correct packaged nmap
personalities and signatures to work out of the box. Finally, hack
arpd logic to properly close sockets and quit on TERM by repeating
signaling in the run command script. Sadly, all this fails to correct
the run time behaviour of honeyd which fails to bind to the IP layer.

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

mercurial