passenger 6.0.4 → 6.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0535dba6247039a28dfae09f32b405ad1adf599
-  data.tar.gz: 8842d4a2b0ce4faeb6f731bc4c94742c00f376a7
+  metadata.gz: 87f31709612878e26738f7b12b35f4bc97fb32f0
+  data.tar.gz: f3cf0d1c48fa1b478e6e5e4181191cc529a809fe
 SHA512:
-  metadata.gz: 49f85e5c9e4de3c9a0cc068ac630b943da61c6f617a156856ce12221c919cc4735cb279d6957fea91a35f8fe024ab020171fd086ccc1d9fcdd507108b86b94d9
-  data.tar.gz: f38614a083fc0e727da69cd758d568b4fe9d58bcedc47ada2513dff23dd412ff4ce34445364f0f7beb441926c9543109512a76d78fd8268b46c18711438b0fd4
+  metadata.gz: 3461d39a57d3be31000fddf9dbc73bf583533f3c3a89103651d4b71c56c902d6df5aa9fe757e1ee8fd051f9f3b5b03a654ef1ad836a3b957dcda49db3e6a498e
+  data.tar.gz: 31f67ea34f1dab5937dd85adebc6f24c49f293667108c4a9f43bafeb87f48390a5d565a434b82704cb8128930b3b4db6bbdd9a3a20649ef98c8d11bdd68a9629

data/CHANGELOG

@@ -1,3 +1,146 @@
+Release 6.0.9 (Not yet released)
+-------------
+ * Upgrades Boost to 1.76. Fixes a regression where some boost headers for comatibility with older distros were missing.
+ * Make building on Apple Silcon using homebrew openssl work. Contributed by TheBerg.
+ * Add Support for Ubuntu Hirsute.
+ * Remove prebuilt packages for Ubuntu Groovy.
+ * Properly support HTTP 418. Contributed by Thomas Pfister.
+ * Fix several C++ warnings about implicit copy operators/constructors.
+ * Bump preferred nginx 1.18.0 → 1.20.1.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache 4.2 → 4.3
+    - cmake 3.19.7 → 3.20.3
+    - curl 7.75.0 → 7.77.0
+    - git 2.31.0 → 2.31.1
+    - gnupg 2.2.27 → 2.3.1
+    - libgcrypt 1.9.2 → 1.9.3
+    - libksba 1.5.0 → 1.5.1
+    - ntbTLS added → 0.2.0
+    - zlib 1.4.9 → 1.5.0
+    - rubygems 3.2.15 → 3.2.19
+    - ruby:
+      - 2.3.8 → removed
+      - 2.5.8 → 2.5.9
+      - 2.6.6 → 2.6.7
+      - 2.7.2 → 2.7.3
+      - 3.0.0 → 3.0.1
+
+
+Release 6.0.8
+-------------
+ * [Apache] Fixes crash when restarting Apache on CentOS 8. Closes GH-2318.
+ * [Standalone] fix abort websockets on shutdown. Closes GH-2211.
+ * Fixes application process titles. They are now properly set to something like "Passenger RubyApp: ..." instead of "Passenger AppPreloader: ... (forking)".
+ * Upgrades Boost to 1.74.
+ * Allow passenger-status to detect passenger instance registry dir when systemd PrivateTmp dir is in use.
+ * Reduce the likelihood of a crash when using systemd PrivateTmp dir with Apache.
+ * Removed CentOS 6, and Debian Jessie prebuilt binaries and packages. Both are EOL.
+ * No-longer build 32 bit prebuilt binaries, as HBB dropped support.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache_version: 4.0 → 4.2
+    - cmake_version: 3.18.4 → 3.19.7
+    - curl_version: 7.73.0 → 7.75.0
+    - git_version: 2.29.1 → 2.31.0
+    - gnupg_version: 2.2.23 → 2.2.27
+    - libassuan_version: 2.5.4 → 2.5.5
+    - libgcrypt_version: 1.8.7 → 1.9.2
+    - libgpg_error_version: 1.39 → 1.42
+    - libksba_version: 1.4.0 → 1.5.0
+    - openssl_version: 1.1.1h → 1.1.1k
+    - pinentry_version: 1.1.0 → 1.1.1
+    - rubygems_version: 3.1.4 → 3.2.15
+    - zstd_version: 1.4.5 → 1.4.9
+    - ruby_versions + 3.0.0
+
+
+Release 6.0.7
+-------------
+ * Addresses regression introduced in 6.0.5 when attempting to establish database connection after fork and activerecord is not configured in the expected way. Closes GH-2281.
+ * Addresses regression introduced in 5.1.5 where hook scripts would fail to run. As a result the PASSENGER_ERROR_PAGE and PASSENGER_CONFIG_MANIFEST env vars have been removed from the passenger hook script environment.
+ * Match static rails assets on 8-digit content hash. Contributed by @mattozinga.
+ * Allow skipping the Apache/Nginx sections of the `passenger-memory-stats` output, through the `--no-apache` and `--no-nginx` commandline options. Closes GH-2306. Contributed by Saverio Miroddi (@saveriomiroddi).
+ * Fixes an issue where `passenger-memory-stats` would throw an error if a process went away while it was running. Closes GH-2305.
+ * Fixes a formatting issue with apr-1 include flags on macOS.
+ * Fixes a warning about BOOST_*_ENDIAN macros being deprecated by migrating to new suggested macros.
+ * Fixes an occasional issue with the node loader where the startup handshake would fail to record progress.
+ * Adds an option for specifying the address to bind ruby apps to, for sending requests directly to specific app instances:
+  - Standalone: direct_instance_request_address
+  - Nginx:      passenger_direct_instance_request_address
+  - Apache:     PassengerDirectInstanceRequestAddress
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache: 4.0 (was: 3.7.10)
+    - curl: 7.73.0 (was: 7.71.1)
+    - git: 2.29.1 (was: 2.27.0)
+    - gnupg: 2.2.23 (was: 2.2.21)
+    - libgpg_error: 1.39 (was: 1.38)
+    - ruby: 2.7.2 (was: 2.7.1)
+    - libassuan 2.5.4 (was: 2.5.3)
+    - libgcrypt 1.8.7 (was 1.8.6)
+    - OpenSSL 1.1.1h (was 1.0.2u)
+
+
+Release 6.0.6
+-------------
+ * Update gemspec with up to date metadata.
+ * Reverts the addition of the 'etc' gem to the Passenger gemspec, because it broke on normal ruby installs. Closes GH-2283.
+ * Builds Ubuntu focal Nginx dynamic module package against Nginx 1.18.0. Closes GH-2291.
+ * No longer providing prebuilt Ruby 2.1 or 2.2 binaries, they have been EOL for years and rubygems no longer supports them.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache 3.7.10 (was 3.7.9)
+    - Curl 7.71.1 (was 7.69.1)
+    - Git 2.27.0 (was 2.26.2)
+    - GnuPG 2.2.21 (was 2.2.20)
+    - libgpg_error 1.38 (was 1.37)
+    - libgcrypt 1.8.6 (was 1.8.5)
+    - RubyGems 3.1.4 (was 3.0.8)
+
+
+Release 6.0.5
+-------------
+
+ * [Enterprise] Fixed a regression (introduced in 5.0.0) where Flying Passenger could not update the Passenger configuration. Closes GH-1554.
+ * Adds Ubuntu 20.04 "Focal" packages, and removes Ubuntu 19.04 "Disco" packages.
+ * Adds RHEL / CentOS 8 packages.
+ * [Nginx] Converts CentOS 7 packages to provide a dynamic module instead of a full Nginx install.
+ * Fixes the encoding name for xml output from the `passenger-status --show=xml` command. Closes GH-2248.
+ * Adds the 'etc' gem as an explicit dependency. Closes GH-2124.
+ * Adds a user agent to the passenger pre-spawn script. Closes GH-1534.
+ * Fixes a compilation issue on FreeBSD. Closes GH-2240.
+ * Fixes an issue where rack bodies may not be processed correctly.
+ * Improves the database reconnection speed in forked processes. closes GH-2253.
+ * [Nginx] Adds a config option `passenger_temp_path` to set the path used for the disk backed response cache. Re-Closes GH-2075.
+ * [Apache] Protects the path info and script name passed to the app from modifications done by mod_security. Closes GH-2198.
+ * Ensures baseuri is set per request, even if config is loaded from cache. Closes GH-2117.
+ * Make temp dir toucher cleanup code more resilient to permissions issues.
+ * [Nginx] Bumps the preferred Nginx version to 1.18.0 (previously 1.17.3).
+ * [Nginx] The preferred PCRE version is now 8.44 (previously 8.43).
+ * Removed deprecated rubyforge gemspec property. Contributed by @olleolleolle.
+ * Adds an option for specifying the attributes on the sticky session cookie:
+	- Apache:     PassengerStickySessionsCookieAttributes     "SameSite=Lax; Secure;"
+	- Nginx:      passenger_sticky_sessions_cookie_attributes "SameSite=Lax; Secure;"
+	- Standalone: --sticky-sessions-cookie-attributes         "SameSite=Lax; Secure;"
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache 3.7.9 (was 3.7.3)
+    - Curl 7.69.1 (was 7.66.0)
+    - Git 2.26.2 (was 2.23.0)
+    - GnuPG 2.2.20 (was 2.2.17)
+    - libgpg_error 1.37 (was 1.36)
+    - OpenSSL 1.0.2u (was 1.0.2t)
+    - PCRE 8.44 (was 8.43)
+    - s3cmd 2.1.0 (was 2.0.2)
+    - RubyGems 3.0.8 (was 3.0.6)
+    - Rubies:
+      - 2.4.6 -> 2.4.10
+      - 2.5.5 -> 2.5.8
+      - 2.6.3 -> 2.6.6
+      + 2.7.1
+
+
 Release 6.0.4
 -------------
 
@@ -7,7 +150,7 @@ Release 6.0.4
 Release 6.0.3
 -------------
 
- * Add and option to specify the spawn dir during startup, which is specifically useful for CageFS users. Contributed by @plmnikulin. Closes GH-2145.
+ * Add an option to specify the spawn dir during startup, which is specifically useful for CageFS users. Contributed by @plmnikulin. Closes GH-2145.
 
     - Apache: `PassengerSpawnDir`
     - Nginx: `passenger_spawn_dir`

data/CONTRIBUTING.md

@@ -19,7 +19,7 @@
    * [Further reading](#further_reading)
  * [Pull requests](#pull_requests)
 
-Thank you for your interest in Phusion Passenger. Phusion Passenger is open source so your contributions are very welcome. Although we also provide a [commercial version](https://www.phusionpassenger.com/enterprise) and [commercial support](https://www.phusionpassenger.com/commercial_support), the core remains open source and we remain committed to keep it that way. This guide gives you an overview of the ways with which you can contribute, as well as contribution guidelines.
+Thank you for your interest in Phusion Passenger. Phusion Passenger is open source so your contributions are very welcome. Although we also provide a [commercial version](https://www.phusionpassenger.com/features#premium-features) and [commercial support](https://www.phusionpassenger.com/commercial_support), the core remains open source and we remain committed to keep it that way. This guide gives you an overview of the ways with which you can contribute, as well as contribution guidelines.
 
 You can contribute in one of the following areas:
 

data/CONTRIBUTORS

@@ -1,4 +1,5 @@
 _why
+A compound of Fe and O
 Adam Duke
 Alessandro Lenzen
 Alex Osborne
@@ -10,6 +11,7 @@ Andrei Belov
 Andy Allan
 Benjamin Fleischer
 Bernd Ahlers
+Bernhard M. Wiedemann
 Camden Narzt (Phusion)
 Chad Fowler
 Chris Walquist
@@ -50,10 +52,12 @@ Jacob Elder
 Jacob Harris
 James Miller
 Jan Berkel
+Janko Marohnić
 Jason Cannon
 jastix
 Jay Freeman (saurik)
 jbergler
+Jia L
 John Dewey
 John Leach
 Joshua Lund
@@ -65,6 +69,7 @@ Luuk Hendriks (Phusion)
 MAEDA Go
 Magnus Holm
 Mark R. James
+Matt Ozinga
 Michal Papis
 Michał Pokrywka
 Mike
@@ -72,8 +77,10 @@ Mike Boone
 Morton Jonuschat
 Nathaniel Bibler
 Neil Wilson
+Nicolas Maloeuvre
 Ninh Bui (Phusion)
 Oleksiy Shchukin
+Olle Jonsson
 Pat Downey
 Paul B
 Paul Kmiec
@@ -103,6 +110,8 @@ Sebastian Welther
 Slippy Douglas
 Stephen Bannasch
 Steven Chamberlain
+TheBerg
+Thomas Pfister
 Tim Bishop
 Tim Carey-Smith
 Tinco Andringa (Phusion)

data/README.md

@@ -1,20 +1,13 @@
 [![Gem Version](https://badge.fury.io/rb/passenger.svg)](https://badge.fury.io/rb/passenger)
-# <img src="images/passenger_logo.svg" alt="passenger logo" style="margin-bottom: -.2em; width: 1.4em"> Phusion Passenger
+# <img src="images/passenger_logo.svg" alt="passenger logo" style="margin-bottom: -.2em; width: 1.4em"> Phusion Passenger®
 <h3>Supercharge your Ruby, Node.js and Python apps</h3>
 
-[Phusion Passenger™](https://www.phusionpassenger.com/) is a web server and application server, designed to be fast, robust and lightweight. It takes a lot of complexity out of deploying web apps, adds powerful enterprise-grade features that are useful in production, and makes administration much easier and less complex. Phusion Passenger supports Ruby, Python, Node.js and Meteor, and is being used by high-profile companies such as **Apple, Pixar, New York Times, AirBnB, Juniper** etc as well as [over 650.000 websites](http://trends.builtwith.com/Web-Server/Phusion-Passenger).
+[Phusion Passenger®](https://www.phusionpassenger.com/) is a web server and application server, designed to be fast, robust and lightweight. It takes a lot of complexity out of deploying web apps, adds powerful enterprise-grade features that are useful in production, and makes administration much easier and less complex. Phusion Passenger supports Ruby, Python, Node.js and Meteor, and is being used by high-profile companies such as **Apple, Pixar, New York Times, AirBnB, Juniper** etc as well as [over 650.000 websites](http://trends.builtwith.com/Web-Server/Phusion-Passenger).
 
 <a href="https://vimeo.com/224923750"><img src="https://github.com/phusion/passenger/blob/stable-5.2/images/justin.png" height="400"></a><br><em>Phusion Passenger - the smart app server</em>
 
 <p>What makes Passenger so fast and reliable is its <strong>C++</strong> core, its <strong>zero-copy</strong> architecture, its <strong>watchdog</strong> system and its <strong>hybrid</strong> evented, multi-threaded and multi-process design.</p>
 
-## Fuse Panel - GUI for Passenger
-The <strong>smarter</strong> and <strong>simpler command center</strong> for your applications. <strong><a href="https://www.phusionpassenger.com/fuse-panel" target="_blank">Fuse Panel</a></strong> monitors your apps in near real-time, offers insights in your logs and enables analyzing and troubleshooting issues. New and exclusively available in the Fuse Panel is much-requested feature <strong>per-application log viewing and splitting</strong>.
-
-Regardless of if you’re running Passenger open source or you’re one of our enterprise customers, the Fuse Panel is available for free while in beta. <a href="https://www.phusionpassenger.com/fuse-panel" target="_blank">Give it a try</a>.
-
-<img src="https://github.com/phusion/passenger/blob/stable-5.2/images/spark.png" align="left" width="300">
-
 ### Learn more:
 - [Website](https://www.phusionpassenger.com/)
 - [Fuse Panel](https://www.phusionpassenger.com/fuse-panel)

data/bin/passenger-install-nginx-module

@@ -268,7 +268,7 @@ private
     new_screen
     puts "<banner>PCRE (required by Nginx) not installed, downloading it...</banner>"
 
-    url = "http://downloads.sourceforge.net/project/pcre/pcre/#{PREFERRED_PCRE_VERSION}/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
+    url = "https://ftp.pcre.org/pub/pcre/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
     dirname = "pcre-#{PREFERRED_PCRE_VERSION}"
     tarball = "#{@working_dir}/pcre.tar.gz"
 

data/bin/passenger-memory-stats

@@ -38,6 +38,7 @@ PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'admin_tools/memory_stats'
 PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
+require 'optparse'
 
 include PhusionPassenger
 
@@ -107,27 +108,78 @@ class Table
   end
 end
 
+# Parses the specific commandline options.
+#
+# Modeled after `passenger-status` logic, with minor tweaks.
+#
+class CommandLineOptionsParser
+  def parse
+    options = {}
+    parser = create_option_parser(options)
+
+    begin
+      parser.parse!
+      options
+    rescue OptionParser::ParseError => e
+      STDERR.puts e
+      STDERR.puts
+      STDERR.puts "Please see '--help' for valid options."
+
+      exit 1
+    end
+  end
+
+  private
+
+  def create_option_parser(options)
+    OptionParser.new do |opts|
+      opts.banner = "Usage: #{File.basename(__FILE__)} [-h|--help] [--no-apache] [--no-nginx]"
+
+      opts.separator ""
+      opts.separator "Tool for inspecting the application server and Phusion Passenger's memory statistics."
+      opts.separator ""
+
+      opts.separator "Options:"
+
+      opts.on("--no-apache", "Do not display the Apache statistics.") do
+        options[:no_apache] = true
+      end
+      opts.on("--no-nginx", "Do not display the Nginx statistics.") do
+        options[:no_nginx] = true
+      end
+    end
+  end
+end
+
 class App
   def initialize
     @stats = AdminTools::MemoryStats.new
     @colors = Utils::AnsiColors.new
   end
 
-  def start
+  def start(options = {})
+    print_apache_stats = !options.fetch(:no_apache, false)
+    print_nginx_stats = !options.fetch(:no_nginx, false)
+
     puts "Version: #{PhusionPassenger::VERSION_STRING}"
     puts "Date   : #{Time.now}"
-    if @stats.apache_processes
-      print_process_list("Apache processes", @stats.apache_processes)
-    else
-      puts "#{@colors.blue_bg}#{@colors.bold}#{@colors.yellow}------------- Apache processes -------------#{@colors.reset}\n"
-      STDERR.puts "*** WARNING: The Apache executable cannot be found."
-      STDERR.puts "Please set the APXS2 environment variable to your 'apxs2' " <<
-        "executable's filename, or set the HTTPD environment variable " <<
-        "to your 'httpd' or 'apache2' executable's filename."
+
+    if print_apache_stats
+      if @stats.apache_processes
+        print_process_list("Apache processes", @stats.apache_processes)
+      else
+        puts "#{@colors.blue_bg}#{@colors.bold}#{@colors.yellow}------------- Apache processes -------------#{@colors.reset}\n"
+        STDERR.puts "*** WARNING: The Apache executable cannot be found."
+        STDERR.puts "Please set the APXS2 environment variable to your 'apxs2' " <<
+          "executable's filename, or set the HTTPD environment variable " <<
+          "to your 'httpd' or 'apache2' executable's filename."
+      end
     end
 
-    puts
-    print_process_list("Nginx processes", @stats.nginx_processes)
+    if print_nginx_stats
+      puts
+      print_process_list("Nginx processes", @stats.nginx_processes)
+    end
 
     puts
     print_process_list("Passenger processes", @stats.passenger_processes, :show_ppid => false)
@@ -175,4 +227,5 @@ private
   end
 end
 
-App.new.start
+options = CommandLineOptionsParser.new.parse
+App.new.start(options)

data/build/common_library.rb

@@ -46,7 +46,7 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
 
   # Define compilation targets for .cpp files in src/cxx_supportlib/vendor-modified/boost/src/pthread.
   boost_object_files = []
-  Dir['src/cxx_supportlib/vendor-modified/boost/libs/**/*.cpp'].each do |source_file|
+  Dir['src/cxx_supportlib/vendor-modified/boost/libs/**/*.cpp'].sort.each do |source_file|
     object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
     boost_output_dir  = "#{output_dir}/boost"
     object_file = "#{boost_output_dir}/#{object_name}"
@@ -64,7 +64,7 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
 
   # Define compilation targets for .cpp files in src/cxx_supportlib/oxt.
   oxt_object_files = []
-  Dir['src/cxx_supportlib/oxt/*.cpp'].each do |source_file|
+  Dir['src/cxx_supportlib/oxt/*.cpp'].sort.each do |source_file|
     object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
     oxt_output_dir  = "#{output_dir}/oxt"
     object_file = "#{oxt_output_dir}/#{object_name}"
@@ -145,7 +145,7 @@ if USE_VENDORED_LIBEV
       "CC='#{cc_command}' CXX='#{cxx_command}' CFLAGS='#{cflags}' orig_CFLAGS=1"
   end
 
-  libev_sources = Dir["src/cxx_supportlib/vendor-modified/libev/{*.c,*.h}"]
+  libev_sources = Dir["src/cxx_supportlib/vendor-modified/libev/{*.c,*.h}"].sort
   file LIBEV_OUTPUT_DIR + ".libs/libev.a" => [LIBEV_OUTPUT_DIR + "Makefile"] + libev_sources do
     sh "rm -f #{LIBEV_OUTPUT_DIR}libev.la"
     sh "cd #{LIBEV_OUTPUT_DIR} && make libev.la V=1"
@@ -218,7 +218,7 @@ if USE_VENDORED_LIBUV
       "CC='#{cc_command}' CXX='#{cxx_command}' CFLAGS='#{cflags}'"
   end
 
-  libuv_sources = Dir["src/cxx_supportlib/vendor-copy/libuv/**/{*.c,*.h}"]
+  libuv_sources = Dir["src/cxx_supportlib/vendor-copy/libuv/**/{*.c,*.h}"].sort
   file LIBUV_OUTPUT_DIR + ".libs/libuv.a" => [LIBUV_OUTPUT_DIR + "Makefile"] + libuv_sources do
     sh "rm -f #{LIBUV_OUTPUT_DIR}/libuv.la"
     sh "cd #{LIBUV_OUTPUT_DIR} && make -j2 libuv.la V=1"

data/build/packaging.rb

@@ -22,6 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+homebrew_contents = "Homebrew recently banned empty files, so enjoy wasting some disk space for them"
+
 def recursive_copy_files(files, destination_dir, preprocess = false, variables = {})
   if !STDOUT.tty?
     puts "Copying files..."
@@ -69,7 +71,7 @@ task 'package:gem' => PhusionPassenger::Packaging::PREGENERATED_FILES do
   end
   begin
     if release_file
-      File.open(release_file, "w").close
+      File.write(release_file, homebrew_contents)
     end
     sh("gem build #{PhusionPassenger::PACKAGE_NAME}.gemspec")
   ensure
@@ -87,7 +89,7 @@ task 'package:tarball' => PhusionPassenger::Packaging::PREGENERATED_FILES do
   sh "mkdir -p #{PKG_DIR}/#{basename}"
   recursive_copy_files(PhusionPassenger::Packaging.files, "#{PKG_DIR}/#{basename}")
   if ENV['OFFICIAL_RELEASE']
-    File.open("#{PKG_DIR}/#{basename}/resources/release.txt", "w").close
+    File.write("#{PKG_DIR}/#{basename}/resources/release.txt", homebrew_contents)
   end
   if PlatformInfo.os_name_simple == "macosx"
     sh "cd #{PKG_DIR}/#{basename} && find . -print0 | xargs -0 touch -t '201310270000'"

data/build/support/cxx_dependency_map.rb

@@ -10069,6 +10069,7 @@ CXX_DEPENDENCY_MAP =
  "src/cxx_supportlib/SystemTools/ContainerHelpers.h"=>
   ["src/cxx_supportlib/FileTools/FileManip.h",
    "src/cxx_supportlib/StaticString.h",
+   "src/cxx_supportlib/StrIntTools/StrIntUtils.h",
    "src/cxx_supportlib/oxt/macros.hpp"],
  "src/cxx_supportlib/SystemTools/ProcessMetricsCollector.h"=>
   ["src/cxx_supportlib/Algorithms/Hasher.h",

data/dev/copy_boost_headers

@@ -97,7 +97,7 @@ PROGRAM_SOURCE = %q{
   #include <boost/thread.hpp>
   #include <boost/noncopyable.hpp>
   #include <boost/function.hpp>
-  #include <boost/bind.hpp>
+  #include <boost/bind/bind.hpp>
   #include <boost/container/vector.hpp>
   #include <boost/date_time/posix_time/posix_time.hpp>
   #include <boost/foreach.hpp>