passenger 6.0.8 → 6.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b2e8a16828ef20d1b8913627ca3eb76851e9e8f2
-  data.tar.gz: 19b4d486f327404c54a4a8506040e8db86ad139b
+SHA256:
+  metadata.gz: 31a05868dd215b1999d12f6b03d72af3ea92674ee44ad6b8c4ac04656ee3e45f
+  data.tar.gz: 7b827c29786d69c42544e9ffd1be1a9a22bb7a7c5c290c4f58a9a4c092352034
 SHA512:
-  metadata.gz: 572f5728da8e7760703d56f05e7c7f5df40baad2d3f0d26ff67cb321c4f22c5a10e212dc866db69c46d5189929a739424725b50c7eab150969f14864e51e16ca
-  data.tar.gz: 8803471e222631f5f8ed0f26117814093b51327a9b18d59093b8d9cac0a1cba3075ba82b298071d6da60bc71447d1fb4307f161dacc3606d364161c95811fa56
+  metadata.gz: 0bfbb6358658b39082ddd04c56f6d9dcd8e3a1a8ea4309146d3c9fd0706fd936f60eb2cbedd4b4264e9a81a1723e3335ad4da746486eca41453ac5401e8bd5d7
+  data.tar.gz: ca7752ab7ddce1209e99f6e1a1c408d5c4363b821b3eb97c68cba9481ae8575ddebd46ab9e69f2e2fad182b4f4976f997ebdd17776280aaaa5ef2f0b04486c2e

data/CHANGELOG

@@ -1,3 +1,291 @@
+Release 6.0.20 (Not yet released)
+-------------
+ * Upgrades Boost from 1.81 -> 1.83.
+ * Upgrades http-parser from 2.3.0 -> 2.9.4.
+ * [Ubuntu] Adds packages for Ubuntu 23.10 "mantic".
+ * [Python] Address use of binary strings and file reads in python3.
+ * [Ruby] Address use of deprecated ActiveRecord method. Closes GH-2516.
+ * [ARM] fix arch for apache module on Arm Macs.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - cmake: 3.27.7 -> 3.28.1
+   - curl: 8.4.0 -> 8.5.0
+   - git: 2.42.0 -> 2.43.0
+   - libgcrypt: 1.10.2 -> 1.10.3
+   - libksba: 1.6.4 -> 1.6.5
+   - ntbtls: 0.3.1 -> 0.3.2
+   - openssl: 3.1.4 -> 3.2.0
+   - rubygems: 3.4.21 -> 3.5.4
+   - s3cmd: 2.3.0 -> 2.4.0
+   - rubies:
+     - 3.2.2 -> 3.2.3
+     - 3.3.0
+
+
+Release 6.0.19
+-------------
+ * [Ruby] Fix compatibility with Rack 3 header array. Closes GH-2503.
+ * [Ruby] Preserve `SIGPROF` signal handlers. Contributed by Ivo Anjo. Closes GH-2489.
+ * [Python] Replaces use of imp module with importlib in Python 3. Contributed by Rongxin Liu. Closes GH-2399 and GH-2501.
+ * [Ubuntu] Removes packages for Ubuntu 18.04 "Bionic" (EOL June 2023).
+ * Fixed a memory allocation bug in the security update checker.
+ * [Debian] Add Debian 12 Bookworm packages. Closes GH-2488.
+ * [RPM] Published arm64/aarch64 rpms for EL8 & EL9 (RHEL, Rocky, Alma). Closes GH-2452.
+ * [ARM] Publishes prebuilt arm64/aarch64 binaries for Passenger gem installs. Closes GH-2288.
+ * [ARM] Fixes a regression in Passenger 6.0.7 where strict-aliasing archs (notably: aarch64 aka ARM64) builds of Passenger were always building for big-endian archs. Closes GH-2451 and GH-2419.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - ccache: 4.6.3 -> 4.8.3
+   - cmake: 3.26.4 -> 3.27.7
+   - curl: 8.1.2 -> 8.4.0
+   - git: 2.41.0 -> 2.42.0
+   - gnupg: 2.4.2 -> 2.4.3
+   - libassuan: 2.5.5 -> 2.5.6
+   - libksba: 1.6.3 -> 1.6.4
+   - openssl: 3.1.1 -> 3.1.4
+   - rubygems: 3.4.13 -> 3.4.21
+   - zlib: 1.2.13 -> 1.3
+
+
+Release 6.0.18
+-------------
+ * Adds Ubuntu 23.04 "Lunar" packages, removes Ubuntu 22.10 "Kinetic" packages.
+ * Removes packages for Debian 9 "Stretch" (EOL June 2022).
+ * [RPM] Changes to building Nginx module packages for the latest supported Nginx module stream instead of the default.
+ * [Ruby] Makes Passenger more resilient to invalid byte sequences when loading the Ruby native extension. Contributed by Drew Wells.
+ * [Ruby] Add an `unhandled_exception_before_exit` event callback. Contributed by James Tomson.
+ * [Nginx] Upgrades preferred Nginx to 1.24.0 from 1.22.1.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - cmake: 3.25.1 -> 3.26.4
+   - curl: 7.87.0 -> 8.1.2
+   - git: 2.39.0 -> 2.41.0
+   - gnupg: 2.4.0 -> 2.4.2
+   - libgcrypt: 1.10.1 -> 1.10.2
+   - libgpg_error: 1.46 -> 1.47
+   - openssl: 3.0.7 -> 3.1.1
+   - rubygems: 3.4.3 -> 3.4.13
+   - zstd: 1.5.2 -> 1.5.5
+   - rubies:
+     - 2.7.7 -> 2.7.8
+     - 3.0.5 -> 3.0.6
+     - 3.1.3 -> 3.1.4
+     - 3.2.0 -> 3.2.2
+
+
+Release 6.0.17
+-------------
+ * [Enterprise] The `debug` gem is now supported for debugging on Ruby 3.1.
+ * Removed use of deprecated 'File.exists?' method for Ruby 3.2.0.
+ * Upgrades Boost to 1.81.
+ * Upgrades preferred Nginx to 1.22.1 from 1.20.2.
+ * Changes minimum supported macOS version to 10.14 Mojave.
+ * Adds support for a `PASSENGER_MAX_LOG_LINE_LENGTH_BYTES` environment variable. The default length remains at 8KB. Closes GH-2413.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - curl: 7.86.0 → 7.87.0
+   - git: 2.38.1 → 2.39.0
+   - gnupg: 2.3.8 → 2.4.0
+   - libksba: 1.6.2 → 1.6.3
+   - openssl: 1.1.1s → 3.0.7
+   - rubygems: 3.3.26 → 3.4.3
+   - rubies: added 3.2.0
+
+
+Release 6.0.16
+-------------
+ * Adds ARM64 (aarch64) packages for Ubuntu and Debian.
+ * Adds Ubuntu 22.10 "Kinetic" packages, removes Ubuntu 16.04 "Xenial" packages.
+ * Adds systemd private tmpdir workaround on Ubuntu/Debian. Closes GH-2397.
+ * Downgrade jsoncpp to 1.8.1 from 1.9.5 to fix invalid json generation bug. Closes GH-2445.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - cmake: 3.24.2 → 3.25.1
+   - curl: 7.85.0 → 7.86.0
+   - git 2.37.3 → 2.38.1
+   - gnupg: 2.3.7 → 2.3.8
+   - libgpg_error 1.45 → 1.46
+   - libksba 1.6.1 → 1.6.2
+   - openssl: 1.1.1q → 1.1.1s
+   - rubygems 3.3.22 → 3.3.26
+   - s3cmd 2.2.0 → 2.3.0
+   - zlib: 1.2.12 → 1.2.13
+   - rubies:
+     - 2.7.6 → 2.7.7
+     - 3.0.4 → 3.0.5
+     - 3.1.2 → 3.1.3
+
+
+Release 6.0.15
+-------------
+ * Restore ability to build against upstream libev. Contributed by Antonio Terceiro. Closes GH-1544.
+ * Improve rvm gemset detection. Closes GH-2420.
+ * Fix watchdog error on disable-log-prefix flag. Contributed by Paul Hanyzewski. Closes GH-2363.
+ * Upgrades Boost to 1.80.
+ * Fixed compilation on some platforms by explicitly using the stl queue. Closes GH-2440.
+ * Raise an error in case rack gets an ENOBUFS error. Contributed by Mathieu Jobin.
+ * Fixes interaction between preload bundler option and setenv RUBYOPT option. Closes GH-2424.
+ * Add rpm packages for el9 (RHEL, Rocky, Alma). Closes GH-2431.
+ * Upgrade jsoncpp to 1.9.5.
+ * Improve Solaris support for 11.3 & 11.4.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+ - ccache: 4.6 → 4.6.3
+ - cmake: 3.23.1 → 3.24.2
+ - curl: 7.82.0 → 7.85.0
+ - git: 2.36.0 → 2.37.3
+ - gnupg: 2.3.5 → 2.3.7
+ - libiconv: 1.16 → 1.17
+ - libksba: 1.6.0 → 1.6.1
+ - openssl: 1.1.1n → 1.1.1q
+ - pinentry: 1.2.0 → 1.2.1
+ - rubygems: 3.3.12 → 3.3.22
+
+
+Release 6.0.14
+-------------
+ * Removes use of rexml in passenger restart command, because it was removed from Ruby 3. Closes GH-2415.
+ * Adds Ubuntu 22.04 "Jammy" packages, and removes Ubuntu 21.10 "Impish" packages.
+ * Fixes a use after free regression introduced in 6.0.12.
+ * Fixed a warning about ERB.new argument deprecation in Ruby 3.1. Closes GH-2417.
+ * Removed google apis from error pages for easier GDPR compliance.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+   - cmake 3.22.3 → 3.23.1
+   - git 2.35.1 → 2.36.0
+   - gnupg 2.3.4 → 2.3.5
+   - libgcrypt 1.9.4 → 1.10.1
+   - libgpg_error 1.44 → 1.45
+   - ntbtls 0.3.0 → 0.3.1
+   - rubygems 3.3.9 → 3.3.12
+   - zlib 1.2.11 → 1.2.12
+   - ruby
+     - 2.6.9 → 2.6.10
+     - 2.7.5 → 2.7.6
+     - 3.0.3 → 3.0.4
+     - 3.1.1 → 3.1.2
+
+
+Release 6.0.13
+-------------
+ * Add WASM mime type, Closes GH-2398.
+ * Fix compilation on FreeBSD 13. Closes GH-2402.
+ * [Ruby] Fixes app process crash when ECONNRESET received.
+ * Fix automated fetching of pcre source for installer scripts.
+ * Bump preferred nginx 1.20.1 → 1.20.2.
+ * [Ruby] Add option to preload bundler. Closes GH-2409.
+
+   - Apache: PassengerPreloadBundler
+   - Nginx: passenger_preload_bundler
+   - Standalone: --preload_bundler
+
+ * [Node] Suppresses the winston circular dependency warning.
+ * [RPMs] EL8 RPMs are now built on Rocky linux, and should be compatible with Alma, Rocky, CentOS, and RHEL.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+   - ccache 4.4.2 → 4.6
+   - cmake 3.21.4 → 3.22.3
+   - curl 7.79.1 → 7.82.0
+   - git 2.33.1 → 2.35.1
+   - gnupg 2.3.3 → 2.3.4
+   - libgpg_error 1.42 → 1.44
+   - ntbtls 0.2.0 → 0.3.0
+   - openssl 1.1.1l → 1.1.1n
+   - rubygems 3.2.30 → 3.3.9
+   - zstd 1.5.0 → 1.5.2
+   - ruby
+     - dropped 2.4.10
+     - dropped 2.5.9
+     - 2.6.8 → 2.6.9
+     - 2.7.4 → 2.7.5
+     - 3.0.2 → 3.0.3
+     - added 3.1.1
+
+
+Release 6.0.12
+-------------
+ * [Debian] Fix compilation on 32 bit arm. Contributed by Antonio Terceiro.
+ * [Debian] Add Bullseye Debian packages.
+ * Add formatted error messages to responses. Contributed by Mohammad Aboelnour.
+ * Fixes for running under WSL 1. Contributed by Luke Pearce. Closes GH-2036.
+ * Upgrades Boost to 1.77. To go along with 32 bit arm fix.
+ * [MacOS] Fixes autodetection of openssl lib on apple silicon. Contributed by Taketo Takashima. Closes GH-2389.
+ * Reconnect to mongoid databases after fork, like we do for ActiveRecord. Contributed by Mohammad Aboelnour.
+ * [Ubuntu] add missing apache name in instance registry dir detection.
+ * [Ubuntu] replace hirsute apt packages with impish.
+ * [Nginx] add new config option to choose the status code returned when application spawning fails. (passenger_spawn_exception_status_code).
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+ - ccache: 4.4.1 → 4.4.2
+ - cmake: 3.21.2 → 3.21.4
+ - curl: 7.78.0 → 7.79.1
+ - git: 2.33.0 → 2.33.1
+ - gnupg: 2.3.2 → 2.3.3
+ - rubygems: 3.2.27 → 3.2.30
+ - s3cmd: 2.1.0 → 2.2.0
+
+
+Release 6.0.11
+-------------
+ * Fix compilation on GCC 4.4, fixes a regression in 6.0.8 where Passenger would no longer compiler without a C++11 compiler.
+ * [CentOS] Fix version detection on CentOS Stream. Contributed by Taketo Takashima. Closes GH-2377.
+ * [MacOS] Additionally look for PCRE in the new location that Homebrew has split it's packages into.
+ * Fix compilation on GCC < 4.5.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache: 4.3 → 4.4.1
+    - cmake: 3.20.5 → 3.21.2
+    - curl: 7.77.0 → 7.78.0
+    - git: 2.32.0 → 2.33.0
+    - gnupg: 2.3.1 → 2.3.2
+    - libgcrypt: 1.9.3 → 1.9.4
+    - openssl: 1.1.1k → 1.1.1l
+    - pinentry: 1.1.1 → 1.2.0
+    - rubygems: 3.2.21 → 3.2.27
+    - rubies:
+      - 2.6.7 → 2.6.8
+      - 2.7.3 → 2.7.4
+      - 3.0.1 → 3.0.2
+
+
+Release 6.0.10
+-------------
+ * [Debian/Ubuntu] Fix a regression in `passenger_system_ruby` where Ruby 3 couldn't be found.
+ * [CentOS/RHEL] Bump rpm nginx dependency to match EPEL nginx (was 1.16.1 now 1.20.1). Closes GH-2364.
+ * [Nginx] The preferred PCRE version is now 8.45 (previously 8.44).
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - cmake 3.20.3 → 3.20.5
+    - git 2.31.1 → 2.32.0
+    - libksba 1.5.1 → 1.6.0
+    - rubygems 3.2.19 → 3.2.21
+    - pcre 8.44 → 8.45
+
+
+Release 6.0.9
+-------------
+ * 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.

data/CONTRIBUTORS

@@ -1,4 +1,5 @@
 _why
+A compound of Fe and O
 Adam Duke
 Alessandro Lenzen
 Alex Osborne
@@ -8,8 +9,10 @@ Andre Ferraz
 Andre Nathan
 Andrei Belov
 Andy Allan
+Antonio Terceiro
 Benjamin Fleischer
 Bernd Ahlers
+Bernhard M. Wiedemann
 Camden Narzt (Phusion)
 Chad Fowler
 Chris Walquist
@@ -27,6 +30,7 @@ David Sissitka
 Dirk Mueller
 Dmitry Galinsky
 dr.dimitru
+drew-wells
 Dylan Vaughn
 Eric Covener
 Erik Ogan
@@ -44,33 +48,39 @@ Ian Kottman
 Igor Vuk
 isaac
 Isaac Reuben
+Ivo Anjo
 J Smith
 J.W. Koelewijn
 Jacob Elder
 Jacob Harris
 James Miller
+James Tomson
 Jan Berkel
 Janko Marohnić
 Jason Cannon
 jastix
 Jay Freeman (saurik)
 jbergler
+Jia L
 John Dewey
 John Leach
 Joshua Lund
 jpatterson
 Jude Nagurney
 Kenneth Powers
+Luke Pearce
 Luuk Hafkamp (Phusion)
 Luuk Hendriks (Phusion)
 MAEDA Go
 Magnus Holm
 Mark R. James
+Mathieu Jobin
 Matt Ozinga
 Michal Papis
 Michał Pokrywka
 Mike
 Mike Boone
+Mohammad Aboelnour
 Morton Jonuschat
 Nathaniel Bibler
 Neil Wilson
@@ -80,6 +90,7 @@ Oleksiy Shchukin
 Olle Jonsson
 Pat Downey
 Paul B
+Paul Hanyzewski
 Paul Kmiec
 Pepijn Looije
 Perry Smith
@@ -95,6 +106,7 @@ Rob Paisley
 Robin Bowes
 Romain Tartière
 ROMB
+Rongxin Liu
 Ruslan Ermilov (NGINX Inc)
 Ryan Schwartz
 Ryo Onodera
@@ -107,6 +119,9 @@ Sebastian Welther
 Slippy Douglas
 Stephen Bannasch
 Steven Chamberlain
+Taketo Takashima
+TheBerg
+Thomas Pfister
 Tim Bishop
 Tim Carey-Smith
 Tinco Andringa (Phusion)

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 = "https://ftp.pcre.org/pub/pcre/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
+    url = "https://sourceforge.net/projects/pcre/files/pcre/#{PREFERRED_PCRE_VERSION}/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz/download"
     dirname = "pcre-#{PREFERRED_PCRE_VERSION}"
     tarball = "#{@working_dir}/pcre.tar.gz"
 
@@ -575,6 +575,7 @@ private
             # Nginx checks for PCRE in multiple places...
             system("(gcc -I/usr/local/include -I/usr/include/pcre " <<
               "-I/usr/pkg/include -I/opt/local/include " <<
+              "-I/opt/homebrew/include " <<
               "-c passenger-check.c) >/dev/null 2>/dev/null")
           end
         ensure

data/bin/passenger-status

@@ -41,6 +41,7 @@ PhusionPassenger.require_passenger_lib 'config/utils'
 PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 require 'optparse'
 require 'socket'
+require 'json'
 require 'net/http'
 
 include PhusionPassenger::SharedConstants
@@ -114,7 +115,7 @@ end
 
 def show_status(instance, options)
   # if the noshow override is not specified, the default is to show the header, unless show=xml
-  if options[:noheader] != true && options[:show] != 'xml'
+  if options[:noheader] != true && !['xml','json'].include?(options[:show])
     print_header(STDOUT, instance)
   end
 
@@ -198,6 +199,30 @@ def show_status(instance, options)
       exit 2
     end
 
+  when 'json'
+    request = Net::HTTP::Get.new("/pool.json?secrets=#{options[:verbose]}")
+    try_performing_ro_admin_basic_auth(request, instance)
+    response = instance.http_request("agents.s/core_api", request)
+    if response.code.to_i / 100 == 2
+      indented = JSON.pretty_generate(JSON.parse(response.body))
+      if indented
+        puts indented
+      else
+        puts response.body
+      end
+    elsif response.code.to_i == 401
+      if response["pool-empty"] == "true"
+        puts "#{PROGRAM_NAME} is currently not serving any applications."
+      else
+        print_permission_error_message
+        exit 2
+      end
+    else
+      STDERR.puts "*** An error occured."
+      STDERR.puts "#{response.code}: #{response.body}"
+      exit 2
+    end
+
   when 'union_station'
     request = Net::HTTP::Get.new("/server.json")
     try_performing_ro_admin_basic_auth(request, instance)
@@ -284,12 +309,12 @@ def create_option_parser(options)
     opts.separator ""
 
     opts.separator "Options:"
-    opts.on("--show=pool|server|backtraces|xml|union_station", String,
+    opts.on("--show=pool|server|backtraces|xml|json|union_station", String,
             "Whether to show the pool's contents,#{nl}" <<
             "the currently running requests,#{nl}" <<
             "the backtraces of all threads or an XML#{nl}" <<
-            "description of the pool.") do |what|
-      if what !~ /\A(pool|server|requests|backtraces|xml|union_station)\Z/
+            "or JSON description of the pool.") do |what|
+      if what !~ /\A(pool|server|requests|backtraces|xml|json|union_station)\Z/
         STDERR.puts "Invalid argument for --show."
         exit 1
       else

data/build/common_library.rb

@@ -110,6 +110,7 @@ if USE_VENDORED_LIBEV
     result = '-Isrc/cxx_supportlib/vendor-modified/libev'
     # Apple Clang 4.2 complains about ambiguous member templates in ev++.h.
     result << ' -Wno-ambiguous-member-template' if PlatformInfo.compiler_supports_wno_ambiguous_member_template?
+    result << ' -DUSE_VENDORED_LIBEV'
     result
   end
 
@@ -245,7 +246,7 @@ end
 
 ########## WebSocket++ ##########
 
-let(:websocketpp_cflags) { '-Isrc/cxx_supportlib/vendor-copy/websocketpp' }
+let(:websocketpp_cflags) { '-Isrc/cxx_supportlib/vendor-modified/websocketpp' }
 let(:websocketpp_libs) { nil }
 
 

data/build/integration_tests.rb

@@ -39,7 +39,7 @@ end
 dependencies = integration_test_dependencies(:_apache2)
 desc "Run Apache 2 integration tests"
 task 'test:integration:apache2' => dependencies do
-  command = "bundle exec rspec -c -f s --tty integration_tests/apache2_tests.rb"
+  command = "bundle exec rspec -c -f d --tty integration_tests/apache2_tests.rb"
   if boolean_option('SUDO')
     command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
   end
@@ -52,7 +52,7 @@ end
 dependencies = integration_test_dependencies(:_nginx)
 desc "Run Nginx integration tests"
 task 'test:integration:nginx' => dependencies do
-  command = "bundle exec rspec -c -f s --tty integration_tests/nginx_tests.rb"
+  command = "bundle exec rspec -c -f d --tty integration_tests/nginx_tests.rb"
   if boolean_option('SUDO')
     command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
   end
@@ -69,7 +69,7 @@ end
 dependencies = integration_test_dependencies(:_nginx)
 desc "Run Passenger Standalone integration tests"
 task 'test:integration:standalone' => dependencies do
-  command = "bundle exec rspec -c -f s --tty integration_tests/standalone_tests.rb"
+  command = "bundle exec rspec -c -f d --tty integration_tests/standalone_tests.rb"
   if grep = string_option('E')
     command << " -e #{shesc grep}"
   end
@@ -78,7 +78,7 @@ end
 
 desc "Run native packaging tests"
 task 'test:integration:native_packaging' do
-  command = "bundle exec rspec -c -f s --tty integration_tests/native_packaging_spec.rb"
+  command = "bundle exec rspec -c -f d --tty integration_tests/native_packaging_spec.rb"
   if boolean_option('SUDO')
     command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
   end
@@ -105,8 +105,9 @@ task 'test:integration:native_packaging' do
     # The tests put /usr/bin and /usr/sbin first in PATH, causing /usr/bin/ruby to be used.
     # We should run the tests in /usr/bin/ruby too, so that native_support is compiled for
     # the same Ruby.
+    brew_prefix = `env -P /usr/local/bin:/opt/homebrew/bin brew --prefix`
     prefix = "env NATIVE_PACKAGING_METHOD=homebrew " +
-      "LOCATIONS_INI=/usr/local/Cellar/passenger/#{PhusionPassenger::VERSION_STRING}/libexec/src/ruby_supportlib/phusion_passenger/locations.ini"
+      "LOCATIONS_INI=#{brew_prefix}/Cellar/passenger/#{PhusionPassenger::VERSION_STRING}/libexec/src/ruby_supportlib/phusion_passenger/locations.ini"
     if PlatformInfo.in_rvm?
       prefix << " rvm-exec system /usr/bin/ruby -S"
     end
@@ -125,7 +126,7 @@ task 'test:restart' => dependencies do
   i = 1
   while true do
     puts "#{color_code_start}Test run #{i} (press Ctrl-C multiple times to abort)#{color_code_end}"
-    command = "bundle exec rspec -c -f s --tty integration_tests/apache2_tests.rb"
+    command = "bundle exec rspec -c -f d --tty integration_tests/apache2_tests.rb"
     if grep = string_option('E')
       command << " -e #{shesc grep}"
     end
@@ -136,7 +137,7 @@ end
 
 desc "Run source packaging tests"
 task 'test:source_packaging' do
-  command = 'bundle exec rspec -f s -c test/integration_tests/source_packaging_test.rb'
+  command = 'bundle exec rspec -f d -c test/integration_tests/source_packaging_test.rb'
   if grep = string_option('E')
     command << " -e #{shesc grep}"
   end

data/build/ruby_tests.rb

@@ -30,6 +30,6 @@ task 'test:ruby' => dependencies do
   if maybe_grep = string_option('E')
     maybe_grep = "-e #{shesc maybe_grep}"
   end
-  command = "rspec -c -f s --tty -P 'dont-autoload-anything' #{maybe_grep} ruby/*_spec.rb ruby/*/*_spec.rb"
+  command = "rspec -c -f d --tty -P 'dont-autoload-anything' #{maybe_grep} ruby/*_spec.rb ruby/*/*_spec.rb"
   sh "cd test && exec bundle exec #{command}"
 end

data/build/test_basics.rb

@@ -55,24 +55,27 @@ task 'test:install_deps' do
     bundle_args = ENV['BUNDLE_ARGS'].to_s
   end
 
-  yarn_args = ENV['YARN_ARGS'].to_s
+  npm_args = ENV['NPM_ARGS'].to_s
 
   if !PlatformInfo.locate_ruby_tool('bundle') || bundler_too_old?
     sh "#{gem_install} bundler"
   end
 
   if install_base_deps
-    sh "bundle install #{bundle_args} --without="
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0') || RUBY_PLATFORM =~ /darwin/
+      sh "bundle install #{bundle_args} --without="
+    else
+      sh "bundle install #{bundle_args} --without future"
+    end
   else
-    sh "bundle install #{bundle_args} --without base"
+    sh "bundle install #{bundle_args} --without base future"
   end
 
   if boolean_option('NODE_MODULES', default)
-    sh "yarn install #{yarn_args}"
+    sh "npm install #{npm_args}"
   end
 end
 
-
 def bundler_too_old?
   `bundle --version` =~ /version (.+)/
   version = $1.split('.').map { |x| x.to_i }