passenger 6.0.27 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab5e0b4fb1e58dd770651eec27056d3d3a7761d8524f7a382b16137342b5850c
-  data.tar.gz: f9d8949295d993a17a00b7c4005fc9cba61d67fb328d295d8c823b113e96548c
+  metadata.gz: 96818fb3f8a0d9486ccc47610988cd7e32455882fbef40628bcff1a93dc8593b
+  data.tar.gz: e9c8cbf28dbd24116ace4b1513ccab363c9e3a4b21d6802ba09f08b6d9351c6d
 SHA512:
-  metadata.gz: 2211987d9318b7577f81417197063c11c4f97c74d860e96186983d36c130dd978a061b3c559bd1a78770bcc0479cdaf3fca8a96f7bddd47620f8d4b3ef5f2e60
-  data.tar.gz: 54fd0372a0d6261b41486576f8ebc824f3d92e701278f58d410b895293be396552bf6e818fb272e1a27536d8575958af6ef9b197e5396786a7279900c00859dd
+  metadata.gz: 727fbee6a1567fdbabbac326d00cba509552b961e49a5cb11444e6cbc8d2ac3534dd5580b1e39bcc9343d3c3b7791687bf1162ce3a74921b963c99a7d1e11f20
+  data.tar.gz: fa7b90688e782885b530da59463ac24aeaad7ca1663ae368ac6eaaa54a1e50602d68c1c891b0dc090a65d558f9770ab72703ac0d4483ac841840cbf765c03663

data/CHANGELOG

@@ -1,5 +1,45 @@
-Release 6.0.27 (Not yet released)
- * Upgrade Boost from 1.86 → 1.87.
+Release 6.1.1 (Not yet released)
+-------------
+ * [Ruby] Improve support for Ruby 4 and Frozen String Literals. Closes GH-2619.
+ * [Ubuntu] Add packages for Ubuntu 25.10 "questing", remove packages for Ubuntu 25.04 "plucky".
+ * Upgrade Boost from 1.87 -> 1.90.
+ * [Nginx] Fixes bug with unbuffered uploads. Closes GH-2575.
+ * [Nginx] Upgrades preferred Nginx to 1.28.0 from 1.26.3.
+ * [Nginx] The preferred PCRE2 version is now 10.46 (previously 10.45).
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - ccache: 4.11.2 -> 4.12.2
+   - cmake: 4.0.0 -> 4.2.1
+   - curl: 8.12.1 -> 8.17.0
+   - git: 2.49.0 -> 2.52.0
+   - gnupg:2.4.7 -> 2.4.8
+   - libffi:3.4.7 -> 3.5.2
+   - libgcrypt:1.11.0 -> 1.11.2
+   - libgpg_error:1.51 -> 1.58
+   - libreadline:8.2 -> 8.3
+   - openssl:3.4.1 -> 3.6.0
+   - pcre2:10.45 -> 10.47
+   - pinentry:1.3.1 -> 1.3.2
+   - rubygems: 3.6.6 -> 4.0.2
+   - rubys:
+     - dropped 3.1.7
+     - 3.2.8 -> 3.2.9
+     - 3.3.7 -> 3.3.10
+     - 3.4.2 -> 3.4.8
+
+
+Release 6.1.0
+-------------
+ * [Ruby] Fix compatibility with Rackup while maintaining compatibility with Rack 3. Closes GH-2602.
+ * A C++14 compiler is now required to compile Passenger.
+ * Add rpm packages for EL10 (RHEL, Rocky, Alma).
+ * [Standalone] Fixes security update checker with builtin engine.
+ * [Debian] Add Debian 13 Trixie packages. Closes GH-2622.
+ * [Ubuntu] Add packages for Ubuntu 25.04 "plucky".
+
+
+Release 6.0.27
+-------------
+ * Upgrade Boost from 1.86 -> 1.87.
  * Remove Passenger admin panel (Fuse).
  * Fix compilation on FreeBSD.
  * [Ruby] Fix compatibility with Rack 2 While maintaining compatibility with Rack 3. Closes GH-2595.

data/CONTRIBUTORS

@@ -5,6 +5,7 @@ Alessandro Lenzen
 Alex Osborne
 Alex Tomlins
 Aman Gupta
+Amy Gurski
 Andre Ferraz
 Andre Nathan
 Andrei Belov
@@ -133,3 +134,4 @@ W. Andrew Loe III
 Weyert de Boer
 Yichun Zhang
 亀田 義裕
+須藤大輔 (SUDO Daisuke)

data/Rakefile

@@ -26,22 +26,15 @@ $LOAD_PATH.unshift("#{SOURCE_ROOT}/src/ruby_supportlib")
 # Otherwise all Ruby commands will take slightly longer to start, which messes up
 # timing-sensitive tests like those in the C++ test suite.
 if defined?(Bundler)
-  clean_env = nil
-
-  if Bundler.respond_to?(:with_original_env)
-    Bundler.with_original_env do
-      clean_env = ENV.to_hash.dup
-    end
-  elsif Bundler.respond_to?(:with_unbundled_env)
-    Bundler.with_unbundled_env do
-      clean_env = ENV.to_hash.dup
-    end
+  if Bundler.respond_to?(:original_env)
+    clean_env = Bundler.original_env
+  elsif Bundler.respond_to?(:unbundled_env)
+    clean_env = Bundler.unbundled_env
   else
-    Bundler.with_clean_env do
-      clean_env = ENV.to_hash.dup
-    end
+    clean_env = Bundler.clean_env
   end
   ENV.replace(clean_env)
+
   ARGV.each do |arg|
     if arg =~ /^(\w+)=(.*)$/m
       ENV[$1] = $2

data/bin/passenger-install-apache2-module

@@ -412,16 +412,16 @@ private
     if @compile
       puts "cd #{PhusionPassenger.build_system_dir}"
       if ENV['TRACE']
-        rake = "#{PlatformInfo.rake_command} --trace RELEASE=yes"
+        rake_args = "--trace RELEASE=yes"
       else
-        rake = "#{PlatformInfo.rake_command} RELEASE=yes"
+        rake_args = "RELEASE=yes"
       end
-      command = "env NOEXEC_DISABLE=1 #{rake} apache2:clean apache2"
+      command = "env NOEXEC_DISABLE=1 #{@rake_command || PlatformInfo.rake_command} #{rake_args} apache2:clean apache2"
       if PhusionPassenger.packaging_method == "homebrew"
         # Running apache2:clean deletes some object files needed
         # by passenger-install-nginx-module, so we ensure those
         # object files are compiled.
-        command << " nginx"
+        command += " nginx"
       end
       return sh(command)
     else
@@ -435,14 +435,14 @@ private
   end
 
   def config_snippet
-    result = "<IfModule mod_passenger.c>\n" +
-      "  PassengerRoot #{PhusionPassenger.install_spec}\n" +
-      "  PassengerDefaultRuby #{PlatformInfo.ruby_command}\n"
+    result = ["<IfModule mod_passenger.c>",
+      "  PassengerRoot #{PhusionPassenger.install_spec}",
+      "  PassengerDefaultRuby #{PlatformInfo.ruby_command}"]
     if PhusionPassenger.packaging_method == "rpm"
-      result << "  PassengerInstanceRegistryDir /var/run/passenger-instreg\n"
+      result << "  PassengerInstanceRegistryDir /var/run/passenger-instreg"
     end
     result << "</IfModule>"
-    result
+    result.join("\n")
   end
 
   def apache2_config_snippets
@@ -574,18 +574,14 @@ private
   end
 
   def remove_duplicate_comment_blocks(filename, begin_marker, end_marker)
-    contents = File.open(filename, "rb") do |f|
-      f.read
-    end
+    contents = File.binread(filename)
     regexp = /#{Regexp.escape begin_marker}.*?#{Regexp.escape end_marker}\n?/m
     if m = regexp.match(contents)
       offset = m.end(0)
-      rest = contents.slice!(m.end(0) .. -1)
+      rest = contents.slice!(offset .. -1)
       rest.gsub!(regexp, '')
       contents << rest
-      File.open(filename, "wb") do |f|
-        f.write(contents)
-      end
+      File.binwrite(filename, contents)
     end
   end
 
@@ -916,9 +912,9 @@ parser = OptionParser.new do |opts|
 
   indent = ' ' * 37
   opts.separator "Options:"
-  opts.on("-a", "--auto", String, "Automatically build the Apache module,\n" <<
-          "#{indent}without interactively asking for user\n" <<
-          "#{indent}input.") do
+  opts.on("-a", "--auto", String, ["Automatically build the Apache module,",
+          "#{indent}without interactively asking for user",
+          "#{indent}input."].join("\n")) do
     options[:auto] = true
   end
   opts.on("--apxs2-path PATH", String, "Path to 'apxs2' command.") do |value|
@@ -927,9 +923,9 @@ parser = OptionParser.new do |opts|
   opts.on("--apr-config-path PATH", String, "Path to 'apr-config' command.") do |value|
     ENV['APR_CONFIG'] = value
   end
-  opts.on("--languages NAMES", "Comma-separated list of interested\n" <<
-      "#{indent}languages (e.g.\n" <<
-      "#{indent}'ruby,python,nodejs,meteor')") do |value|
+  opts.on("--languages NAMES", ["Comma-separated list of interested",
+      "#{indent}languages (e.g.",
+      "#{indent}'ruby,python,nodejs,meteor')"].join("\n")) do |value|
     options[:languages] = value.split(",")
   end
   opts.on("--no-compile", "Skip compilation.") do
@@ -943,6 +939,9 @@ parser = OptionParser.new do |opts|
   #   "#{indent}create backups of the existing files.") do
   # options[:backup_config] = false
   #end
+  opts.on("--rake-command COMMAND", String, "Customize Rake command to use") do |value|
+    options[:rake_command] = value
+  end
   opts.on("--force-colors", "Display colors even if stdout is not a TTY") do
     options[:colorize] = true
   end

data/bin/passenger-install-nginx-module

@@ -156,7 +156,6 @@ class Installer < PhusionPassenger::AbstractInstaller
 
   def before_install
     super
-    myself = `whoami`.strip
     @working_dir = PhusionPassenger::Utils.mktmpdir("passenger.", PlatformInfo.tmpexedir)
   end
 
@@ -230,7 +229,7 @@ private
     new_screen
     puts "<banner>Compiling Passenger support files...</banner>"
     Dir.chdir(PhusionPassenger.build_system_dir) do
-      return sh("env NOEXEC_DISABLE=1 #{PlatformInfo.rake_command} nginx:clean nginx RELEASE=yes")
+      return sh("env NOEXEC_DISABLE=1 #{@rake_command || PlatformInfo.rake_command} nginx:clean nginx RELEASE=yes")
     end
   end
 
@@ -479,7 +478,7 @@ private
       new_screen
       puts "<banner>Compiling and installing Nginx...</banner>"
       if !sh(build_nginx_configure_command(prefix, extra_configure_flags)) ||
-         !sh("make") ||
+         !sh("make -j#{@make_concurrency || 1}") ||
          !sh("make install")
         return false
       end
@@ -526,10 +525,7 @@ private
   def insert_passenger_config_snippets(prefix)
     config_file = locate_nginx_config_file(prefix)
     contents = File.read(config_file)
-    contents.sub!(/^http \{/,
-      "http {\n" <<
-      "    passenger_root #{PhusionPassenger.install_spec};\n" <<
-      "    passenger_ruby #{PlatformInfo.ruby_command};\n")
+    contents.sub!(/^http \{/, "http {\n    passenger_root #{PhusionPassenger.install_spec};\n    passenger_ruby #{PlatformInfo.ruby_command};\n")
     File.open(config_file, 'w') do |f|
       f.write(contents)
     end
@@ -557,20 +553,20 @@ private
     ].compact.join(" ").strip
 
     command = "sh ./configure --prefix='#{prefix}' "
-    command << "--with-http_ssl_module "
-    command << "--with-http_v2_module "
-    command << "--with-http_realip_module "
-    command << "--with-http_gzip_static_module "
-    command << "--with-http_stub_status_module "
-    command << "--with-http_addition_module "
-    command << "--with-cc-opt=#{Shellwords.escape extra_cflags} "
-    command << "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
+    command += "--with-http_ssl_module "
+    command += "--with-http_v2_module "
+    command += "--with-http_realip_module "
+    command += "--with-http_gzip_static_module "
+    command += "--with-http_stub_status_module "
+    command += "--with-http_addition_module "
+    command += "--with-cc-opt=#{Shellwords.escape extra_cflags} "
+    command += "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
     if @pcre_source_dir
-      command << "--with-pcre='#{@pcre_source_dir}' "
+      command += "--with-pcre='#{@pcre_source_dir}' "
     elsif !pcre_is_installed?
-      command << "--without-http_rewrite_module "
+      command += "--without-http_rewrite_module "
     end
-    command << "--add-module='#{PhusionPassenger.nginx_module_source_dir}' #{extra_configure_flags}"
+    command += "--add-module='#{PhusionPassenger.nginx_module_source_dir}' #{extra_configure_flags}"
     command.strip!
     return command
   end
@@ -584,11 +580,15 @@ private
           end
           Dir.chdir("#{safe_tmpdir}") do
             # Nginx checks for PCRE in multiple places...
-            system("(gcc -I/usr/local/include -I/usr/include/pcre2 " <<
-              "-I/usr/pkg/include -I/opt/local/include " <<
-              "-I/opt/homebrew/include " <<
-              "-DPCRE2_CODE_UNIT_WIDTH=8 " <<
-              "-c passenger-check.c) >/dev/null 2>/dev/null")
+            system(["gcc",
+                    "-I/usr/local/include",
+                    "-I/usr/include/pcre2",
+                    "-I/usr/pkg/include",
+                    "-I/opt/local/include",
+                    "-I/opt/homebrew/include",
+                    "-DPCRE2_CODE_UNIT_WIDTH=8",
+                    "-c", "passenger-check.c",
+                    ">/dev/null", "2>/dev/null"].join(' '))
           end
         ensure
           File.unlink("#{safe_tmpdir}/passenger-check.c") rescue nil
@@ -603,8 +603,7 @@ private
     # We do this instead of using #file, for Ruby 1.8.5 support.
     digest = Digest::SHA256.new
     File.open(path, "rb") do |f|
-      buf = ''
-      buf.force_encoding('binary') if buf.respond_to?(:force_encoding)
+      buf = String.new(encoding: Encoding::BINARY)
       while !f.eof?
         f.read(1024 * 16, buf)
         digest.update(buf)
@@ -626,38 +625,42 @@ parser = OptionParser.new do |opts|
 
   indent = ' ' * 37
   opts.separator "Options:"
-  opts.on("--auto", "Automatically confirm 'Press ENTER to\n" <<
-          "#{indent}continue' prompts.") do
+  opts.on("--auto", "Automatically confirm 'Press ENTER to\n#{indent}continue' prompts.") do
     options[:auto] = true
   end
-  opts.on("--prefix=DIR", String, "Use the given Nginx install prefix instead\n" <<
-          "#{indent}of asking for it interactively.") do |dir|
+  opts.on("--prefix=DIR", String, "Use the given Nginx install prefix instead\n#{indent}of asking for it interactively.") do |dir|
     options[:prefix] = dir
   end
-  opts.on("--auto-download", "Download and install Nginx automatically,\n" <<
-          "#{indent}instead of asking interactively whether to\n" <<
-          "#{indent}download+install or to use an existing\n" <<
-          "#{indent}Nginx source directory.") do
+  opts.on("--auto-download", ["Download and install Nginx automatically,",
+          "#{indent}instead of asking interactively whether to",
+          "#{indent}download+install or to use an existing",
+          "#{indent}Nginx source directory."].join("\n")) do
     options[:auto_download] = true
   end
-  opts.on("--nginx-source-dir=DIR", String, "Compile and install Nginx using the given\n" <<
-          "#{indent}Nginx source directory, instead of\n" <<
-          "#{indent}interactively asking to download+install\n" <<
-          "#{indent}or to use an existing Nginx source\n" <<
-          "#{indent}directory. Conflicts with --auto-download.") do |dir|
+  opts.on("--nginx-source-dir=DIR", String, ["Compile and install Nginx using the given",
+          "#{indent}Nginx source directory, instead of",
+          "#{indent}interactively asking to download+install",
+          "#{indent}or to use an existing Nginx source",
+          "#{indent}directory. Conflicts with --auto-download."].join("\n")) do |dir|
     options[:nginx_source_dir] = dir
   end
-  opts.on("--extra-configure-flags=STRING", String, "Pass these extra flags to Nginx's\n" <<
-          "#{indent}'configure' script, instead of asking for\n" <<
-          "#{indent}it interactively. Specify 'none' if you\n" <<
-          "#{indent}do not want to pass additional flags but do\n" <<
-          "#{indent}not want this installer to ask\n" <<
-          "#{indent}interactively either.") do |flags|
+  opts.on("--extra-configure-flags=STRING", String, ["Pass these extra flags to Nginx's",
+          "#{indent}'configure' script, instead of asking for",
+          "#{indent}it interactively. Specify 'none' if you",
+          "#{indent}do not want to pass additional flags but do",
+          "#{indent}not want this installer to ask",
+          "#{indent}interactively either."].join("\n")) do |flags|
     options[:extra_configure_flags] = flags
   end
-  opts.on("--languages NAMES", "Comma-separated list of interested\n" <<
-      "#{indent}languages (e.g.\n" <<
-      "#{indent}'ruby,python,nodejs,meteor')") do |value|
+  opts.on("--rake-command COMMAND", String, "Customize Rake command to use") do |value|
+    options[:rake_command] = value
+  end
+  opts.on("--make-concurrency N", Integer, "Use N parallel jobs when running 'make'.") do |n|
+    options[:make_concurrency] = n
+  end
+  opts.on("--languages NAMES", ["Comma-separated list of interested",
+      "#{indent}languages (e.g.",
+      "#{indent}'ruby,python,nodejs,meteor')"].join("\n")) do |value|
     options[:languages] = value.split(",")
   end
   opts.on("--force-colors", "Display colors even if stdout is not a TTY") do

data/bin/passenger-status

@@ -258,8 +258,7 @@ end
 
 def print_permission_error_message
   PhusionPassenger.require_passenger_lib 'platform_info/ruby'
-  STDERR.puts "*** ERROR: You are not authorized to query the status for this " <<
-    "#{PROGRAM_NAME} instance. Please try again with '#{PhusionPassenger::PlatformInfo.ruby_sudo_command}'."
+  STDERR.puts "*** ERROR: You are not authorized to query the status for this #{PROGRAM_NAME} instance. Please try again with '#{PhusionPassenger::PlatformInfo.ruby_sudo_command}'."
 end
 
 def format_with_xmllint(xml)
@@ -302,7 +301,7 @@ end
 
 def create_option_parser(options)
   return OptionParser.new do |opts|
-    nl = "\n" << " " * 37
+    nl = "\n#{" " * 37}"
     opts.banner = "Usage: passenger-status [options] [instance name]"
     opts.separator ""
     opts.separator "Tool for inspecting Phusion Passenger's internal status."
@@ -310,10 +309,10 @@ def create_option_parser(options)
 
     opts.separator "Options:"
     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}" <<
-            "or JSON description of the pool.") do |what|
+            ["Whether to show the pool's contents,",
+            "the currently running requests,",
+            "the backtraces of all threads or an XML",
+            "or JSON description of the pool."].join(nl)) do |what|
       if what !~ /\A(pool|server|requests|backtraces|xml|json|union_station)\Z/
         STDERR.puts "Invalid argument for --show."
         exit 1
@@ -321,9 +320,9 @@ def create_option_parser(options)
         options[:show] = what
       end
     end
-    opts.on("--no-header", "Do not display an informative header#{nl}" <<
-            "containing the timestamp, version number,#{nl}" <<
-            "etc.") do
+    opts.on("--no-header", ["Do not display an informative header",
+            "containing the timestamp, version number,",
+            "etc."].join(nl)) do
       options[:noheader] = true
     end
     opts.on("--force-colors", "Display colors even if stdout is not a TTY") do

data/build/common_library.rb

@@ -40,7 +40,7 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
   if OPTIMIZE
     optimize = "-O2"
     if LTO
-      optimize << " -flto"
+      optimize += " -flto"
     end
   end
 
@@ -109,8 +109,8 @@ if USE_VENDORED_LIBEV
   let(:libev_cflags) do
     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 += ' -Wno-ambiguous-member-template' if PlatformInfo.compiler_supports_wno_ambiguous_member_template?
+    result += ' -DUSE_VENDORED_LIBEV'
     result
   end
 
@@ -167,7 +167,7 @@ else
   let(:libev_cflags) do
     result = string_option('LIBEV_CFLAGS', '-I/usr/include/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 += ' -Wno-ambiguous-member-template' if PlatformInfo.compiler_supports_wno_ambiguous_member_template?
     result
   end