chiark / gitweb /
Commit Debian 3.0 (quilt) metadata
[bash.git] / debian / patches / auto-4.3-9.1+noshellfunctions-b357e16a83c6a9fab0f2cec18e623f03fa635d31-1411654299
diff --git a/debian/patches/auto-4.3-9.1+noshellfunctions-b357e16a83c6a9fab0f2cec18e623f03fa635d31-1411654299 b/debian/patches/auto-4.3-9.1+noshellfunctions-b357e16a83c6a9fab0f2cec18e623f03fa635d31-1411654299
new file mode 100644 (file)
index 0000000..520bbfa
--- /dev/null
@@ -0,0 +1,51 @@
+Description: Automatically generated patch (4.3-9.1+noshellfunctions)
+ Last (up to) 3 git changes, FYI:
+ .
+ commit b357e16a83c6a9fab0f2cec18e623f03fa635d31
+ Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
+ Date:   Thu Sep 25 15:09:19 2014 +0100
+ .
+     finalise changelog
+ .
+ commit 0e55bbb353cb2cceebdcb357a9e43333c9fb1820
+ Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
+ Date:   Thu Sep 25 15:08:39 2014 +0100
+ .
+     Disable all exported shell functions.
+ .
+     Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
+ .
+ commit cf45eb824817b39ce84604642a47930230e9a745
+ Author: Florian Weimer <fw@deneb.enyo.de>
+ Date:   Wed Sep 24 19:29:30 2014 +0100
+ .
+     bash (4.3-9.1) unstable; urgency=high
+ .
+       * Non-maintainer upload by the security team
+       * Apply upstream patch bash43-025, fixing CVE-2014-6271.
+ .
+     # imported from the archive
+Author: Ian Jackson <ijackson@chiark.greenend.org.uk>
+
+---
+
+--- bash-4.3.orig/variables.c
++++ bash-4.3/variables.c
+@@ -347,6 +347,7 @@ initialize_shell_variables (env, privmod
+       temp_var = (SHELL_VAR *)NULL;
++#if 0 /* Disable exporting shell functions because they are mad. */
+       /* 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))
+@@ -380,6 +381,9 @@ initialize_shell_variables (env, privmod
+             report_error (_("error importing function definition for `%s'"), name);
+           }
+       }
++#else
++      if (0) ; /* needed for syntax */
++#endif
+ #if defined (ARRAY_VARS)
+ #  if ARRAY_EXPORT
+       /* Array variables may not yet be exported. */