tomo cocoa avatar tomo cocoa committed eb63ba7 Merge

merged

Comments (0)

Files changed (489)

Library/Contributions/cmds/brew-pull.rb

   onoe 'This command requires at least one argument containing a URL or pull request number'
 end
 
+if ARGV[0] == '--rebase'
+  onoe 'You meant `git pull --rebase`.'
+end
+
 ARGV.named.each do|arg|
   if arg.to_i > 0
     url = 'https://github.com/mxcl/homebrew/pull/' + arg

Library/Contributions/cmds/brew-test-bot.rb

 # Usage: brew test-bot [options...] <pull-request|formula>
 #
 # Options:
-# --log:     Writes log files under ./brewbot/
-# --html:    Writes html and log files under ./brewbot/
-# --comment: Comment on the pull request
-# --clean:   Clean the Homebrew directory. Very dangerous. Use with care.
+# --log:          Writes log files under ./brewbot/
+# --html:         Writes html and log files under ./brewbot/
+# --comment:      Comment on the pull request
+# --cleanup:      Clean the Homebrew directory. Very dangerous. Use with care.
+# --skip-cleanup: Don't check for uncommitted changes.
+# --skip-setup:   Don't check the local system is setup correctly.
 
 require 'formula'
 require 'utils'
 HOMEBREW_CONTRIBUTED_CMDS = HOMEBREW_REPOSITORY + "Library/Contributions/cmds/"
 
 class Step
-  attr_reader :command
+  attr_reader :command, :repository
   attr_accessor :status
 
   def initialize test, command
     @command = command
     @name = command.split[1].delete '-'
     @status = :running
+    @repository = HOMEBREW_REPOSITORY
     @test.steps << self
     write_html
   end
     end
   end
 
-  def self.run test, command
+  def self.run test, command, puts_output = false
     step = new test, command
     step.puts_command
-    `#{step.command} &>#{step.log_file_path}`
+
+    command = "#{step.command}"
+    unless puts_output and not ARGV.include? "--log"
+      command += " &>#{step.log_file_path}"
+    end
+
+    output = nil
+    if command.start_with? 'git '
+      Dir.chdir step.repository do
+        output = `#{command}`
+      end
+    else
+      output = `#{command}`
+    end
+    output = IO.read(step.log_file_path) if ARGV.include? "--log"
+
     step.status = $?.success? ? :passed : :failed
     step.puts_result
     step.write_html
+    puts output if puts_output and output and not output.empty?
   end
 end
 
     end
   end
 
+  def git arguments
+    Dir.chdir HOMEBREW_REPOSITORY do
+      `git #{arguments}`
+    end
+  end
+
   def download
     def current_sha1
-      `git rev-parse --short HEAD`.strip
+      git('rev-parse --short HEAD').strip
     end
 
     def current_branch
-      `git symbolic-ref HEAD`.slice!("refs/heads/").strip
+      git('symbolic-ref HEAD').slice!("refs/heads/").strip
     end
 
     @category = __method__
     if @url
-      `git am --abort 2>/dev/null`
+      git 'am --abort 2>/dev/null'
       test "brew update" if current_branch == "master"
       @start_sha1 = current_sha1
       test "brew pull --clean #{@url}"
 
     return unless @url and @start_sha1 != end_sha1 and steps.last.status == :passed
 
-    `git diff #{@start_sha1}..#{end_sha1} --name-status`.each_line do |line|
+    git("diff #{@start_sha1}..#{end_sha1} --name-status`.each_line") do |line|
       status, filename = line.split
       # Don't try and do anything to removed files.
       if (status == 'A' or status == 'M')
     test "brew audit #{formula}"
     test "brew install --verbose --build-bottle #{formula}"
     return unless steps.last.status == :passed
+    test "brew bottle #{formula}", true
     test "brew test #{formula}" if defined? Formula.factory(formula).test
-    test "brew bottle #{formula}"
     test "brew uninstall #{formula}"
   end
 
 
   def cleanup
     @category = __method__
-    if ARGV.include? "--clean"
+    if ARGV.include? "--cleanup"
+      test "git fetch origin"
       test "git reset --hard origin/master"
+      test "brew cleanup"
       test "git clean --force -dx"
+      test "git gc"
     else
-      `git diff --exit-code HEAD 2>/dev/null`
-      odie "Uncommitted changes, aborting." unless $?.success?
+      unless ARGV.include? "--skip-cleanup"
+        git('diff --exit-code HEAD 2>/dev/null')
+        odie "Uncommitted changes, aborting." unless $?.success?
+      end
       test "git reset --hard #{@start_sha1}" if @start_sha1
     end
   end
 
-  def test cmd
-    Step.run self, cmd
+  def test cmd, puts_output = false
+    Step.run self, cmd, puts_output
   end
 
   def check_results
     test = new url
     test.cleanup
     test.download
-    test.setup
+    test.setup unless ARGV.include? "--skip-setup"
     test.formulae.each do |f|
       test.formula f
     end
     test.homebrew if test.core_changed
-    test.cleanup
+    test.cleanup unless ARGV.include? "--skip-cleanup"
 
     test.check_results
   end
   odie 'This command requires at least one argument containing a pull request number or formula.'
 end
 
-Dir.chdir HOMEBREW_REPOSITORY
-
 ARGV.named.each do|arg|
   Test.run arg
 end

Library/Contributions/manpages/brew.1.md

     If `--git` is passed, Homebrew will create a Git repository, useful for
     creating patches to the software.
 
-  * `ln`, `link [--force] [--dry-run]` <formula>:
+  * `ln`, `link [--overwrite] [--dry-run]` <formula>:
     Symlink all of <formula>'s installed files into the Homebrew prefix. This
     is done automatically when you install formula, but can be useful for DIY
     installations.
 
-    If `--force` is passed, Homebrew will delete files which already exist in
+    If `--overwrite` is passed, Homebrew will delete files which already exist in
     the prefix while linking.
 
     If `--dry-run` or `-n` is passed, Homebrew will list all files which would
-    be deleted by `brew link --force`, but will not actually link or delete
-    any files.
+    be linked or which would be deleted by `brew link --overwrite`, but will not
+    actually link or delete any files.
 
   * `ls, list [--unbrewed] [--versions]` [<formulae>]:
     Without any arguments, list all installed formulae.

Library/ENV/4.3/cc

   def tool
     @tool ||= case @arg0
     when 'ld' then 'ld'
-    when 'cc', 'c99', 'c89'
+    when 'cc', 'c99', 'c89', 'cpp'
       # Ideally we would run `cx9`, however these tools are POSIX compliant
       # and don't support many flags. We need -isystem for instance, but also
       # reliability is generally much higher if we just get clang/gcc to do
         whittler.next
       when /^-g\d?/, /^-gstabs\d+/, '-gstabs+', /^-ggdb\d?/, '-gdwarf-2',
            /^-march=.+/, /^-mtune=.+/, '-m64', '-m32',
-           /^-O[0-9zs]?/, '-fast',
+           /^-O[0-9zs]?$/, '-fast',
            '-pedantic', '-pedantic-errors'
       when '-fopenmp', '-lgomp'
         # clang doesn't support OpenMP
         args << "-I#{path}" if iset.add?(path.cleanpath)
       when /^-L(.+)/
         path = $1.chuzzle || whittler.next
-        case path.cleanpath
+        doit = case path.cleanpath
+        when %r{^#$brewfix}
+          # maybe homebrew is installed to /sw or /opt/brew
+          true
         when %r{^/opt}, %r{^/sw}, %r{/usr/X11}
-          # NOOP
+          false
         else
-          args << "-L#{path}" if lset.add?(path.cleanpath)
+          true
         end
+        args << "-L#{path}" if doit and lset.add?(path.cleanpath)
       else
         args << arg
       end

Library/ENV/4.3/git

+../../Contributions/cmds/git

Library/ENV/4.3/svn

+../../Contributions/cmds/svn

Library/ENV/pkgconfig/libcurl.pc

+#***************************************************************************
+#                                  _   _ ____  _
+#  Project                     ___| | | |  _ \| |
+#                             / __| | | | |_) | |
+#                            | (__| |_| |  _ <| |___
+#                             \___|\___/|_| \_\_____|
+#
+# Copyright (C) 2004 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://curl.haxx.se/docs/copyright.html.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the COPYING file.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
+#
+###########################################################################
+
+# This should most probably benefit from getting a "Requires:" field added
+# dynamically by configure.
+#
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+supported_protocols="DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS LDAP LDAPS POP3 POP3S RTSP SMTP SMTPS TELNET TFTP"
+supported_features="SSL IPv6 libz AsynchDNS NTLM"
+
+Name: libcurl
+URL: http://curl.haxx.se/
+Description: Library to transfer files with ftp, http, etc.
+Version: 7.21.4
+Libs: -L${libdir} -lcurl 
+Libs.private: -lssl -lcrypto -Wl,-weak-lldap -Wl,-weak-lgssapi_krb5 -lresolv -lssl -lcrypto -lz -lz 
+Cflags: -I${includedir}

Library/ENV/pkgconfig/libexslt.pc

+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+
+Name: libexslt
+Version: 0.8.13
+Description: EXSLT Extension library
+Requires: libxml-2.0
+Libs: -L${libdir} -lexslt -lxslt  -lxml2 -lz -lpthread -licucore -lm  
+Cflags: -I${includedir}

Library/ENV/pkgconfig/libxml-2.0.pc

+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+modules=1
+
+Name: libXML
+Version: 2.7.3
+Description: libXML library version2.
+Requires:
+Libs: -L${libdir} -lxml2
+Libs.private: -lpthread -lz  -lm 
+Cflags: -I${includedir}/libxml2 

Library/ENV/pkgconfig/libxslt.pc

+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+
+Name: libxslt
+Version: 1.1.24
+Description: XSLT library version 2.
+Requires: libxml-2.0
+Libs: -L${libdir} -lxslt  -lxml2 -lz -lpthread -licucore -lm 
+Cflags: -I${includedir}

Library/Formula/abcmidi.rb

 
 class Abcmidi < Formula
   homepage 'http://www.ifdo.ca/~seymour/runabc/top.html'
-  url 'http://www.ifdo.ca/~seymour/runabc/abcMIDI-2012-08-08.zip'
-  version '2012-08-08'
-  sha1 '004f09087c56fe00c6024de4b292111515f1df16'
+  url 'http://www.ifdo.ca/~seymour/runabc/abcMIDI-2012-11-03.zip'
+  version '2012-11-03'
+  sha1 'c173a6aa4be9869d030c8900615dd45792d5cdba'
 
   def install
     # configure --prefix flag does not work properly (value is added to path twice).

Library/Formula/activemq.rb

 
   skip_clean 'libexec/webapps/admin/WEB-INF/jsp'
 
-  def startup_script name
-    <<-EOS.undent
-      #!/bin/bash
-      exec "#{libexec}/bin/#{name}" "$@"
-    EOS
-  end
-
   def install
     rm_rf Dir['bin/linux-x86-*']
 
-    prefix.install %w{ LICENSE NOTICE README.txt }
+    prefix.install_metafiles
     libexec.install Dir['*']
 
-    (bin+'activemq-admin').write startup_script('activemq-admin')
-    (bin+'activemq').write startup_script('activemq')
+    bin.write_exec_script libexec/'bin/activemq'
+    bin.write_exec_script libexec/'bin/activemq-admin'
   end
 end

Library/Formula/adobe-air-sdk.rb

 class AdobeAirSdk < Formula
   homepage 'http://www.adobe.com/products/air/sdk/'
   url 'http://airdownload.adobe.com/air/mac/download/3.4/AdobeAIRSDK.tbz2'
-  sha1 '3bc90f619d9f1620187538b6f591675c7d6011d5'
-  version '3.4'
-
-  def startup_script name
-    (bin+name).write <<-EOS.undent
-      #!/bin/bash
-      exec "#{libexec}/bin/#{name}" "$@"
-    EOS
-  end
+  sha1 'eddfaa8708c7f53d53f099629d6d9cb65ce45586'
 
   def install
     libexec.install Dir['*']
-    startup_script("adl")
-    startup_script("adt")
+    bin.write_exec_script libexec/'bin/adl'
+    bin.write_exec_script libexec/'bin/adt'
   end
 end

Library/Formula/android-sdk.rb

 require 'formula'
 
+class AdbBashCompletion < Formula
+  url 'https://raw.github.com/CyanogenMod/android_sdk/3bf0a01ef66a9b99149ba3faaf34a1362581dd01/bash_completion/adb.bash'
+  sha1 '8e7dad45b8c98c359516d4a818a9090125bc6f7a'
+  version 'cyanogenmod_jellybean'
+end
+
 class AndroidSdk < Formula
   homepage 'http://developer.android.com/index.html'
   url 'http://dl.google.com/android/android-sdk_r20.0.3-macosx.zip'
         echo Use the \\`android\\' tool to install the \\"Android SDK Platform-tools\\".
       EOS
     end
+
+    AdbBashCompletion.new.brew do
+      (prefix+'etc/bash_completion.d').install 'adb.bash' => 'adb-completion.bash'
+    end
   end
 
   def caveats; <<-EOS.undent

Library/Formula/antlr.rb

 
   def install
     prefix.install "antlr-3.4-complete.jar"
-    (bin+"antlr-3.4").write <<-EOS.undent
-    #!/bin/sh
-    java -jar #{prefix}/antlr-3.4-complete.jar "$@"
-    EOS
+    bin.write_jar_script prefix/"antlr-3.4-complete.jar", "antlr-3.4"
   end
 end

Library/Formula/apgdiff.rb

   sha1 '1150d44e9da2c1417767d4106bdb297ed0adfed8'
 
   def install
-    libexec.install "apgdiff-#{version}.jar"
-    (bin+'apgdiff').write <<-EOS.undent
-      #!/bin/bash
-      java -jar "#{libexec}/apgdiff-#{version}.jar" "$@"
-    EOS
+    libexec.install "apgdiff-2.4.jar"
+    bin.write_jar_script libexec/"apgdiff-2.4.jar", "apgdiff"
   end
 end

Library/Formula/apollo.rb

   option "no-mqtt", "Install without MQTT protocol support"
 
   def install
-    prefix.install %w{ LICENSE NOTICE readme.html docs examples }
+    prefix.install_metafiles
+    prefix.install %w{ docs examples }
     libexec.install Dir['*']
 
     unless build.include? "no-bdb"
       end
     end
 
-    (bin+'apollo').write <<-EOS.undent
-      #!/bin/bash
-      exec "#{libexec}/bin/#{name}" "$@"
-    EOS
+    bin.write_exec_script libexec/'bin/apollo'
+
+    plist_path.write startup_plist
+    plist_path.chmod 0644
   end
 
   def caveats; <<-EOS.undent

Library/Formula/app-engine-java-sdk.rb

   url 'http://googleappengine.googlecode.com/files/appengine-java-sdk-1.7.2.zip'
   sha1 '5adcecb9c76937de5afeb3cf1fe17a6cce24f130'
 
-  def shim_script target
-    <<-EOS.undent
-      #!/bin/bash
-      "#{libexec}/bin/#{target}" "$@"
-    EOS
-  end
-
   def install
     rm Dir['bin/*.cmd']
     libexec.install Dir['*']
-
-    Dir["#{libexec}/bin/*"].each do |b|
-      n = Pathname.new(b).basename
-      (bin+n).write shim_script(n)
-    end
+    bin.write_exec_script "#{libexec}/bin/*"
   end
 end

Library/Formula/arangodb.rb

 
 class Arangodb < Formula
   homepage 'http://www.arangodb.org/'
-  url 'https://github.com/triAGENS/ArangoDB/zipball/v1.0.1'
-  sha1 'f4c196ec8f160be2f830bafffcf5a6756731802f'
+  url 'https://github.com/triAGENS/ArangoDB/zipball/v1.0.2'
+  sha1 'e380e7c95b4a1038708fb9e2f62dc795a35b617d'
 
   head "https://github.com/triAGENS/ArangoDB.git"
 

Library/Formula/argp-standalone.rb

 require 'formula'
 
-# This is an extraction of the Argp header and library from Glibc. It may be
-# used as a dependency for formulae that depend on the argp functionality of
-# Glibc.
-
 class ArgpStandalone < Formula
   homepage 'http://www.lysator.liu.se/~nisse/misc/'
   url 'http://www.lysator.liu.se/~nisse/misc/argp-standalone-1.3.tar.gz'
 
   def patches
     # This patch fixes compilation with Clang.
-    { :p0 => "https://trac.macports.org/export/86556/trunk/dports/devel/argp-standalone/files/patch-argp-fmtstream.h" }
+    {:p0 =>
+      "https://trac.macports.org/export/86556/trunk/dports/devel/argp-standalone/files/patch-argp-fmtstream.h"
+    }
   end
 
   def install

Library/Formula/argtable.rb

+require 'formula'
+
+class Argtable < Formula
+  homepage 'http://argtable.sourceforge.net'
+  url 'http://downloads.sourceforge.net/project/argtable/argtable/argtable-2.13/argtable2-13.tar.gz'
+  version '2.13'
+  sha1 'bce828c64c35e16f4c3f8e1f355e4a2a97fe3289'
+
+  def install
+    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
+    system "make install"
+  end
+end

Library/Formula/arm.rb

 
   def install
     (share+"arm").install Dir["*"]
-    (bin+'arm').write <<-EOS.undent
-      #!/bin/sh
-      exec "#{share}/arm/arm" "$@"
-    EOS
+    bin.write_exec_script share/'arm/arm'
   end
 
   def caveats; <<-EOS.undent

Library/Formula/armadillo.rb

 
 class Armadillo < Formula
   homepage 'http://arma.sourceforge.net/'
-  url 'http://sourceforge.net/projects/arma/files/armadillo-3.4.3.tar.gz'
-  sha1 'a89adc51fa01640bfe463d9120cae57b2c073f8e'
+  url 'http://sourceforge.net/projects/arma/files/armadillo-3.4.4.tar.gz'
+  sha1 'e293a56695e7447cf5caa395932f1f0d41e13ffc'
 
   depends_on 'cmake' => :build
   depends_on 'boost'

Library/Formula/arow++.rb

+require 'formula'
+
+class Arowxx < Formula
+  homepage 'http://code.google.com/p/arowpp/'
+  url 'http://arowpp.googlecode.com/files/AROW%2B%2B-0.1.2.tar.gz'
+  sha1 '82d3a25ea30db1b3b412a0ba723f6196ebb69d52'
+
+  def install
+    system "./configure", "--prefix=#{prefix}"
+    system "make install"
+  end
+end

Library/Formula/asciidoc.rb

 
 class Asciidoc < Formula
   homepage 'http://www.methods.co.nz/asciidoc'
-  url 'http://downloads.sourceforge.net/project/asciidoc/asciidoc/8.6.7/asciidoc-8.6.7.tar.gz'
-  sha1 '5fc55496b2a23e2cc1dcc1f6b1f75dd06fcdefa1'
+  url 'http://downloads.sourceforge.net/project/asciidoc/asciidoc/8.6.8/asciidoc-8.6.8.tar.gz'
+  sha1 '2fd88f6ca9d2a5e09045fb300f4a908fe6eeb092'
 
   head 'https://code.google.com/p/asciidoc/', :using => :hg
 

Library/Formula/asciitex.rb

 require 'formula'
 
 class Asciitex < Formula
-  url 'http://downloads.sourceforge.net/project/asciitex/asciiTeX-0.21.tar.gz'
   homepage 'http://asciitex.sourceforge.net'
+  url 'http://downloads.sourceforge.net/project/asciitex/asciiTeX-0.21.tar.gz'
   sha1 'b37d300910952c117f82f77dd2da99a7b9a79db7'
 
   def install

Library/Formula/atk.rb

 
 class Atk < Formula
   homepage 'http://library.gnome.org/devel/atk/'
-  url 'http://ftp.gnome.org/pub/gnome/sources/atk/2.4/atk-2.4.0.tar.xz'
-  sha256 '091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d'
+  url 'http://ftp.gnome.org/pub/gnome/sources/atk/2.6/atk-2.6.0.tar.xz'
+  sha256 'eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f'
 
   depends_on 'pkg-config' => :build
   depends_on 'glib'

Library/Formula/autojump.rb

 require 'formula'
 
 class Autojump < Formula
-  homepage 'https://github.com/joelthelion/autojump/wiki'
-  url 'https://github.com/downloads/joelthelion/autojump/autojump_v20.tar.gz'
-  sha1 '7de157feb90dc22d5959914fa531844c68d5ba7b'
+  homepage 'https://github.com/joelthelion/autojump#name'
+  url 'https://github.com/downloads/joelthelion/autojump/autojump_v21.0.3.tar.gz'
+  sha1 'b81308d6ff50680cb74795195e93427557a938ad'
 
   head 'https://github.com/joelthelion/autojump.git'
 
   def install
-    inreplace 'autojump.sh', '/etc/profile.d/', "#{prefix}/etc/"
+    inreplace 'bin/autojump.sh', ' /etc/profile.d/', " #{prefix}/etc/"
 
-    bin.install 'autojump'
-    man1.install 'autojump.1'
-    (prefix+'etc').install 'autojump.sh' => 'autojump'
-    (prefix+'etc').install 'autojump.bash', 'autojump.zsh'
-    (share+'zsh/site-functions').install '_j'
+    bin.install 'bin/autojump'
+    man1.install 'docs/autojump.1'
+    (prefix+'etc').install 'bin/autojump.sh', 'bin/autojump.bash', 'bin/autojump.zsh'
+    (share+'zsh/site-functions').install 'bin/_j'
   end
 
   def caveats; <<-EOS.undent
-    Add the following lines to your ~/.bash_profile or ~/.zshrc file (and
-    remember to source the file to update your current session):
-    if [ -f `brew --prefix`/etc/autojump ]; then
-      . `brew --prefix`/etc/autojump
-    fi
+
+    Add the following line to your ~/.bash_profile or ~/.zshrc file (and remember
+    to source the file to update your current session):
+
+    [[ -f `brew --prefix`/etc/autojump.sh ]] && . `brew --prefix`/etc/autojump.sh
+
     EOS
   end
 end

Library/Formula/autopsy.rb

   def install
     (var+"lib/autopsy").mkpath
     mv 'lib', 'libexec'
-    prefix.install %w{ COPYING global.css help libexec pict }
+    prefix.install %w{ global.css help libexec pict }
     prefix.install Dir['*.txt']
     (prefix+"conf.pl").write autcfg
     inreplace 'base/autopsy.base', '/tmp/autopsy', prefix

Library/Formula/avro-cpp.rb

+require 'formula'
+
+class AvroCpp < Formula
+  homepage 'http://avro.apache.org/'
+  url 'http://www.apache.org/dyn/closer.cgi?path=avro/avro-1.7.2/cpp/avro-cpp-1.7.2.tar.gz'
+  sha1 'f9116583e4f230288317410404b066664722f9e4'
+
+  depends_on 'cmake' => :build
+  depends_on 'boost'
+
+  def install
+    system "cmake", ".", *std_cmake_args
+    system "make install"
+  end
+end

Library/Formula/bamtools.rb

   # they're not installed by default. Sent upstream:
   # https://github.com/pezmaster31/bamtools/pull/55
   def patches
-     DATA
+    DATA
   end
 
   def install

Library/Formula/bash.rb

   url 'http://ftpmirror.gnu.org/bash/bash-4.2.tar.gz'
   mirror 'http://ftp.gnu.org/gnu/bash/bash-4.2.tar.gz'
   sha256 'a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8'
-  version '4.2.37'
+  version '4.2.39'
 
   depends_on 'readline'
 
-  # Vendor the patches.
-  # The mirrors are unreliable for getting the patches, and the more patches
-  # there are, the more unreliable they get. Pulling these patches inline.
-  # Upstream patches can be found in:
-  # http://ftpmirror.gnu.org/bash/bash-4.2-patches
-  def patches; DATA; end
+  # Vendor the patches. The mirrors are unreliable for getting the patches,
+  # and the more patches there are, the more unreliable they get. Upstream
+  # patches can be found in: http://ftpmirror.gnu.org/bash/bash-4.2-patches
+  def patches
+    { :p0 => "https://raw.github.com/gist/4008180/443bc2c712ca9151a9e34e13be1b3a00e9a190d0/bash-4.2-001-039.patch" }
+  end
 
   def install
     system "./configure", "--prefix=#{prefix}", "--with-installed-readline"
     EOS
   end
 end
-
-__END__
-diff --git a/assoc.c b/assoc.c
-index bbc7b17..4561de4 100644
---- a/assoc.c
-+++ b/assoc.c
-@@ -77,6 +77,11 @@ assoc_insert (hash, key, value)
-   b = hash_search (key, hash, HASH_CREATE);
-   if (b == 0)
-     return -1;
-+  /* If we are overwriting an existing element's value, we're not going to
-+     use the key.  Nothing in the array assignment code path frees the key
-+     string, so we can free it here to avoid a memory leak. */
-+  if (b->key != key)
-+    free (key);
-   FREE (b->data);
-   b->data = value ? savestring (value) : (char *)0;
-   return (0);
-diff --git a/bashline.c b/bashline.c
-index 52c6de6..3cbb18f 100644
---- a/bashline.c
-+++ b/bashline.c
-@@ -121,6 +121,9 @@ static int bash_directory_completion_hook __P((char **));
- static int filename_completion_ignore __P((char **));
- static int bash_push_line __P((void));
- 
-+static rl_icppfunc_t *save_directory_hook __P((void));
-+static void reset_directory_hook __P((rl_icppfunc_t *));
-+
- static void cleanup_expansion_error __P((void));
- static void maybe_make_readline_line __P((char *));
- static void set_up_new_line __P((char *));
-@@ -243,10 +246,17 @@ int force_fignore = 1;
- /* Perform spelling correction on directory names during word completion */
- int dircomplete_spelling = 0;
- 
-+/* Expand directory names during word/filename completion. */
-+int dircomplete_expand = 0;
-+int dircomplete_expand_relpath = 0;
-+
- static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:";
- static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:";
- /* )) */
- 
-+static const char *default_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~";	/*}*/
-+static char *custom_filename_quote_characters = 0;
-+
- static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL;
- 
- static int dot_in_path = 0;
-@@ -501,7 +511,7 @@ initialize_readline ()
- 
-   /* Tell the completer that we might want to follow symbolic links or
-      do other expansion on directory names. */
--  rl_directory_rewrite_hook = bash_directory_completion_hook;
-+  set_directory_hook ();
- 
-   rl_filename_rewrite_hook = bash_filename_rewrite_hook;
- 
-@@ -529,7 +539,7 @@ initialize_readline ()
-   enable_hostname_completion (perform_hostname_completion);
- 
-   /* characters that need to be quoted when appearing in filenames. */
--  rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~";	/*}*/
-+  rl_filename_quote_characters = default_filename_quote_characters;
- 
-   rl_filename_quoting_function = bash_quote_filename;
-   rl_filename_dequoting_function = bash_dequote_filename;
-@@ -564,8 +574,10 @@ bashline_reset ()
-   tilde_initialize ();
-   rl_attempted_completion_function = attempt_shell_completion;
-   rl_completion_entry_function = NULL;
--  rl_directory_rewrite_hook = bash_directory_completion_hook;
-   rl_ignore_some_completions_function = filename_completion_ignore;
-+  rl_filename_quote_characters = default_filename_quote_characters;
-+
-+  set_directory_hook ();
- }
- 
- /* Contains the line to push into readline. */
-@@ -1279,6 +1291,9 @@ attempt_shell_completion (text, start, end)
-   matches = (char **)NULL;
-   rl_ignore_some_completions_function = filename_completion_ignore;
- 
-+  rl_filename_quote_characters = default_filename_quote_characters;
-+  set_directory_hook ();
-+
-   /* Determine if this could be a command word.  It is if it appears at
-      the start of the line (ignoring preceding whitespace), or if it
-      appears after a character that separates commands.  It cannot be a
-@@ -1591,6 +1606,12 @@ command_word_completion_function (hint_text, state)
- 	    }
- 	  else
- 	    {
-+	     if (dircomplete_expand && dot_or_dotdot (filename_hint))
-+		{
-+		  dircomplete_expand = 0;
-+		  set_directory_hook ();
-+		  dircomplete_expand = 1;
-+		}
- 	      mapping_over = 4;
- 	      goto inner;
- 	    }
-@@ -1791,6 +1812,9 @@ globword:
- 
-  inner:
-   val = rl_filename_completion_function (filename_hint, istate);
-+  if (mapping_over == 4 && dircomplete_expand)
-+    set_directory_hook ();
-+
-   istate = 1;
- 
-   if (val == 0)
-@@ -2693,6 +2717,52 @@ bash_filename_rewrite_hook (fname, fnlen)
-   return conv;
- }
- 
-+/* Functions to save and restore the appropriate directory hook */
-+/* This is not static so the shopt code can call it */
-+void
-+set_directory_hook ()
-+{
-+  if (dircomplete_expand)
-+    {
-+      rl_directory_completion_hook = bash_directory_completion_hook;
-+      rl_directory_rewrite_hook = (rl_icppfunc_t *)0;
-+    }
-+  else
-+    {
-+      rl_directory_rewrite_hook = bash_directory_completion_hook;
-+      rl_directory_completion_hook = (rl_icppfunc_t *)0;
-+    }
-+}
-+
-+static rl_icppfunc_t *
-+save_directory_hook ()
-+{
-+  rl_icppfunc_t *ret;
-+
-+  if (dircomplete_expand)
-+    {
-+      ret = rl_directory_completion_hook;
-+      rl_directory_completion_hook = (rl_icppfunc_t *)NULL;
-+    }
-+  else
-+    {
-+      ret = rl_directory_rewrite_hook;
-+      rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL;
-+    }
-+
-+  return ret;
-+}
-+
-+static void
-+restore_directory_hook (hookf)
-+     rl_icppfunc_t *hookf;
-+{
-+  if (dircomplete_expand)
-+    rl_directory_completion_hook = hookf;
-+  else
-+    rl_directory_rewrite_hook = hookf;
-+}
-+
- /* Handle symbolic link references and other directory name
-    expansions while hacking completion.  This should return 1 if it modifies
-    the DIRNAME argument, 0 otherwise.  It should make sure not to modify
-@@ -2702,20 +2772,31 @@ bash_directory_completion_hook (dirname)
-      char **dirname;
- {
-   char *local_dirname, *new_dirname, *t;
--  int return_value, should_expand_dirname;
-+  int return_value, should_expand_dirname, nextch, closer;
-   WORD_LIST *wl;
-   struct stat sb;
- 
--  return_value = should_expand_dirname = 0;
-+  return_value = should_expand_dirname = nextch = closer = 0;
-   local_dirname = *dirname;
- 
--  if (mbschr (local_dirname, '$'))
--    should_expand_dirname = 1;
-+  if (t = mbschr (local_dirname, '$'))
-+    {
-+      should_expand_dirname = '$';
-+      nextch = t[1];
-+      /* Deliberately does not handle the deprecated $[...] arithmetic
-+	 expansion syntax */
-+      if (nextch == '(')
-+	closer = ')';
-+      else if (nextch == '{')
-+	closer = '}';
-+      else
-+	nextch = 0;
-+    }
-   else
-     {
-       t = mbschr (local_dirname, '`');
-       if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0)
--	should_expand_dirname = 1;
-+	should_expand_dirname = '`';
-     }
- 
- #if defined (HAVE_LSTAT)
-@@ -2739,6 +2820,23 @@ bash_directory_completion_hook (dirname)
- 	  free (new_dirname);
- 	  dispose_words (wl);
- 	  local_dirname = *dirname;
-+	  /* XXX - change rl_filename_quote_characters here based on
-+	     should_expand_dirname/nextch/closer.  This is the only place
-+	     custom_filename_quote_characters is modified. */
-+	  if (rl_filename_quote_characters && *rl_filename_quote_characters)
-+	    {
-+	      int i, j, c;
-+	      i = strlen (default_filename_quote_characters);
-+	      custom_filename_quote_characters = xrealloc (custom_filename_quote_characters, i+1);
-+	      for (i = j = 0; c = default_filename_quote_characters[i]; i++)
-+		{
-+		  if (c == should_expand_dirname || c == nextch || c == closer)
-+		    continue;
-+		  custom_filename_quote_characters[j++] = c;
-+		}
-+	      custom_filename_quote_characters[j] = '\0';
-+	      rl_filename_quote_characters = custom_filename_quote_characters;
-+	    }
- 	}
-       else
- 	{
-@@ -2758,11 +2856,31 @@ bash_directory_completion_hook (dirname)
-       local_dirname = *dirname = new_dirname;
-     }
- 
-+  /* no_symbolic_links == 0 -> use (default) logical view of the file system.
-+     local_dirname[0] == '.' && local_dirname[1] == '/' means files in the
-+     current directory (./).
-+     local_dirname[0] == '.' && local_dirname[1] == 0 means relative pathnames
-+     in the current directory (e.g., lib/sh).
-+     XXX - should we do spelling correction on these? */
-+
-+  /* This is test as it was in bash-4.2: skip relative pathnames in current
-+     directory.  Change test to
-+      (local_dirname[0] != '.' || (local_dirname[1] && local_dirname[1] != '/'))
-+     if we want to skip paths beginning with ./ also. */
-   if (no_symbolic_links == 0 && (local_dirname[0] != '.' || local_dirname[1]))
-     {
-       char *temp1, *temp2;
-       int len1, len2;
- 
-+      /* If we have a relative path
-+      		(local_dirname[0] != '/' && local_dirname[0] != '.')
-+	 that is canonical after appending it to the current directory, then
-+	 	temp1 = temp2+'/'
-+	 That is,
-+	 	strcmp (temp1, temp2) == 0
-+	 after adding a slash to temp2 below.  It should be safe to not
-+	 change those.
-+      */
-       t = get_working_directory ("symlink-hook");
-       temp1 = make_absolute (local_dirname, t);
-       free (t);
-@@ -2797,7 +2915,15 @@ bash_directory_completion_hook (dirname)
- 	      temp2[len2 + 1] = '\0';
- 	    }
- 	}
--      return_value |= STREQ (local_dirname, temp2) == 0;
-+
-+      /* dircomplete_expand_relpath == 0 means we want to leave relative
-+	 pathnames that are unchanged by canonicalization alone.
-+	 *local_dirname != '/' && *local_dirname != '.' == relative pathname
-+	 (consistent with general.c:absolute_pathname())
-+	 temp1 == temp2 (after appending a slash to temp2) means the pathname
-+	 is not changed by canonicalization as described above. */
-+      if (dircomplete_expand_relpath || ((local_dirname[0] != '/' && local_dirname[0] != '.') && STREQ (temp1, temp2) == 0))
-+	return_value |= STREQ (local_dirname, temp2) == 0;
-       free (local_dirname);
-       *dirname = temp2;
-       free (temp1);
-@@ -3002,12 +3128,13 @@ bash_complete_filename_internal (what_to_do)
- 
-   orig_func = rl_completion_entry_function;
-   orig_attempt_func = rl_attempted_completion_function;
--  orig_dir_func = rl_directory_rewrite_hook;
-   orig_ignore_func = rl_ignore_some_completions_function;
-   orig_rl_completer_word_break_characters = rl_completer_word_break_characters;
-+
-+  orig_dir_func = save_directory_hook ();
-+
-   rl_completion_entry_function = rl_filename_completion_function;
-   rl_attempted_completion_function = (rl_completion_func_t *)NULL;
--  rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL;
-   rl_ignore_some_completions_function = filename_completion_ignore;
-   rl_completer_word_break_characters = " \t\n\"\'";
- 
-@@ -3015,10 +3142,11 @@ bash_complete_filename_internal (what_to_do)
- 
-   rl_completion_entry_function = orig_func;
-   rl_attempted_completion_function = orig_attempt_func;
--  rl_directory_rewrite_hook = orig_dir_func;
-   rl_ignore_some_completions_function = orig_ignore_func;
-   rl_completer_word_break_characters = orig_rl_completer_word_break_characters;
- 
-+  restore_directory_hook (orig_dir_func);
-+
-   return r;
- }
- 
-diff --git a/bashline.h b/bashline.h
-index 9daa8f9..38964ea 100644
---- a/bashline.h
-+++ b/bashline.h
-@@ -33,10 +33,15 @@ extern void bashline_reset __P((void));
- extern void bashline_reinitialize __P((void));
- extern int bash_re_edit __P((char *));
- 
-+extern void bashline_set_event_hook __P((void));
-+extern void bashline_reset_event_hook __P((void));
-+
- extern int bind_keyseq_to_unix_command __P((char *));
- 
- extern char **bash_default_completion __P((const char *, int, int, int, int));
- 
-+void set_directory_hook __P((void));
-+
- /* Used by programmable completion code. */
- extern char *command_word_completion_function __P((const char *, int));
- extern char *bash_groupname_completion_function __P((const char *, int));
-diff --git a/builtins/declare.def b/builtins/declare.def
-index 55206fa..8b9b850 100644
---- a/builtins/declare.def
-+++ b/builtins/declare.def
-@@ -513,6 +513,11 @@ declare_internal (list, local_var)
- 	      *subscript_start = '[';	/* ] */
- 	      var = assign_array_element (name, value, 0);	/* XXX - not aflags */
- 	      *subscript_start = '\0';
-+	      if (var == 0)	/* some kind of assignment error */
-+		{
-+		  assign_error++;
-+		  NEXT_VARIABLE ();
-+		}
- 	    }
- 	  else if (simple_array_assign)
- 	    {
-diff --git a/builtins/fc.def b/builtins/fc.def
-index 257029d..9b298cb 100644
---- a/builtins/fc.def
-+++ b/builtins/fc.def
-@@ -304,7 +304,7 @@ fc_builtin (list)
-   last_hist = i - rh - hist_last_line_added;
- 
-   /* XXX */
--  if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0)
-+  if (i == last_hist && hlist[last_hist] == 0)
-     while (last_hist >= 0 && hlist[last_hist] == 0)
-       last_hist--;
-   if (last_hist < 0)
-@@ -475,7 +475,7 @@ fc_gethnum (command, hlist)
-      HIST_ENTRY **hlist;
- {
-   int sign, n, clen, rh;
--  register int i, j;
-+  register int i, j, last_hist;
-   register char *s;
- 
-   sign = 1;
-@@ -495,7 +495,15 @@ fc_gethnum (command, hlist)
-      has been enabled (interactive or not) should use it in the last_hist
-      calculation as if it were on. */
-   rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list);
--  i -= rh + hist_last_line_added;
-+  last_hist = i - rh - hist_last_line_added;
-+
-+  if (i == last_hist && hlist[last_hist] == 0)
-+    while (last_hist >= 0 && hlist[last_hist] == 0)
-+      last_hist--;
-+  if (last_hist < 0)
-+    return (-1);
-+
-+  i = last_hist;
- 
-   /* No specification defaults to most recent command. */
-   if (command == NULL)
-diff --git a/builtins/mapfile.def b/builtins/mapfile.def
-index ec1e32e..a5064a3 100644
---- a/builtins/mapfile.def
-+++ b/builtins/mapfile.def
-@@ -195,13 +195,9 @@ mapfile (fd, line_count_goal, origin, nskip, callback_quantum, callback, array_n
-   /* Reset the buffer for bash own stream */
-   interrupt_immediately++;
-   for (array_index = origin, line_count = 1; 
--       zgetline (fd, &line, &line_length, unbuffered_read) != -1;
--       array_index++, line_count++) 
-+ 	zgetline (fd, &line, &line_length, unbuffered_read) != -1;
-+	array_index++) 
-     {
--      /* Have we exceeded # of lines to store? */
--      if (line_count_goal != 0 && line_count > line_count_goal) 
--	break;
--
-       /* Remove trailing newlines? */
-       if (flags & MAPF_CHOP)
- 	do_chop (line);
-@@ -217,6 +213,11 @@ mapfile (fd, line_count_goal, origin, nskip, callback_quantum, callback, array_n
- 	}
- 
-       bind_array_element (entry, array_index, line, 0);
-+
-+      /* Have we exceeded # of lines to store? */
-+      line_count++;
-+      if (line_count_goal != 0 && line_count > line_count_goal) 
-+	break;
-     }
- 
-   xfree (line);
-diff --git a/builtins/printf.def b/builtins/printf.def
-index 7892cb5..71a7c00 100644
---- a/builtins/printf.def
-+++ b/builtins/printf.def
-@@ -255,6 +255,8 @@ printf_builtin (list)
- #endif
- 	    {
- 	      vflag = 1;
-+	      if (vbsize == 0)
-+		vbuf = xmalloc (vbsize = 16);
- 	      vblen = 0;
- 	      if (vbuf)
- 		vbuf[0] = 0;
-@@ -465,6 +467,9 @@ printf_builtin (list)
- 		  secs = shell_start_time;	/* roughly $SECONDS */
- 		else
- 		  secs = arg;
-+#if defined (HAVE_TZSET)
-+		sv_tz ("TZ");		/* XXX -- just make sure */
-+#endif
- 		tm = localtime (&secs);
- 		n = strftime (timebuf, sizeof (timebuf), timefmt, tm);
- 		free (timefmt);
-diff --git a/builtins/read.def b/builtins/read.def
-index c4a668a..4915220 100644
---- a/builtins/read.def
-+++ b/builtins/read.def
-@@ -642,6 +642,12 @@ assign_vars:
- 	  xfree (input_string);
- 	  return EXECUTION_FAILURE;	/* readonly or noassign */
- 	}
-+      if (assoc_p (var))
-+	{
-+          builtin_error (_("%s: cannot convert associative to indexed array"), arrayname);
-+	  xfree (input_string);
-+	  return EXECUTION_FAILURE;	/* existing associative array */
-+	}
-       array_flush (array_cell (var));
- 
-       alist = list_string (input_string, ifs_chars, 0);
-@@ -731,7 +737,7 @@ assign_vars:
- 	      xfree (t1);
- 	    }
- 	  else
--	    var = bind_read_variable (varname, t);
-+	    var = bind_read_variable (varname, t ? t : "");
- 	}
-       else
- 	{
-@@ -792,7 +798,7 @@ assign_vars:
-       xfree (t);
-     }
-   else
--    var = bind_read_variable (list->word->word, input_string);
-+    var = bind_read_variable (list->word->word, input_string ? input_string : "");
- 
-   if (var)
-     {
-diff --git a/builtins/shopt.def b/builtins/shopt.def
-index 27685aa..6cd8c4f 100644
---- a/builtins/shopt.def
-+++ b/builtins/shopt.def
-@@ -61,6 +61,10 @@ $END
- #include "common.h"
- #include "bashgetopt.h"
- 
-+#if defined (READLINE)
-+#  include "../bashline.h"
-+#endif
-+
- #if defined (HISTORY)
- #  include "../bashhist.h"
- #endif
-@@ -94,7 +98,7 @@ extern int extended_glob;
- extern int hist_verify, history_reediting, perform_hostname_completion;
- extern int no_empty_command_completion;
- extern int force_fignore;
--extern int dircomplete_spelling;
-+extern int dircomplete_spelling, dircomplete_expand;
- 
- extern int enable_hostname_completion __P((int));
- #endif
-@@ -121,6 +125,10 @@ static int set_compatibility_level __P((char *, int));
- static int set_restricted_shell __P((char *, int));
- #endif
- 
-+#if defined (READLINE)
-+static int shopt_set_complete_direxpand __P((char *, int));
-+#endif
-+
- static int shopt_login_shell;
- static int shopt_compat31;
- static int shopt_compat32;
-@@ -150,6 +158,7 @@ static struct {
-   { "compat40", &shopt_compat40, set_compatibility_level },
-   { "compat41", &shopt_compat41, set_compatibility_level },
- #if defined (READLINE)
-+  { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
-   { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL },
- #endif
-   { "dotglob", &glob_dot_filenames, (shopt_set_func_t *)NULL },
-@@ -535,6 +544,17 @@ set_compatibility_level (option_name, mode)
-   return 0;
- }
- 
-+#if defined (READLINE)
-+static int
-+shopt_set_complete_direxpand (option_name, mode)
-+     char *option_name;
-+     int mode;
-+{
-+  set_directory_hook ();
-+  return 0;
-+}
-+#endif
-+
- #if defined (RESTRICTED_SHELL)
- /* Don't allow the value of restricted_shell to be modified. */
- 
-diff --git a/command.h b/command.h
-index 5d62046..fb71229 100644
---- a/command.h
-+++ b/command.h
-@@ -97,6 +97,7 @@ enum command_type { cm_for, cm_case, cm_while, cm_if, cm_simple, cm_select,
- #define W_HASCTLESC	0x200000	/* word contains literal CTLESC characters */
- #define W_ASSIGNASSOC	0x400000	/* word looks like associative array assignment */
- #define W_ARRAYIND	0x800000	/* word is an array index being expanded */
-+#define W_ASSNGLOBAL	0x1000000	/* word is a global assignment to declare (declare/typeset -g) */
- 
- /* Possible values for subshell_environment */
- #define SUBSHELL_ASYNC	0x01	/* subshell caused by `command &' */
-diff --git a/doc/bash.1 b/doc/bash.1
-index 0ba4f8e..103d27e 100644
---- a/doc/bash.1
-+++ b/doc/bash.1
-@@ -8948,6 +8948,16 @@ parameter expansion as a special character.  The single quotes must match
- quoted.  This is the behavior of posix mode through version 4.1.
- The default bash behavior remains as in previous versions.
- .TP 8
-+.B direxpand
-+If set,
-+.B bash
-+replaces directory names with the results of word expansion when performing
-+filename completion.  This changes the contents of the readline editing
-+buffer.
-+If not set,
-+.B bash
-+attempts to preserve what the user typed.
-+.TP 8
- .B dirspell
- If set,
- .B bash
-diff --git a/doc/bashref.texi b/doc/bashref.texi
-index b4fd8d3..ae982d5 100644
---- a/doc/bashref.texi
-+++ b/doc/bashref.texi
-@@ -4535,6 +4535,13 @@ parameter expansion as a special character.  The single quotes must match
- quoted.  This is the behavior of @sc{posix} mode through version 4.1.
- The default Bash behavior remains as in previous versions.
- 
-+@item direxpand
-+If set, Bash
-+replaces directory names with the results of word expansion when performing
-+filename completion.  This changes the contents of the readline editing
-+buffer.
-+If not set, Bash attempts to preserve what the user typed.
-+
- @item dirspell
- If set, Bash
- attempts spelling correction on directory names during word completion 
-diff --git a/error.c b/error.c
-index 72da9f5..1eac01c 100644
---- a/error.c
-+++ b/error.c
-@@ -200,7 +200,11 @@ report_error (format, va_alist)
- 
-   va_end (args);
-   if (exit_immediately_on_error)
--    exit_shell (1);
-+    {
-+      if (last_command_exit_value == 0)
-+	last_command_exit_value = 1;
-+      exit_shell (last_command_exit_value);
-+    }
- }
- 
- void
-diff --git a/execute_cmd.c b/execute_cmd.c
-index 485b0c7..7432c85 100644
---- a/execute_cmd.c
-+++ b/execute_cmd.c
-@@ -2196,6 +2196,7 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
-   if (ignore_return && cmd)
-     cmd->flags |= CMD_IGNORE_RETURN;
- 
-+#if defined (JOB_CONTROL)
-   lastpipe_flag = 0;
-   begin_unwind_frame ("lastpipe-exec");
-   lstdin = -1;
-@@ -2204,7 +2205,7 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
-      current shell environment. */
-   if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
-     {
--      lstdin = move_to_high_fd (0, 0, 255);
-+      lstdin = move_to_high_fd (0, 1, -1);
-       if (lstdin > 0)
- 	{
- 	  do_piping (prev, pipe_out);
-@@ -2215,15 +2216,19 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
- 	  lastpipe_jid = stop_pipeline (0, (COMMAND *)NULL);	/* XXX */
- 	  add_unwind_protect (lastpipe_cleanup, lastpipe_jid);
- 	}
--      cmd->flags |= CMD_LASTPIPE;
-+      if (cmd)
-+	cmd->flags |= CMD_LASTPIPE;
-     }	  
-   if (prev >= 0)
-     add_unwind_protect (close, prev);
-+#endif
- 
-   exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close);
- 
-+#if defined (JOB_CONTROL)
-   if (lstdin > 0)
-     restore_stdin (lstdin);
-+#endif
- 
-   if (prev >= 0)
-     close (prev);
-@@ -2246,7 +2251,9 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close)
-       unfreeze_jobs_list ();
-     }
- 
-+#if defined (JOB_CONTROL)
-   discard_unwind_frame ("lastpipe-exec");
-+#endif
- 
-   return (exec_result);
- }
-@@ -3575,13 +3582,13 @@ fix_assignment_words (words)
- {
-   WORD_LIST *w;
-   struct builtin *b;
--  int assoc;
-+  int assoc, global;
- 
-   if (words == 0)
-     return;
- 
-   b = 0;
--  assoc = 0;
-+  assoc = global = 0;
- 
-   for (w = words; w; w = w->next)
-     if (w->word->flags & W_ASSIGNMENT)
-@@ -3598,12 +3605,17 @@ fix_assignment_words (words)
- #if defined (ARRAY_VARS)
- 	if (assoc)
- 	  w->word->flags |= W_ASSIGNASSOC;
-+	if (global)
-+	  w->word->flags |= W_ASSNGLOBAL;
- #endif
-       }
- #if defined (ARRAY_VARS)
-     /* Note that we saw an associative array option to a builtin that takes
-        assignment statements.  This is a bit of a kludge. */
--    else if (w->word->word[0] == '-' && strchr (w->word->word, 'A'))
-+    else if (w->word->word[0] == '-' && (strchr (w->word->word+1, 'A') || strchr (w->word->word+1, 'g')))
-+#else
-+    else if (w->word->word[0] == '-' && strchr (w->word->word+1, 'g'))
-+#endif
-       {
- 	if (b == 0)
- 	  {
-@@ -3613,10 +3625,11 @@ fix_assignment_words (words)
- 	    else if (b && (b->flags & ASSIGNMENT_BUILTIN))
- 	      words->word->flags |= W_ASSNBLTIN;
- 	  }
--	if (words->word->flags & W_ASSNBLTIN)
-+	if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'A'))
- 	  assoc = 1;
-+	if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'g'))
-+	  global = 1;
-       }
--#endif
- }
- 
- /* Return 1 if the file found by searching $PATH for PATHNAME, defaulting
-diff --git a/expr.c b/expr.c
-index 2177cfa..14cdca2 100644
---- a/expr.c
-+++ b/expr.c
-@@ -476,19 +476,23 @@ expassign ()
- 
-       if (special)
- 	{
-+	  if ((op == DIV || op == MOD) && value == 0)
-+	    {
-+	      if (noeval == 0)
-+		evalerror (_("division by 0"));
-+	      else
-+	        value = 1;
-+	    }
-+
- 	  switch (op)
- 	    {
- 	    case MUL:
- 	      lvalue *= value;
- 	      break;