update to the latest upstream patch

3 files changed, 17 insertions, 14 deletions

diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index f06a288f7a7..5cd34faabf8 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2014/09/27 03:00:06 christos Exp $
+# $NetBSD: Makefile,v 1.86 2014/09/30 18:27:40 christos Exp $
 #
 
 DISTNAME=	bash-2.05b
@@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 PATCH_SITES=	${MASTER_SITES:=bash-2.05b-patches/}
 PATCHFILES=	bash205b-001 bash205b-002 bash205b-003 bash205b-004 \
 		bash205b-005 bash205b-006 bash205b-007 bash205b-008 \
-		bash205b-009
+		bash205b-009 bash205b-010
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
diff --git a/shells/bash2/distinfo b/shells/bash2/distinfo
index c658e7a84d5..48ff0db4c19 100644
--- a/shells/bash2/distinfo
+++ b/shells/bash2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2014/09/27 03:00:06 christos Exp $
+$NetBSD: distinfo,v 1.17 2014/09/30 18:27:40 christos Exp $
 
 SHA1 (bash-2.05b.tar.gz) = b3e158877f94e66ec1c8ef604e994851ee388b09
 RMD160 (bash-2.05b.tar.gz) = d9826db03c5d38e6175af5b3ef0bc07fafa14add
@@ -30,6 +30,9 @@ Size (bash205b-008) = 2824 bytes
 SHA1 (bash205b-009) = 360353009fc018be5d5b61699b71c84ebf2f1d2d
 RMD160 (bash205b-009) = 55fe8fcdaea560f3b1834e17166c2bbff04eaa18
 Size (bash205b-009) = 713 bytes
+SHA1 (bash205b-010) = e4f5c6100bbd1846a20c5a063c8f9058a164881b
+RMD160 (bash205b-010) = 356cc30604226c370afcd788439ba917a07b0532
+Size (bash205b-010) = 6267 bytes
 SHA1 (patch-aa) = f6f5eb9b70e609164b35c57de70a1c404c7f52ba
 SHA1 (patch-ab) = 1a2fc87648b7e73a4987454bb249149ae15bed93
 SHA1 (patch-ac) = 7f68d80de74a887fe0c3f42e9fb5d7e6ad311c30
@@ -42,4 +45,4 @@ SHA1 (patch-ai) = db34e25bef3572d2bf198216e8c2aebb98362925
 SHA1 (patch-aj) = c5c541a5e3c06127ccbc8a560e3ea97fbf77ef4f
 SHA1 (patch-ak) = b76eadbf6ced8c1b98454eb3579345ff8739ccb5
 SHA1 (patch-shell.c) = 151446e30fcaa395cd326552e72d1810d5f01671
-SHA1 (patch-variables.c) = 70673aa09d423b1393d2607d3c9bf6704180ae85
+SHA1 (patch-variables.c) = e7638f06ad8577aa3ab015469d86ed110e05872b
diff --git a/shells/bash2/patches/patch-variables.c b/shells/bash2/patches/patch-variables.c
index 66e5ccc0595..dc53adf6194 100644
--- a/shells/bash2/patches/patch-variables.c
+++ b/shells/bash2/patches/patch-variables.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-variables.c,v 1.1 2014/09/27 03:00:06 christos Exp $
+$NetBSD: patch-variables.c,v 1.2 2014/09/30 18:27:40 christos Exp $
 
 Only read functions from environment if flag is set.
 
---- variables.c.orig	2014-09-26 22:45:02.000000000 -0400
-+++ variables.c	2014-09-26 22:54:31.000000000 -0400
-@@ -82,6 +82,7 @@
+--- variables.c.orig	2014-09-30 14:22:56.000000000 -0400
++++ variables.c	2014-09-30 14:23:31.000000000 -0400
+@@ -87,6 +87,7 @@
  extern SHELL_VAR *this_shell_function;
  extern char *this_command_name;
  extern time_t shell_start_time;
@@ -12,12 +12,12 @@ Only read functions from environment if flag is set.
  
  /* The list of shell variables that the user has created at the global
     scope, or that came from the environment. */
-@@ -260,7 +261,7 @@
+@@ -265,7 +266,7 @@
  
        /* If exported function, define it now.  Don't import functions from
  	 the environment in privileged mode. */
--      if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4))
-+      if (import_functions && privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4))
- 	{
- 	  string_length = strlen (string);
- 	  temp_string = (char *)xmalloc (3 + string_length + char_index);
+-      if (privmode == 0 && read_but_dont_execute == 0 &&
++      if (import_functions && privmode == 0 && read_but_dont_execute == 0 &&
+ 	  STREQN (BASHFUNC_PREFIX, name, BASHFUNC_PREFLEN) &&
+ 	  STREQ (BASHFUNC_SUFFIX, name + char_index - BASHFUNC_SUFFLEN) &&
+ 	  STREQN ("() {", string, 4))