passenger 6.0.9 → 6.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87f31709612878e26738f7b12b35f4bc97fb32f0
-  data.tar.gz: f3cf0d1c48fa1b478e6e5e4181191cc529a809fe
+  metadata.gz: 84d5efa4e63f666d5f40342ef5e6992487b603f1
+  data.tar.gz: 5320cb6043d4574259be0e68ea82e6809d52c16d
 SHA512:
-  metadata.gz: 3461d39a57d3be31000fddf9dbc73bf583533f3c3a89103651d4b71c56c902d6df5aa9fe757e1ee8fd051f9f3b5b03a654ef1ad836a3b957dcda49db3e6a498e
-  data.tar.gz: 31f67ea34f1dab5937dd85adebc6f24c49f293667108c4a9f43bafeb87f48390a5d565a434b82704cb8128930b3b4db6bbdd9a3a20649ef98c8d11bdd68a9629
+  metadata.gz: 1184227fb4ca333138b4ba0227d4cebec220ad677603b4a4f5d7b57c49c722bd618e3015b23ab9e2a28d122fffab1cbdb4dc42440a7c837a544450d5b7e324d2
+  data.tar.gz: 4b4145b3abb36b27a9cedcd58c35077cc63b4bc0576e028f8a5bc07052157973f6bd6ed67ff3b08bd3e3aad6cd22c7f01849b5a2cc7dc979dad5eec8fc167537

data/CHANGELOG

@@ -1,4 +1,17 @@
-Release 6.0.9 (Not yet released)
+Release 6.0.10 (Not yet released)
+-------------
+ * [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.

data/src/agent/Core/Config.h

@@ -164,7 +164,7 @@ using namespace std;
  *   security_update_checker_interval                                unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                               string             -          -
  *   security_update_checker_url                                     string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                 string             -          default("Phusion_Passenger/6.0.9")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.10")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_start_command                               string             -          read_only

data/src/agent/Core/Controller/Config.h

@@ -115,7 +115,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   multi_app                                           boolean            -          default(true),read_only
  *   request_freelist_limit                              unsigned integer   -          default(1024)
  *   response_buffer_high_watermark                      unsigned integer   -          default(134217728)
- *   server_software                                     string             -          default("Phusion_Passenger/6.0.9")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.10")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)

data/src/agent/Watchdog/Config.h

@@ -153,7 +153,7 @@ using namespace std;
  *   security_update_checker_interval                                         unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                                        string             -          -
  *   security_update_checker_url                                              string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                          string             -          default("Phusion_Passenger/6.0.9")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.10")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/cxx_supportlib/Constants.h

@@ -83,7 +83,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.9"
+#define PASSENGER_VERSION "6.0.10"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.9'
+  VERSION_STRING = '6.0.10'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
   PREFERRED_NGINX_VERSION = '1.20.1'
@@ -43,8 +43,8 @@ module PhusionPassenger
   PACKAGING_NGINX_SHA256_CHECKSUM = 'e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49'
 
   # sha256sum of the .tar.gz
-  PREFERRED_PCRE_VERSION  = '8.44'
-  PCRE_SHA256_CHECKSUM = 'aecafd4af3bd0f3935721af77b889d9024b2e01d96b58471bd91a3063fb47728'
+  PREFERRED_PCRE_VERSION  = '8.45'
+  PCRE_SHA256_CHECKSUM = '4e6ce03e0336e8b4a3d6c2b70b1c5e18590a5673a98186da90d4f33c23defc09'
 
   STANDALONE_INTERFACE_VERSION  = 1
 

data/src/ruby_supportlib/phusion_passenger/platform_info/binary_compatibility.rb

@@ -112,26 +112,28 @@ module PhusionPassenger
       if os_name_simple == "macosx"
         # RUBY_PLATFORM gives us the kernel version, but we want
         # the OS X version.
-        os_version_string = `sw_vers -productVersion`.strip
         # sw_vers returns something like "10.6.2". We're only
         # interested in the first two digits (MAJOR.MINOR) since
         # tiny releases tend to be binary compatible with each
-        # other.
-        components = os_version_string.split(".")
-        os_version = "#{components[0]}.#{components[1]}"
-        os_runtime = os_version
-
-        os_arch = cpu_architectures[0]
-        if os_version >= "10.5" && os_arch =~ /^i.86$/
-          # On Snow Leopard, 'uname -m' returns i386 but
-          # we *know* that everything is x86_64 by default.
-          os_arch = "x86_64"
-        end
+        # other. After macOS 10.15 Apple switched to bumping major
+        # versions (like 11.0, 12.0) so we need to look at that.
+        # However, if the env var SYSTEM_VERSION_COMPAT=1 then
+        # macOS 11 reports as 10.16 (and so on), so we need to deal with that too.
+        major, minor, *rest = os_version.split(".").map(&:to_i)
+        os_version_string = if major >= 11
+                       major
+                     elsif minor >= 16
+                       # 10.16 -> 11
+                       # 10.17 -> 12
+                       minor - 5
+                     else
+                       "#{major}.#{minor}"
+                     end
+        os_runtime = os_version_string.to_s
       else
-        os_arch = cpu_architectures[0]
         os_runtime = nil
       end
-
+      os_arch = cpu_architectures[0]
       return [os_arch, os_name_simple, os_runtime].compact.join("-")
     end
     memoize :cxx_binary_compatibility_id

data/src/ruby_supportlib/phusion_passenger/platform_info/operating_system.rb

@@ -23,11 +23,18 @@
 #  THE SOFTWARE.
 
 require 'rbconfig'
+require 'rubygems'
 PhusionPassenger.require_passenger_lib 'platform_info'
 
 module PhusionPassenger
 
   module PlatformInfo
+    class VersionComparer < String
+      def <=>(other)
+        Gem::Version.new(self) <=> Gem::Version.new(other.to_s)
+      end
+    end
+
     # Returns the operating system's name in as simple a form as possible. For example,
     # Linux is always identified as "linux". OS X is always identified as "macosx" (despite
     # the actual os name being something like "darwin"). This is useful as a stable indicator
@@ -67,13 +74,13 @@ module PhusionPassenger
     def self.os_version
       case os_name_simple
       when 'macosx'
-        `/usr/bin/sw_vers -productVersion`.strip.split.last
+        VersionComparer.new(`/usr/bin/sw_vers -productVersion`.strip.split.last)
 
       when 'linux'
         # Parse LSB (applicable to e.g. Ubuntu)
         if read_file('/etc/lsb-release') =~ /DISTRIB_RELEASE=(.+)/
-          version = $1.gsub(/["']/, '')
-          return version if !version.empty?
+          version = $1.delete(%q['"])
+          return VersionComparer.new(version) if !version.empty?
         end
 
         # Parse CentOS/RedHat
@@ -81,11 +88,12 @@ module PhusionPassenger
         data = read_file('/etc/redhat-release') if data.empty?
         if !data.empty?
           data =~ /^(.+?) (Linux )?(release |version )?(.+?)( |$)/i
-          return $4 if $4
+          return VersionComparer.new($4) if $4
         end
 
+        # Parse Debian
         if File.exist?('/etc/debian_version')
-          return read_file('/etc/debian_version').strip
+          return VersionComparer.new(read_file('/etc/debian_version').strip)
         end
 
         nil
@@ -142,34 +150,31 @@ module PhusionPassenger
     # system are thus be x86_64. It is guaranteed that the OS can run x86_64
     # executables, but not x86 executables per se.
     #
-    # Another example: on MacOS X this function can return either
-    # ["x86_64", "x86"] or ["x86", "x86_64"]. The former result indicates
-    # OS X 10.6 (Snow Leopard) and beyond because starting from that version
-    # everything is 64-bit by default. The latter result indicates an OS X
-    # version older than 10.6.
+    # Another example: on MacOS X this function will return some subset of
+    # "x86_64", "x86", and "arm".
     def self.cpu_architectures
-      uname = uname_command
-      raise "The 'uname' command cannot be found" if !uname
       if os_name_simple == "macosx"
-        arch = `#{uname} -p`.strip
-        if arch == "i386"
-          # Macs have been x86 since around 2007. I think all of them come with
-          # a recent enough Intel CPU that supports both x86 and x86_64, and I
-          # think every OS X version has both the x86 and x86_64 runtime installed.
-          major, minor, *rest = `sw_vers -productVersion`.strip.split(".")
-          major = major.to_i
-          minor = minor.to_i
-          if major >= 10 || (major == 10 && minor >= 6)
-            # Since Snow Leopard x86_64 is the default.
-            ["x86_64", "x86"]
-          else
-            # Before Snow Leopard x86 was the default.
-            ["x86", "x86_64"]
-          end
+        # Macs were intel from around 2006 until 2022.
+        # All but the first 3 Intel Macs' CPUs supported both x86_64 and x86,
+        # and every OS X version from 10.4 to 10.14 had both x86 and x86_64 runtimes installed,
+        # from 10.15 on x86 was dropped, and from (11/10.16) on arm (aarch64) was added.
+        major, minor, *rest = os_version.split(".").map(&:to_i)
+        if major >= 11 || (major == 10 && minor >= 16)
+          # Since Big Sur aarch64 is supported.
+          ["x86_64", "arm"]
+        elsif minor == 15
+          # Since Catalina x86 is gone.
+          ["x86_64"]
+        elsif minor >= 6
+          # Since Snow Leopard x86_64 is the default on intel macs.
+          ["x86_64", "x86"]
         else
-          arch
+          # Before Snow Leopard x86 was the default.
+          ["x86", "x86_64"]
         end
       else
+        uname = uname_command
+        raise "The 'uname' command cannot be found" if !uname
         arch = `#{uname} -p`.strip
         # On some systems 'uname -p' returns something like
         # 'Intel(R) Pentium(R) M processor 1400MHz' or

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 6.0.9
+  version: 6.0.10
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake