Import of pkgsrc-2016Q3

shells/bash/patches/patch-variables.c

@@ -1,10 +1,10 @@
-$NetBSD: patch-variables.c,v 1.3 2015/03/07 22:40:48 rodent Exp $
+$NetBSD: patch-variables.c,v 1.4 2016/09/19 09:06:03 wiz Exp $
 
 Only read functions from environment if flag is set.
 
---- variables.c.orig	2015-03-07 22:36:12.000000000 +0000
+--- variables.c.orig	2016-06-15 20:05:52.000000000 +0000
 +++ variables.c
-@@ -110,6 +110,7 @@ extern time_t shell_start_time;
+@@ -115,6 +115,7 @@ extern time_t shell_start_time;
  extern int assigning_in_environment;
  extern int executing_builtin;
  extern int funcnest_max;
@@ -12,8 +12,8 @@ Only read functions from environment if flag is set.
  
  #if defined (READLINE)
  extern int no_line_editing;
-@@ -354,7 +355,7 @@ initialize_shell_variables (env, privmod
- 
+@@ -365,7 +366,7 @@ initialize_shell_variables (env, privmod
+ #if defined (FUNCTION_IMPORT)
        /* If exported function, define it now.  Don't import functions from
  	 the environment in privileged mode. */
 -      if (privmode == 0 && read_but_dont_execute == 0 &&