Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.9.git;a=commitdiff;h=f6d1eed51c61baaf6f1cb4da66c27ab226862101
commit f6d1eed51c61baaf6f1cb4da66c27ab226862101 Author: kikadf <[email protected]> Date: Thu Sep 25 09:01:30 2014 +0200 bash-$basever-5arcturus1-x86_64 * Fix CVE-2014-6271 diff --git a/source/base/bash/CVE-2014-6271.patch b/source/base/bash/CVE-2014-6271.patch new file mode 100644 index 0000000..54e2b89 --- /dev/null +++ b/source/base/bash/CVE-2014-6271.patch @@ -0,0 +1,72 @@ +*** ../bash-4.2.47/builtins/common.h 2010-05-30 18:31:51.000000000 -0400 +--- builtins/common.h 2014-09-16 19:35:45.000000000 -0400 +*************** +*** 36,39 **** +--- 36,41 ---- + + /* Flags for describe_command, shared between type.def and command.def */ ++ #define SEVAL_FUNCDEF 0x080 /* only allow function definitions */ ++ #define SEVAL_ONECMD 0x100 /* only allow a single command */ + #define CDESC_ALL 0x001 /* type -a */ + #define CDESC_SHORTDESC 0x002 /* command -V */ +*** ../bash-4.2.47/builtins/evalstring.c 2010-11-23 08:22:15.000000000 -0500 +--- builtins/evalstring.c 2014-09-16 19:35:45.000000000 -0400 +*************** +*** 262,265 **** +--- 262,273 ---- + struct fd_bitmap *bitmap; + ++ if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def) ++ { ++ internal_warning ("%s: ignoring function definition attempt", from_file); ++ should_jump_to_top_level = 0; ++ last_result = last_command_exit_value = EX_BADUSAGE; ++ break; ++ } ++ + bitmap = new_fd_bitmap (FD_BITMAP_SIZE); + begin_unwind_frame ("pe_dispose"); +*************** +*** 322,325 **** +--- 330,336 ---- + dispose_fd_bitmap (bitmap); + discard_unwind_frame ("pe_dispose"); ++ ++ if (flags & SEVAL_ONECMD) ++ break; + } + } +*** ../bash-4.2.47/variables.c 2011-03-01 16:15:20.000000000 -0500 +--- variables.c 2014-09-16 19:35:45.000000000 -0400 +*************** +*** 348,357 **** + strcpy (temp_string + char_index + 1, string); + +! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST); +! +! /* Ancient backwards compatibility. Old versions of bash exported +! functions like name()=() {...} */ +! if (name[char_index - 1] == ')' && name[char_index - 2] == '(') +! name[char_index - 2] = '\0'; + + if (temp_var = find_function (name)) +--- 348,355 ---- + strcpy (temp_string + char_index + 1, string); + +! /* Don't import function names that are invalid identifiers from the +! environment. */ +! if (legal_identifier (name)) +! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); + + if (temp_var = find_function (name)) +*************** +*** 362,369 **** + else + report_error (_("error importing function definition for `%s'"), name); +- +- /* ( */ +- if (name[char_index - 1] == ')' && name[char_index - 2] == '\0') +- name[char_index - 2] = '('; /* ) */ + } + #if defined (ARRAY_VARS) +--- 360,363 ---- diff --git a/source/base/bash/FrugalBuild b/source/base/bash/FrugalBuild index 5824463..e131843 100644 --- a/source/base/bash/FrugalBuild +++ b/source/base/bash/FrugalBuild @@ -10,7 +10,7 @@ if [ -z "$patchver" ]; then else pkgver=${basever}_$patchver fi -pkgrel=4 +pkgrel=5arcturus1 pkgdesc="The GNU Bourne Again shell" url="http://tiswww.case.edu/php/chet/bash/bashtop.html"; backup=(etc/{profile,shells,skel/.bashrc}) @@ -29,6 +29,12 @@ if [ -n "$patchver" ]; then done fi +# FSA fix *** +source=(${source[@]} CVE-2014-6271.patch) +signatures=(${signatures[@]} '') +# *********** + + build() { Fcd $pkgname-$basever _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
