bring bash2 up to speed since people don't seem to think it can be removed.

4 files changed, 59 insertions, 5 deletions

diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index ae1ac930752..f06a288f7a7 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.84 2013/07/15 02:02:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.85 2014/09/27 03:00:06 christos Exp $
 #
 
 DISTNAME=	bash-2.05b
-PKGNAME=	bash-2.05.2.7
-PKGREVISION=	11
+PKGNAME=	bash-2.05.2.9
+PKGREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 		ftp://ftp.cwru.edu/pub/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-005 bash205b-006 bash205b-007 bash205b-008 \
+		bash205b-009
 
 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 5fdee28e953..c658e7a84d5 100644
--- a/shells/bash2/distinfo
+++ b/shells/bash2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2005/12/19 00:28:02 joerg Exp $
+$NetBSD: distinfo,v 1.16 2014/09/27 03:00:06 christos Exp $
 
 SHA1 (bash-2.05b.tar.gz) = b3e158877f94e66ec1c8ef604e994851ee388b09
 RMD160 (bash-2.05b.tar.gz) = d9826db03c5d38e6175af5b3ef0bc07fafa14add
@@ -24,6 +24,12 @@ Size (bash205b-006) = 3155 bytes
 SHA1 (bash205b-007) = 758301e500c23779da9236c5cd3f6612d29d5f7b
 RMD160 (bash205b-007) = 78c333ebfd8958d7c39b14620dddddbe78310f4f
 Size (bash205b-007) = 1072 bytes
+SHA1 (bash205b-008) = c5376d02ae4e93544d8e5fe14c3714fb2d5cde8e
+RMD160 (bash205b-008) = 0f9cf3f990d58973ad8f1a15e5c9e506e1fe18fd
+Size (bash205b-008) = 2824 bytes
+SHA1 (bash205b-009) = 360353009fc018be5d5b61699b71c84ebf2f1d2d
+RMD160 (bash205b-009) = 55fe8fcdaea560f3b1834e17166c2bbff04eaa18
+Size (bash205b-009) = 713 bytes
 SHA1 (patch-aa) = f6f5eb9b70e609164b35c57de70a1c404c7f52ba
 SHA1 (patch-ab) = 1a2fc87648b7e73a4987454bb249149ae15bed93
 SHA1 (patch-ac) = 7f68d80de74a887fe0c3f42e9fb5d7e6ad311c30
@@ -35,3 +41,5 @@ SHA1 (patch-ah) = 00732b402fc0479e153d3f5b24ea8151a3d42dc0
 SHA1 (patch-ai) = db34e25bef3572d2bf198216e8c2aebb98362925
 SHA1 (patch-aj) = c5c541a5e3c06127ccbc8a560e3ea97fbf77ef4f
 SHA1 (patch-ak) = b76eadbf6ced8c1b98454eb3579345ff8739ccb5
+SHA1 (patch-shell.c) = 151446e30fcaa395cd326552e72d1810d5f01671
+SHA1 (patch-variables.c) = 70673aa09d423b1393d2607d3c9bf6704180ae85
diff --git a/shells/bash2/patches/patch-shell.c b/shells/bash2/patches/patch-shell.c
new file mode 100644
index 00000000000..e086ea810ad
--- /dev/null
+++ b/shells/bash2/patches/patch-shell.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-shell.c,v 1.1 2014/09/27 03:00:06 christos Exp $
+
+Add flag to disable importing of function unless explicitly enabled
+
+--- shell.c.orig	2002-07-01 11:27:11.000000000 -0400
++++ shell.c	2014-09-26 22:52:27.000000000 -0400
+@@ -197,6 +197,7 @@
+ int dump_translatable_strings;	/* Dump strings in $"...", don't execute. */
+ int dump_po_strings;		/* Dump strings in $"..." in po format */
+ int wordexp_only = 0;		/* Do word expansion only */
++int import_functions = 0;	/* Import functions from environment */
+ 
+ /* Some long-winded argument names.  These are obviously new. */
+ #define Int 1
+@@ -213,6 +214,7 @@
+   { "help", Int, &want_initial_help, (char **)0x0 },
+   { "init-file", Charp, (int *)0x0, &bashrc_file },
+   { "login", Int, &make_login_shell, (char **)0x0 },
++  { "import-functions", Int, &import_functions, (char **)0x0 },
+   { "noediting", Int, &no_line_editing, (char **)0x0 },
+   { "noprofile", Int, &no_profile, (char **)0x0 },
+   { "norc", Int, &no_rc, (char **)0x0 },
diff --git a/shells/bash2/patches/patch-variables.c b/shells/bash2/patches/patch-variables.c
new file mode 100644
index 00000000000..66e5ccc0595
--- /dev/null
+++ b/shells/bash2/patches/patch-variables.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-variables.c,v 1.1 2014/09/27 03:00:06 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 @@
+ extern SHELL_VAR *this_shell_function;
+ extern char *this_command_name;
+ extern time_t shell_start_time;
++extern int import_functions;
+ 
+ /* The list of shell variables that the user has created at the global
+    scope, or that came from the environment. */
+@@ -260,7 +261,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);