passenger 6.0.27 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab5e0b4fb1e58dd770651eec27056d3d3a7761d8524f7a382b16137342b5850c
-  data.tar.gz: f9d8949295d993a17a00b7c4005fc9cba61d67fb328d295d8c823b113e96548c
+  metadata.gz: a8ecd4a23bcace3afe038c69160ef4696adea410390f6802e34c0ec659af25e0
+  data.tar.gz: 77d6784d2f2b1f1e09c136890323f9008edcc1de74bec1a6dcd4c2b54e358213
 SHA512:
-  metadata.gz: 2211987d9318b7577f81417197063c11c4f97c74d860e96186983d36c130dd978a061b3c559bd1a78770bcc0479cdaf3fca8a96f7bddd47620f8d4b3ef5f2e60
-  data.tar.gz: 54fd0372a0d6261b41486576f8ebc824f3d92e701278f58d410b895293be396552bf6e818fb272e1a27536d8575958af6ef9b197e5396786a7279900c00859dd
+  metadata.gz: 4d9b403739e985baa1e668cb5b0ae1356253a5734ac491d754cc330fa68d3afbfe277c658b04564adb0cfac4fbdccb6c1a3389db6c1b2991644148be77d041df
+  data.tar.gz: 5220f1aa9dd6d9e61258b00b9cfe1a3368e97e6b79c8373ce114a9c58cf0ba4d7e8bc8936be779450d44a33e9fb21fdd6ea4bf6d66fa1c444950ac403477421f

data/CHANGELOG

@@ -1,4 +1,14 @@
-Release 6.0.27 (Not yet released)
+Release 6.1.0 (Not yet released)
+-------------
+ * [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.
+
+
+Release 6.0.27
+-------------
  * Upgrade Boost from 1.86 → 1.87.
  * Remove Passenger admin panel (Fuse).
  * Fix compilation on FreeBSD.

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/bin/passenger-install-apache2-module

@@ -412,11 +412,11 @@ 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
@@ -943,6 +943,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
@@ -655,6 +654,12 @@ parser = OptionParser.new do |opts|
           "#{indent}interactively either.") do |flags|
     options[:extra_configure_flags] = flags
   end
+  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\n" <<
       "#{indent}languages (e.g.\n" <<
       "#{indent}'ruby,python,nodejs,meteor')") do |value|