Commit 134f256d authored by Mike Frysinger's avatar Mike Frysinger
Browse files

convert patches to -p1 format

parent dfd5b4d3

package/bash/bash.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ bash-source: $(DL_DIR)/$(BASH_SOURCE) 


$(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE)

	$(BASH_CAT) $(DL_DIR)/$(BASH_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

	patch_level=-p0 toolchain/patch-kernel.sh $(BASH_DIR) package/bash/ bash??-???

	toolchain/patch-kernel.sh $(BASH_DIR) package/bash/ bash??-???

	# This is broken when -lintl is added to LIBS

	$(SED) 's,LIBS_FOR_BUILD =.*,LIBS_FOR_BUILD =,g' \

		$(BASH_DIR)/builtins/Makefile.in

package/bash/bash30-001

+14 −39
Original line number Diff line number Diff line 
			     BASH PATCH REPORT

			     =================



Bash-Release: 3.0

Patch-ID: bash30-001



Bug-Reported-by: Karlheinz Nolte <kn@k-nolte.de>

Bug-Reference-ID: <20040801200058.GA3311@mars.home.k-nolte.de>

Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00009.html



Bug-Description:



    The following script triggers the segfault.

      This was found by Costa Tsaousis the author of FireHOL.

          He wrotes:



          "I think I have found the bug. The script bellow crashes at the

       third echo (UNSET). It seems to be a problem of the "unset" BASH

       function when erasing arrays. It leaves something behind so that if

       the array just unset is referenced, it produces a segmentation fault.

       According to the documentation the first and the third expansions

       should be exactly the same."



Patch:



*** ../bash-3.0/arrayfunc.c	Fri Dec 19 00:03:09 2003

--- arrayfunc.c	Sun Aug  1 20:43:00 2004

*** bash-3.0/arrayfunc.c	Fri Dec 19 00:03:09 2003

--- bash/arrayfunc.c	Sun Aug  1 20:43:00 2004

***************

*** 612,616 ****
@@ -39,8 +14,8 @@ Patch: 
  }

  



*** ../bash-3.0/subst.c	Sun Jul  4 13:56:13 2004

--- subst.c	Thu Aug 12 13:36:17 2004

*** bash-3.0/subst.c	Sun Jul  4 13:56:13 2004

--- bash/subst.c	Thu Aug 12 13:36:17 2004

***************

*** 4983,4987 ****

  	return -1;
@@ -55,8 +30,8 @@ Patch: 
      {

        vtype = VT_ARRAYMEMBER;



*** ../bash-3.0/variables.c	Sun Jul  4 13:57:26 2004

--- variables.c	Wed Aug  4 15:28:04 2004

*** bash-3.0/variables.c	Sun Jul  4 13:57:26 2004

--- bash/variables.c	Wed Aug  4 15:28:04 2004

***************

*** 1420,1428 ****
@@ -94,8 +69,8 @@ Patch: 
!     }

  

    was_tmpvar = old_var && tempvar_p (old_var);

*** ../bash-3.0/pcomplete.c	Thu Jan  8 10:36:17 2004

--- pcomplete.c	Tue Aug  3 23:15:41 2004

*** bash-3.0/pcomplete.c	Thu Jan  8 10:36:17 2004

--- bash/pcomplete.c	Tue Aug  3 23:15:41 2004

***************

*** 864,867 ****

--- 864,869 ----
@@ -114,8 +89,8 @@ Patch: 
+   VUNSETATTR (v, att_invisible);

  

    a = array_cell (v);

*** ../bash-3.0/array.c	Thu May  6 08:24:13 2004

--- array.c	Wed Aug 25 15:50:42 2004

*** bash-3.0/array.c	Thu May  6 08:24:13 2004

--- bash/array.c	Wed Aug 25 15:50:42 2004

***************

*** 452,456 ****

  			array_dispose_element(new);
@@ -130,8 +105,8 @@ Patch: 
  			return(0);

  		} else if (element_index(ae) > i) {



*** ../bash-3.0/patchlevel.h	Wed Aug 22 08:05:39 2001

--- patchlevel.h	Thu Sep  2 15:04:32 2004

*** bash-3.0/patchlevel.h	Wed Aug 22 08:05:39 2001

--- bash/patchlevel.h	Thu Sep  2 15:04:32 2004

***************

*** 26,30 ****

     looks for to find the patch level (for the sccs version string). */
@@ -145,8 +120,8 @@ Patch: 
! #define PATCHLEVEL 1

  

  #endif /* _PATCHLEVEL_H_ */

*** ../bash-3.0/tests/dbg-support.tests	Tue Mar 25 15:33:03 2003

--- tests/dbg-support.tests	Tue Aug  3 23:09:29 2004

*** bash-3.0/tests/dbg-support.tests	Tue Mar 25 15:33:03 2003

--- bash/tests/dbg-support.tests	Tue Aug  3 23:09:29 2004

***************

*** 63,68 ****

  trap 'print_return_trap $LINENO' RETURN

package/bash/bash30-002

+4 −26
Original line number Diff line number Diff line 
			     BASH PATCH REPORT

			     =================



Bash-Release: 3.0

Patch-ID: bash30-002



Bug-Reported-by:  "Ralf S. Engelschall" <rse@engelschall.com>

Bug-Reference-ID: <20040728082038.GA31398@engelschall.com>

Bug-Reference-URL:  http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00262.html



Bug-Description:



After upgrading the OpenPKG "bash" package to 3.0, we had to discover

that the prompt handling on Bash 3.0 / Readline 5.0 is broken if a

multiline prompt (a string containing newlines) is used. The effect is

that on the first input line (where the last line of the prompt is the

prefix) the input line is wrapped N characters before the last column

where N seems to be exactly the length (including newlines) of the

prompt ($PS1) minus the characters on the last line of the prompt.



Patch:



*** ../bash-3.0/lib/readline/display.c	Thu May 27 22:57:51 2004

--- lib/readline/display.c	Wed Jul 28 13:48:04 2004

*** bash-3.0/lib/readline/display.c	Thu May 27 22:57:51 2004

--- bash/lib/readline/display.c	Wed Jul 28 13:48:04 2004

***************

*** 352,356 ****

  				       &prompt_last_invisible,
@@ -49,8 +27,8 @@ Patch: 
        *t = c;

        return (prompt_prefix_length);



*** ../bash-3.0/patchlevel.h	Wed Aug 22 08:05:39 2001

--- patchlevel.h	Thu Sep  2 15:04:32 2004

*** bash-3.0/patchlevel.h	Wed Aug 22 08:05:39 2001

--- bash/patchlevel.h	Thu Sep  2 15:04:32 2004

***************

*** 26,30 ****

     looks for to find the patch level (for the sccs version string). */

package/bash/bash30-003

+8 −25
Original line number Diff line number Diff line 
			     BASH PATCH REPORT

			     =================



Bash-Release: 3.0

Patch-ID: bash30-003



Bug-Reported-by: Egmont Koblinger <egmont@uhulinux.hu>

Bug-Reference-ID: <Pine.LNX.4.58L0.0407290044500.12603@sziami.cs.bme.hu>

Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00279.html



Bug-Description:



Bash no longer accepts the `trap signum' syntax when in POSIX mode.  This

patch restores a measure of backwards compatibility.



Patch:



*** ../bash-3.0/builtins/trap.def	Thu May 27 22:26:19 2004

--- builtins/trap.def	Thu Aug  5 08:55:43 2004

*** bash-3.0/builtins/trap.def	Thu May 27 22:26:19 2004

--- bash/builtins/trap.def	Thu Aug  5 08:55:43 2004

***************

*** 24,28 ****

  $BUILTIN trap
@@ -75,8 +58,8 @@ Patch: 
!       else if (posixly_correct == 0 && first_arg && *first_arg &&

  		(*first_arg != '-' || first_arg[1]) &&

  		signal_object_p (first_arg, opt) && list->next == 0)

*** ../bash-3.0/doc/bashref.texi	Sat Jun 26 14:26:07 2004

--- doc/bashref.texi	Fri Aug 27 12:33:46 2004

*** bash-3.0/doc/bashref.texi	Sat Jun 26 14:26:07 2004

--- bash/doc/bashref.texi	Fri Aug 27 12:33:46 2004

***************

*** 5954,5958 ****

  The @code{trap} builtin doesn't check the first argument for a possible
@@ -92,8 +75,8 @@ Patch: 
  signal to the original disposition, they should use @samp{-} as the

  first argument.



*** ../bash-3.0/patchlevel.h	Wed Aug 22 08:05:39 2001

--- patchlevel.h	Thu Sep  2 15:04:32 2004

*** bash-3.0/patchlevel.h	Wed Aug 22 08:05:39 2001

--- bash/patchlevel.h	Thu Sep  2 15:04:32 2004

***************

*** 26,30 ****

     looks for to find the patch level (for the sccs version string). */
@@ -107,8 +90,8 @@ Patch: 
! #define PATCHLEVEL 3

  

  #endif /* _PATCHLEVEL_H_ */

*** ../bash-3.0/tests/errors.right	Thu May 27 22:26:03 2004

--- tests/errors.right	Sat Aug  7 22:35:10 2004

*** bash-3.0/tests/errors.right	Thu May 27 22:26:03 2004

--- bash/tests/errors.right	Sat Aug  7 22:35:10 2004

***************

*** 86,90 ****

  ./errors.tests: line 216: trap: NOSIG: invalid signal specification

package/bash/bash30-004

+6 −23
Original line number Diff line number Diff line 
			     BASH PATCH REPORT

			     =================



Bash-Release: 3.0

Patch-ID: bash30-004



Bug-Reported-by: Stephane Chazelas <stephane_chazelas@yahoo.fr>

Bug-Reference-ID: <20040902131957.GC1860@frhdtmp102861.morse.corp.wan>

Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00291.html



Bug-Description:



Calculation of lengths and offsets for parameter string length and substring

expansion does not correctly account for multibyte characters.



Patch:



 *** ../bash-3.0/subst.c	Sun Jul  4 13:56:13 2004

--- subst.c	Thu Aug 12 13:36:17 2004

*** bash-3.0/subst.c	Sun Jul  4 13:56:13 2004

--- bash/subst.c	Thu Aug 12 13:36:17 2004

***************

*** 4692,4695 ****

--- 4692,4715 ----
@@ -97,8 +80,8 @@ Patch: 
!       len = MB_STRLEN (value);

        break;

      case VT_POSPARMS:

*** ../bash-3.0/include/shmbutil.h	Mon Apr 19 09:59:42 2004

--- include/shmbutil.h	Thu Sep  2 15:20:47 2004

*** bash-3.0/include/shmbutil.h	Mon Apr 19 09:59:42 2004

--- bash/include/shmbutil.h	Thu Sep  2 15:20:47 2004

***************

*** 32,35 ****

--- 32,37 ----
@@ -128,8 +111,8 @@ Patch: 
  

  #endif /* !HANDLE_MULTIBYTE */



*** ../bash-3.0/patchlevel.h	Wed Aug 22 08:05:39 2001

--- patchlevel.h	Thu Sep  2 15:04:32 2004

*** bash-3.0/patchlevel.h	Wed Aug 22 08:05:39 2001

--- bash/patchlevel.h	Thu Sep  2 15:04:32 2004

***************

*** 26,30 ****

     looks for to find the patch level (for the sccs version string). */