passenger 6.0.15 → 6.0.16

data/src/ruby_supportlib/phusion_passenger/packaging.rb

@@ -88,6 +88,7 @@ module PhusionPassenger
       '**/.DS_Store',
       '**/*.gch',
       '**/.editorconfig',
+      '**/.clangd',
       '.externalToolBuilders/**/*',
       '.github/**/*',
       '.settings/**/*',

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

@@ -687,11 +687,12 @@ module PhusionPassenger
         # Running 'file' on the Apache executable usually outputs something
         # like this:
         #
-        #   /usr/sbin/httpd: Mach-O universal binary with 4 architectures
+        #   /usr/sbin/httpd: Mach-O universal binary with 5 architectures
         #   /usr/sbin/httpd (for architecture ppc7400):     Mach-O executable ppc
         #   /usr/sbin/httpd (for architecture ppc64):       Mach-O 64-bit executable ppc64
         #   /usr/sbin/httpd (for architecture i386):        Mach-O executable i386
         #   /usr/sbin/httpd (for architecture x86_64):      Mach-O 64-bit executable x86_64
+        #   /usr/sbin/httpd (for architecture arm64e):	    Mach-O 64-bit executable arm64e
         #
         # But on some machines, it may output just:
         #
@@ -700,7 +701,7 @@ module PhusionPassenger
         # (http://code.google.com/p/phusion-passenger/issues/detail?id=236)
         output = `file "#{httpd}"`.strip
         if output =~ /Mach-O fat file/ && output !~ /for architecture/
-          architectures = ["i386", "ppc", "x86_64", "ppc64"]
+          architectures = ["i386", "ppc", "x86_64", "ppc64", "arm64e"]
         else
           architectures = []
           output.split("\n").grep(/for architecture/).each do |line|

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

@@ -72,7 +72,7 @@ module PhusionPassenger
             # some OS X print something like:
             #   "/opt/ruby-enterprise/bin/ruby: Mach-O 64-bit executable"
             if output =~ /arm64/
-              ruby_arch = "arm"
+              ruby_arch = "arm64"
             elsif output =~ /Mach-O 64-bit/
               ruby_arch = "x86_64"
             else

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

@@ -161,12 +161,12 @@ module PhusionPassenger
         major, minor, *rest = os_version.split(".").map(&:to_i)
         if major >= 11 || (major == 10 && minor >= 16)
           # Since Big Sur aarch64 is supported, and default on m1 macs.
-          if `uname -m` =~ /arm64/
-            ["arm", "x86_64"]
+          if `#{uname_command} -m` =~ /arm64/
+            ["arm64", "x86_64"]
           elsif `sysctl -in sysctl.proc_translated` == "1"
-            ["arm", "x86_64"]
+            ["arm64", "x86_64"]
           else
-            ["x86_64", "arm"]
+            ["x86_64", "arm64"]
           end
         elsif minor == 15
           # Since Catalina x86 is gone.

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.15'
+  VERSION_STRING = '6.0.16'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
   PREFERRED_NGINX_VERSION = '1.20.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 6.0.15
+  version: 6.0.16
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake