From 2d698b6e42d8dca191ac795ef5dba3bf62496eec Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 9 Apr 2010 16:13:32 -0700
Subject: Integrate bash 3.2 version

This is merge of current Debian stable (Lenny) version of Bash
with Vyatta changes.
---
 debian/patches/bash31-004.dpatch | 65 ----------------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100755 debian/patches/bash31-004.dpatch

(limited to 'debian/patches/bash31-004.dpatch')

diff --git a/debian/patches/bash31-004.dpatch b/debian/patches/bash31-004.dpatch
deleted file mode 100755
index bb885b6..0000000
--- a/debian/patches/bash31-004.dpatch
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh -e
-
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch $pdir -f --no-backup-if-mismatch -p0 < $0;;
-    -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p0 < $0;;
-    *)
-	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-	exit 1
-esac
-exit 0
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release: 3.1
-Patch-ID: bash31-004
-
-Bug-Reported-by: Mike Frysinger <vapier@gentoo.org>
-Bug-Reference-ID: <20051223172359.GF14579@toucan.gentoo.org>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00062.html
-
-Bug-Description:
-
-A local array variable declared at function scope that shadows a variable
-of the same name declared in a previous scope did not create a separate
-variable instance, but used the previous one.
-
-Patch:
-
-*** ../bash-3.1/subst.c	Mon Oct 24 09:51:13 2005
---- subst.c	Fri Dec 30 12:11:53 2005
-***************
-*** 2188,2192 ****
-      {
-        v = find_variable (name);
-!       if (v == 0 || array_p (v) == 0)
-          v = make_local_array_variable (name);
-        v = assign_array_var_from_string (v, value, flags);
---- 2188,2192 ----
-      {
-        v = find_variable (name);
-!       if (v == 0 || array_p (v) == 0 || v->context != variable_context)
-          v = make_local_array_variable (name);
-        v = assign_array_var_from_string (v, value, flags);
-*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
---- patchlevel.h	Wed Dec  7 13:48:42 2005
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 3
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 4
-  
-  #endif /* _PATCHLEVEL_H_ */
-- 
cgit v1.2.3