From 53418864fb336b04f9ef68f36093dd8878a9b468 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 28 Sep 2014 11:59:00 +0200
Subject: [PATCH] bash: drop NetBSD patches now that CVE-2014-7186 has a patch.

---
 srcpkgs/bash/patches/patch-shell.c     | 22 ----------------------
 srcpkgs/bash/patches/patch-variables.c | 23 -----------------------
 2 files changed, 45 deletions(-)
 delete mode 100644 srcpkgs/bash/patches/patch-shell.c
 delete mode 100644 srcpkgs/bash/patches/patch-variables.c

diff --git a/srcpkgs/bash/patches/patch-shell.c b/srcpkgs/bash/patches/patch-shell.c
deleted file mode 100644
index 7f37c86d4fe..00000000000
--- a/srcpkgs/bash/patches/patch-shell.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-shell.c,v 1.1 2014/09/25 20:28:32 christos Exp $
-
-Add flag to disable importing of function unless explicitly enabled
-
---- shell.c.christos	2014-01-14 08:04:32.000000000 -0500
-+++ shell.c	2014-09-25 16:11:51.000000000 -0400
-@@ -229,6 +229,7 @@
- #else
- int posixly_correct = 0;	/* Non-zero means posix.2 superset. */
- #endif
-+int import_functions = 0;	/* Import functions from environment */
- 
- /* Some long-winded argument names.  These are obviously new. */
- #define Int 1
-@@ -248,6 +249,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/srcpkgs/bash/patches/patch-variables.c b/srcpkgs/bash/patches/patch-variables.c
deleted file mode 100644
index bb93ba5b9dd..00000000000
--- a/srcpkgs/bash/patches/patch-variables.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-variables.c,v 1.1 2014/09/25 20:28:32 christos Exp $
-
-Only read functions from environment if flag is set.
-
---- variables.c.christos	2014-09-25 16:09:41.000000000 -0400
-+++ variables.c	2014-09-25 16:12:10.000000000 -0400
-@@ -105,6 +105,7 @@
- extern int assigning_in_environment;
- extern int executing_builtin;
- extern int funcnest_max;
-+extern int import_functions;
- 
- #if defined (READLINE)
- extern int no_line_editing;
-@@ -349,7 +350,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);